tag is struct instead of simple string.

[gedcom-parse.git] / gedcom / gedcom.y

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index c83bf17daa07bfb42e2dc705132ad859d58a2fea..9e684944d62578147c8f152e7c2d8751cd06ecd3 100644 (file)
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -146,6 +146,7 @@
 #include "encoding.h"
 #include "interface.h"
 #include "date.h"
+#include "xref.h"
 
 int  count_level    = 0;
 int  fail           = 0;
@@ -153,7 +154,8 @@ int  compat_enabled = 1;
 int  gedcom_high_level_debug = 0; 
 int  compatibility  = 0; 
 Gedcom_err_mech error_mechanism = IMMED_FAIL;
-Gedcom_val_struct val; 
+Gedcom_val_struct val1;
+Gedcom_val_struct val2; 
  
 char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
 char *line_item_buf_ptr;
@@ -188,13 +190,19 @@ int  compat_mode(int flags);
         yyerrok;                                                             \
        }                                                                      \
      }
-#define START(PARENTTAG,PARENTCTXT)                                           \
-     { ++count_level;                                                         \
-       set_parenttag(#PARENTTAG);                                             \
-       set_parentctxt(PARENTCTXT);                                            \
+#define START1(PARENTTAG)                                                     \
+     { set_parenttag(#PARENTTAG);                                             \
+     }
+#define START2(PARENTCTXT)                                                    \
+     { set_parentctxt(PARENTCTXT);                                            \
+       ++count_level;                                                         \
        push_countarray();                                                     \
      }
-#define PARENT                                                              \
+#define START(PARENTTAG,PARENTCTXT)                                           \
+     { START1(PARENTTAG);                                                     \
+       START2(PARENTCTXT);                                                    \
+     }
+#define PARENT                                                                \
      get_parentctxt()
 #define CHK(TAG)                                                              \
      { if (!check_occurrence(TAG_##TAG)) {                                    \
@@ -396,7 +404,6 @@ int  compat_mode(int flags);
 %type <tag> indiv_gen_tag
 %type <tag> lio_bapl_tag
 %type <string> line_item
-%type <string> line_value
 %type <string> mand_line_item
 %type <string> mand_pointer
 %type <string> note_line_item
@@ -431,8 +438,9 @@ record      : fam_rec
 /**** Header                                                      ****/
 /*********************************************************************/
 head_sect    : OPEN DELIM TAG_HEAD
-               { $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(), $3,
-                                        NULL, GEDCOM_MAKE_NULL());
+               { $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1),
+                                        $3,
+                                        NULL, GEDCOM_MAKE_NULL(val2));
                 START(HEAD, $<ctxt>$) }
                head_subs
                { if (compat_mode(C_FTREE))
@@ -468,7 +476,7 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item
                  { set_compatibility($4);
                   $<ctxt>$ = start_element(ELT_HEAD_SOUR, PARENT,
                                            $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(SOUR, $<ctxt>$)
                 }
                  head_sour_subs
@@ -491,7 +499,7 @@ head_sour_sub : head_sour_vers_sect  { OCCUR2(VERS, 0, 1) }
 head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item
                       { $<ctxt>$ = start_element(ELT_HEAD_SOUR_VERS, PARENT,
                                                 $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(VERS, $<ctxt>$)
                      }
                       no_std_subs
@@ -504,7 +512,7 @@ head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item
 head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
                       { $<ctxt>$ = start_element(ELT_HEAD_SOUR_NAME, PARENT,
                                                 $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(NAME, $<ctxt>$)
                      }
                       no_std_subs
@@ -517,7 +525,7 @@ head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
 head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item 
                       { $<ctxt>$ = start_element(ELT_HEAD_SOUR_CORP, PARENT,
                                                 $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(CORP, $<ctxt>$)
                      }
                       head_sour_corp_subs
@@ -539,7 +547,7 @@ head_sour_corp_sub : addr_struc_sub  /* 0:1 */
 head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item 
                       { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA, PARENT,
                                                 $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(DATA, $<ctxt>$)
                      }
                       head_sour_data_subs
@@ -561,9 +569,10 @@ head_sour_data_sub : head_sour_data_date_sect  { OCCUR2(DATE, 0, 1) }
 
 head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
                            { struct date_value dv = gedcom_parse_date($4);
-                            $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA_DATE,
-                                                     PARENT, $1, $3, $4,
-                                                     GEDCOM_MAKE_DATE(dv));
+                            $<ctxt>$
+                              = start_element(ELT_HEAD_SOUR_DATA_DATE,
+                                              PARENT, $1, $3, $4,
+                                              GEDCOM_MAKE_DATE(val1, dv));
                             START(DATE, $<ctxt>$)
                           }
                            no_std_subs
@@ -574,9 +583,10 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
                           }
                          ;
 head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
-                           { $<ctxt>$ = start_element(ELT_HEAD_SOUR_DATA_COPR,
-                                                     PARENT, $1, $3, $4,
-                                                     GEDCOM_MAKE_STRING($4));
+                           { $<ctxt>$
+                              = start_element(ELT_HEAD_SOUR_DATA_COPR,
+                                              PARENT, $1, $3, $4,
+                                              GEDCOM_MAKE_STRING(val1, $4));
                             START(COPR, $<ctxt>$)
                           }
                            no_std_subs
@@ -591,7 +601,7 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
 head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_DEST,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(DEST, $<ctxt>$)
                 }
                  no_std_subs
@@ -607,7 +617,7 @@ head_date_sect : OPEN DELIM TAG_DATE mand_line_item
                  { struct date_value dv = gedcom_parse_date($4);
                   $<ctxt>$ = start_element(ELT_HEAD_DATE,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_DATE(dv));
+                                           GEDCOM_MAKE_DATE(val1, dv));
                   START(DATE, $<ctxt>$)
                 }
                  head_date_subs
@@ -629,7 +639,7 @@ head_date_sub  : head_date_time_sect  { OCCUR2(TIME, 0, 1) }
 head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
                       { $<ctxt>$ = start_element(ELT_HEAD_DATE_TIME,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(TIME, $<ctxt>$)
                      }
                       no_std_subs
@@ -642,9 +652,12 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
 
 /* HEAD.SUBM */
 head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
-                 { $<ctxt>$ = start_element(ELT_HEAD_SUBM,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_SUBM);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_HEAD_SUBM,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(SUBM, $<ctxt>$)
                 }
                  no_std_subs
@@ -656,9 +669,12 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
                ;
 /* HEAD.SUBN */
 head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer 
-                 { $<ctxt>$ = start_element(ELT_HEAD_SUBN,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_SUBN);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_HEAD_SUBN,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(SUBN, $<ctxt>$)
                 }
                  no_std_subs
@@ -672,7 +688,7 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
 head_file_sect : OPEN DELIM TAG_FILE mand_line_item 
                  { $<ctxt>$ = start_element(ELT_HEAD_FILE,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(FILE, $<ctxt>$)
                 }
                  no_std_subs
@@ -685,7 +701,7 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item
 head_copr_sect : OPEN DELIM TAG_COPR mand_line_item 
                  { $<ctxt>$ = start_element(ELT_HEAD_COPR,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(COPR, $<ctxt>$)
                 }
                  no_std_subs
@@ -698,7 +714,7 @@ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item
 head_gedc_sect : OPEN DELIM TAG_GEDC
                  { $<ctxt>$ = start_element(ELT_HEAD_GEDC,
                                            PARENT, $1, $3, NULL,
-                                           GEDCOM_MAKE_NULL());
+                                           GEDCOM_MAKE_NULL(val1));
                   START(GEDC, $<ctxt>$)
                 }
                  head_gedc_subs
@@ -719,7 +735,7 @@ head_gedc_sub  : head_gedc_vers_sect  { OCCUR2(VERS, 1, 1) }
 head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item  
                       { $<ctxt>$ = start_element(ELT_HEAD_GEDC_VERS,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(VERS, $<ctxt>$)
                      }
                       no_std_subs
@@ -732,7 +748,7 @@ head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item
 head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item   
                       { $<ctxt>$ = start_element(ELT_HEAD_GEDC_FORM,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(FORM, $<ctxt>$)
                      }
                       no_std_subs
@@ -745,10 +761,12 @@ head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
 
 /* HEAD.CHAR */
 head_char_sect : OPEN DELIM TAG_CHAR mand_line_item 
-                 { if (open_conv_to_internal($4) == 0) YYERROR;
+                 { /* Don't allow to continue if conversion context couldn't
+                     be opened */
+                  if (open_conv_to_internal($4) == 0) YYABORT;
                   $<ctxt>$ = start_element(ELT_HEAD_CHAR,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(CHAR, $<ctxt>$)
                 }
                  head_char_subs
@@ -768,7 +786,7 @@ head_char_sub  : head_char_vers_sect  { OCCUR2(VERS, 0, 1) }
 head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item   
                       { $<ctxt>$ = start_element(ELT_HEAD_CHAR_VERS,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(VERS, $<ctxt>$)
                      }
                       no_std_subs
@@ -783,7 +801,7 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item
 head_lang_sect : OPEN DELIM TAG_LANG mand_line_item   
                  { $<ctxt>$ = start_element(ELT_HEAD_LANG,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(LANG, $<ctxt>$)
                 }
                  no_std_subs
@@ -796,7 +814,7 @@ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item
 head_plac_sect : OPEN DELIM TAG_PLAC
                  { $<ctxt>$ = start_element(ELT_HEAD_PLAC,
                                            PARENT, $1, $3, NULL,
-                                           GEDCOM_MAKE_NULL());
+                                           GEDCOM_MAKE_NULL(val1));
                   START(PLAC, $<ctxt>$)
                 }
                  head_plac_subs
@@ -816,7 +834,7 @@ head_plac_sub  : head_plac_form_sect  { OCCUR2(FORM, 1, 1) }
 head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item   
                       { $<ctxt>$ = start_element(ELT_HEAD_PLAC_FORM,
                                                 PARENT, $1, $3, $4, 
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(FORM, $<ctxt>$)
                      }
                       no_std_subs
@@ -831,7 +849,7 @@ head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
 head_note_sect : OPEN DELIM TAG_NOTE mand_line_item 
                  { $<ctxt>$ = start_element(ELT_HEAD_NOTE,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(NOTE, $<ctxt>$)
                 }
                  head_note_subs
@@ -860,9 +878,13 @@ trlr_sect   : OPEN DELIM TAG_TRLR CLOSE { }
 /**** Family record                                               ****/
 /*********************************************************************/
 fam_rec      : OPEN DELIM POINTER DELIM TAG_FAM
-               { $<ctxt>$ = start_record(REC_FAM,
-                                        $1, GEDCOM_MAKE_STRING($3), $5,
-                                        NULL, GEDCOM_MAKE_NULL());
+               { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                          XREF_FAM);
+                if (xr == NULL) HANDLE_ERROR;
+                $<ctxt>$ = start_record(REC_FAM,
+                                        $1, GEDCOM_MAKE_XREF_PTR(val1, xr),
+                                        $5,
+                                        NULL, GEDCOM_MAKE_NULL(val2));
                 START(FAM, $<ctxt>$) }
                fam_subs
               { CHECK0 }
@@ -891,9 +913,12 @@ fam_sub      : fam_event_struc_sub  /* 0:M */
 
 /* FAM.HUSB */
 fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer    
-                { $<ctxt>$ = start_element(ELT_FAM_HUSB,
+                { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                           XREF_INDI);
+                 if (xr == NULL) HANDLE_ERROR;
+                 $<ctxt>$ = start_element(ELT_FAM_HUSB,
                                           PARENT, $1, $3, $4, 
-                                          GEDCOM_MAKE_STRING($4));
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                  START(HUSB, $<ctxt>$)
                }
                 no_std_subs
@@ -905,9 +930,12 @@ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer
 
 /* FAM.WIFE */
 fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer 
-                { $<ctxt>$ = start_element(ELT_FAM_WIFE,
+                { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                           XREF_INDI);
+                 if (xr == NULL) HANDLE_ERROR;
+                 $<ctxt>$ = start_element(ELT_FAM_WIFE,
                                           PARENT, $1, $3, $4, 
-                                          GEDCOM_MAKE_STRING($4));
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                  START(WIFE, $<ctxt>$)
                }
                 no_std_subs
@@ -919,9 +947,12 @@ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer
 
 /* FAM.CHIL */
 fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
-                { $<ctxt>$ = start_element(ELT_FAM_CHIL,
+                { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                           XREF_INDI);
+                 if (xr == NULL) HANDLE_ERROR;
+                 $<ctxt>$ = start_element(ELT_FAM_CHIL,
                                           PARENT, $1, $3, $4, 
-                                          GEDCOM_MAKE_STRING($4));
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                  START(CHIL, $<ctxt>$) 
                } 
                no_std_subs 
@@ -935,7 +966,7 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
 fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item    
                 { $<ctxt>$ = start_element(ELT_FAM_NCHI,
                                           PARENT, $1, $3, $4, 
-                                          GEDCOM_MAKE_STRING($4));
+                                          GEDCOM_MAKE_STRING(val1, $4));
                  START(NCHI, $<ctxt>$)  
                }  
                no_std_subs  
@@ -947,9 +978,12 @@ fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
 
 /* FAM.SUBM */
 fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
-                { $<ctxt>$ = start_element(ELT_FAM_SUBM,
+                { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                           XREF_SUBM);
+                 if (xr == NULL) HANDLE_ERROR;
+                 $<ctxt>$ = start_element(ELT_FAM_SUBM,
                                           PARENT, $1, $3, $4, 
-                                          GEDCOM_MAKE_STRING($4));
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                  START(SUBM, $<ctxt>$)   
                }   
                no_std_subs   
@@ -963,9 +997,12 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 /**** Individual record                                           ****/
 /*********************************************************************/
 indiv_rec   : OPEN DELIM POINTER DELIM TAG_INDI
-              { $<ctxt>$ = start_record(REC_INDI,
-                                       $1, GEDCOM_MAKE_STRING($3), $5,
-                                       NULL, GEDCOM_MAKE_NULL());
+              { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                         XREF_INDI);
+               if (xr == NULL) HANDLE_ERROR;
+               $<ctxt>$ = start_record(REC_INDI,
+                                       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                       NULL, GEDCOM_MAKE_NULL(val2));
                START(INDI, $<ctxt>$) }
               indi_subs
              { CHECK0 }
@@ -1007,7 +1044,7 @@ indi_sub    : indi_resn_sect  { OCCUR2(RESN, 0, 1) }
 indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item     
                  { $<ctxt>$ = start_element(ELT_INDI_RESN,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(RESN, $<ctxt>$)    
                 }    
                 no_std_subs     
@@ -1021,7 +1058,7 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item
 indi_sex_sect  : OPEN DELIM TAG_SEX mand_line_item     
                  { $<ctxt>$ = start_element(ELT_INDI_SEX,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(SEX, $<ctxt>$)     
                 }     
                 no_std_subs     
@@ -1033,9 +1070,12 @@ indi_sex_sect  : OPEN DELIM TAG_SEX mand_line_item
 
 /* INDI.SUBM */
 indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer 
-                 { $<ctxt>$ = start_element(ELT_INDI_SUBM,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_SUBM);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_INDI_SUBM,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(SUBM, $<ctxt>$)      
                 }      
                 no_std_subs      
@@ -1047,9 +1087,12 @@ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 
 /* INDI.ALIA */
 indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
-                 { $<ctxt>$ = start_element(ELT_INDI_ALIA,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_INDI);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_INDI_ALIA,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(ALIA, $<ctxt>$)       
                 }       
                 no_std_subs       
@@ -1061,9 +1104,12 @@ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
 
 /* INDI.ANCI */
 indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
-                 { $<ctxt>$ = start_element(ELT_INDI_ANCI,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_SUBM);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_INDI_ANCI,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(ANCI, $<ctxt>$)        
                 }        
                 no_std_subs        
@@ -1075,9 +1121,12 @@ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
 
 /* INDI.DESI */
 indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
-                 { $<ctxt>$ = start_element(ELT_INDI_DESI,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_SUBM);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_INDI_DESI,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(DESI, $<ctxt>$)         
                 }         
                 no_std_subs         
@@ -1091,7 +1140,7 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
 indi_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item     
                  { $<ctxt>$ = start_element(ELT_INDI_RFN,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(RFN, $<ctxt>$)          
                 }          
                 no_std_subs          
@@ -1105,7 +1154,7 @@ indi_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item
 indi_afn_sect  : OPEN DELIM TAG_AFN mand_line_item      
                  { $<ctxt>$ = start_element(ELT_INDI_AFN,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(AFN, $<ctxt>$)           
                 }           
                 no_std_subs           
@@ -1123,9 +1172,12 @@ ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
 /**** Multimedia record                                           ****/
 /*********************************************************************/
 multim_rec  : OPEN DELIM POINTER DELIM TAG_OBJE
-              { $<ctxt>$ = start_record(REC_OBJE,
-                                       $1, GEDCOM_MAKE_STRING($3), $5,
-                                       NULL, GEDCOM_MAKE_NULL());
+              { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                         XREF_OBJE);
+               if (xr == NULL) HANDLE_ERROR;
+               $<ctxt>$ = start_record(REC_OBJE,
+                                       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                       NULL, GEDCOM_MAKE_NULL(val2));
                START(OBJE, $<ctxt>$) }
               obje_subs
              { CHECK2(FORM, BLOB) }
@@ -1151,7 +1203,7 @@ obje_sub    : obje_form_sect  { OCCUR2(FORM, 1, 1) }
 obje_form_sect : OPEN DELIM TAG_FORM mand_line_item       
                  { $<ctxt>$ = start_element(ELT_OBJE_FORM,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(FORM, $<ctxt>$)            
                 }            
                 no_std_subs            
@@ -1165,7 +1217,7 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
 obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item       
                  { $<ctxt>$ = start_element(ELT_OBJE_TITL,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(TITL, $<ctxt>$)             
                 }             
                 no_std_subs             
@@ -1179,7 +1231,7 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
 obje_blob_sect : OPEN DELIM TAG_BLOB
                  { $<ctxt>$ = start_element(ELT_OBJE_BLOB,
                                            PARENT, $1, $3, NULL,
-                                           GEDCOM_MAKE_NULL());
+                                           GEDCOM_MAKE_NULL(val1));
                   START(BLOB, $<ctxt>$)              
                 }
                  obje_blob_subs
@@ -1200,7 +1252,7 @@ obje_blob_sub  : obje_blob_cont_sect  { OCCUR1(CONT, 1) }
 obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item        
                       { $<ctxt>$ = start_element(ELT_OBJE_BLOB_CONT,
                                                 PARENT, $1, $3, $4, 
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(CONT, $<ctxt>$)               
                      }                
                      no_std_subs                
@@ -1213,9 +1265,12 @@ obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item
 
 /* OBJE.OBJE */
 obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer 
-                 { $<ctxt>$ = start_element(ELT_OBJE_OBJE,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_OBJE);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_OBJE_OBJE,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(OBJE, $<ctxt>$)  
                  }  
                  no_std_subs  
@@ -1229,9 +1284,12 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
 /**** Note record                                                 ****/
 /*********************************************************************/
 note_rec    : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
-              { $<ctxt>$ = start_record(REC_NOTE,
-                                       $1, GEDCOM_MAKE_STRING($3), $5,
-                                       $6, GEDCOM_MAKE_STRING($6));
+              { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                         XREF_NOTE);
+               if (xr == NULL) HANDLE_ERROR;
+               $<ctxt>$ = start_record(REC_NOTE,
+                                       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                       $6, GEDCOM_MAKE_STRING(val2, $6));
                START(NOTE, $<ctxt>$) }
               note_subs
              { CHECK0 }
@@ -1243,6 +1301,9 @@ note_line_item : /* empty */
                    { if (!compat_mode(C_FTREE)) {
                       gedcom_error(_("Missing value")); YYERROR;
                     }
+                    else {
+                      $$ = "";
+                    }
                   }
                | DELIM line_item
                    { gedcom_debug_print("==Val: %s==", $2);
@@ -1264,9 +1325,12 @@ note_sub    : continuation_sub  /* 0:M */
 /**** Repository record                                           ****/
 /*********************************************************************/
 repos_rec   : OPEN DELIM POINTER DELIM TAG_REPO
-              { $<ctxt>$ = start_record(REC_REPO,
-                                       $1, GEDCOM_MAKE_STRING($3), $5,
-                                       NULL, GEDCOM_MAKE_NULL());
+              { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                         XREF_REPO);
+               if (xr == NULL) HANDLE_ERROR;
+               $<ctxt>$ = start_record(REC_REPO,
+                                       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                       NULL, GEDCOM_MAKE_NULL(val2));
                START(REPO, $<ctxt>$) }
               repo_subs
              { CHECK0 }
@@ -1290,7 +1354,7 @@ repo_sub    : repo_name_sect  { OCCUR2(NAME, 0, 1) }
 repo_name_sect : OPEN DELIM TAG_NAME mand_line_item         
                  { $<ctxt>$ = start_element(ELT_REPO_NAME,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(NAME, $<ctxt>$)          
                  }          
                  no_std_subs          
@@ -1304,9 +1368,12 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
 /**** Source record                                               ****/
 /*********************************************************************/
 source_rec  : OPEN DELIM POINTER DELIM TAG_SOUR
-              { $<ctxt>$ = start_record(REC_SOUR,
-                                       $1, GEDCOM_MAKE_STRING($3), $5,
-                                       NULL, GEDCOM_MAKE_NULL());
+              { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                         XREF_SOUR);
+               if (xr == NULL) HANDLE_ERROR;
+               $<ctxt>$ = start_record(REC_SOUR,
+                                       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                       NULL, GEDCOM_MAKE_NULL(val2));
                START(SOUR, $<ctxt>$) }
               sour_subs
              { CHECK0 }
@@ -1336,7 +1403,7 @@ sour_sub    : sour_data_sect  { OCCUR2(DATA, 0, 1) }
 sour_data_sect : OPEN DELIM TAG_DATA
                  { $<ctxt>$ = start_element(ELT_SOUR_DATA,
                                            PARENT, $1, $3, NULL,
-                                           GEDCOM_MAKE_NULL());
+                                           GEDCOM_MAKE_NULL(val1));
                   START(DATA, $<ctxt>$) 
                  }
                  sour_data_subs
@@ -1359,7 +1426,7 @@ sour_data_sub  : sour_data_even_sect  /* 0:M */
 sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item 
                       { $<ctxt>$ = start_element(ELT_SOUR_DATA_EVEN,
                                                 PARENT, $1, $3, $4, 
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(EVEN, $<ctxt>$)  
                       }
                       sour_data_even_subs
@@ -1381,9 +1448,10 @@ sour_data_even_sub  : sour_data_even_date_sect { OCCUR2(DATE, 0, 1) }
 
 sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item          
                            { struct date_value dv = gedcom_parse_date($4);
-                            $<ctxt>$ = start_element(ELT_SOUR_DATA_EVEN_DATE,
-                                                     PARENT, $1, $3, $4, 
-                                                     GEDCOM_MAKE_DATE(dv));
+                            $<ctxt>$
+                              = start_element(ELT_SOUR_DATA_EVEN_DATE,
+                                              PARENT, $1, $3, $4, 
+                                              GEDCOM_MAKE_DATE(val1, dv));
                             START(DATE, $<ctxt>$)           
                            }           
                            no_std_subs           
@@ -1395,9 +1463,10 @@ sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item
                          ;
 
 sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item          
-                           { $<ctxt>$ = start_element(ELT_SOUR_DATA_EVEN_PLAC,
-                                                     PARENT, $1, $3, $4, 
-                                                     GEDCOM_MAKE_STRING($4));
+                           { $<ctxt>$
+                              = start_element(ELT_SOUR_DATA_EVEN_PLAC,
+                                              PARENT, $1, $3, $4, 
+                                              GEDCOM_MAKE_STRING(val1, $4));
                             START(PLAC, $<ctxt>$)           
                            }           
                            no_std_subs           
@@ -1411,7 +1480,7 @@ sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
 sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item          
                       { $<ctxt>$ = start_element(ELT_SOUR_DATA_AGNC,
                                                 PARENT, $1, $3, $4, 
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(AGNC, $<ctxt>$)           
                       }           
                       no_std_subs           
@@ -1426,7 +1495,7 @@ sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
 sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item
                  { $<ctxt>$ = start_element(ELT_SOUR_AUTH,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(AUTH, $<ctxt>$) 
                  }
                  sour_auth_subs
@@ -1448,7 +1517,7 @@ sour_auth_sub  : continuation_sub  /* 0:M */
 sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item  
                  { $<ctxt>$ = start_element(ELT_SOUR_TITL,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(TITL, $<ctxt>$)   
                  }
                  sour_titl_subs 
@@ -1470,7 +1539,7 @@ sour_titl_sub  : continuation_sub  /* 0:M */
 sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item           
                  { $<ctxt>$ = start_element(ELT_SOUR_ABBR,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(ABBR, $<ctxt>$)            
                  }            
                  no_std_subs            
@@ -1484,7 +1553,7 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item
 sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item  
                  { $<ctxt>$ = start_element(ELT_SOUR_PUBL,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(PUBL, $<ctxt>$)            
                  }
                  sour_publ_subs  
@@ -1506,7 +1575,7 @@ sour_publ_sub  : continuation_sub  /* 0:M */
 sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item   
                  { $<ctxt>$ = start_element(ELT_SOUR_TEXT,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(TEXT, $<ctxt>$)    
                  }
                  sour_text_subs  
@@ -1528,9 +1597,12 @@ sour_text_sub  : continuation_sub  /* 0:M */
 /**** Submission record                                           ****/
 /*********************************************************************/
 submis_rec  : OPEN DELIM POINTER DELIM TAG_SUBN    
-              { $<ctxt>$ = start_record(REC_SUBN,
-                                       $1, GEDCOM_MAKE_STRING($3), $5,
-                                       NULL, GEDCOM_MAKE_NULL());
+              { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                         XREF_SUBN);
+               if (xr == NULL) HANDLE_ERROR;
+               $<ctxt>$ = start_record(REC_SUBN,
+                                       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                       NULL, GEDCOM_MAKE_NULL(val2));
                START(SUBN, $<ctxt>$) }
               subn_subs
              { CHECK0 }
@@ -1554,9 +1626,12 @@ subn_sub    : subn_subm_sect  { OCCUR2(SUBM, 0, 1) }
 
 /* SUBN.SUBM */
 subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
-                 { $<ctxt>$ = start_element(ELT_SUBN_SUBM,
+                 { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                            XREF_SUBM);
+                  if (xr == NULL) HANDLE_ERROR;
+                  $<ctxt>$ = start_element(ELT_SUBN_SUBM,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                   START(SUBM, $<ctxt>$) 
                  } 
                  no_std_subs 
@@ -1570,7 +1645,7 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item            
                  { $<ctxt>$ = start_element(ELT_SUBN_FAMF,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(FAMF, $<ctxt>$)             
                  }             
                  no_std_subs             
@@ -1584,7 +1659,7 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item
 subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item            
                  { $<ctxt>$ = start_element(ELT_SUBN_TEMP,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(TEMP, $<ctxt>$)             
                  }             
                  no_std_subs             
@@ -1598,7 +1673,7 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
 subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item            
                  { $<ctxt>$ = start_element(ELT_SUBN_ANCE,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(ANCE, $<ctxt>$)             
                  }             
                  no_std_subs             
@@ -1612,7 +1687,7 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item
 subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item            
                  { $<ctxt>$ = start_element(ELT_SUBN_DESC,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(DESC, $<ctxt>$)             
                  }             
                  no_std_subs             
@@ -1626,7 +1701,7 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item
 subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item            
                  { $<ctxt>$ = start_element(ELT_SUBN_ORDI,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(ORDI, $<ctxt>$)             
                  }             
                  no_std_subs             
@@ -1640,7 +1715,7 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item
 subn_rin_sect  : OPEN DELIM TAG_RIN mand_line_item            
                  { $<ctxt>$ = start_element(ELT_SUBN_RIN,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(RIN, $<ctxt>$)             
                  }             
                  no_std_subs             
@@ -1654,9 +1729,12 @@ subn_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
 /**** Submitter record                                            ****/
 /*********************************************************************/
 submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM    
-             { $<ctxt>$ = start_record(REC_SUBM,
-                                      $1, GEDCOM_MAKE_STRING($3), $5,
-                                      NULL, GEDCOM_MAKE_NULL());
+             { struct xref_value *xr = gedcom_parse_xref($3, XREF_DEFINED,
+                                                        XREF_SUBM);
+              if (xr == NULL) HANDLE_ERROR;
+              $<ctxt>$ = start_record(REC_SUBM,
+                                      $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
+                                      NULL, GEDCOM_MAKE_NULL(val2));
                START(SUBM, $<ctxt>$) }
              subm_subs
             { CHECK1(NAME) }
@@ -1682,7 +1760,7 @@ subm_sub   : subm_name_sect  { OCCUR2(NAME, 0, 1) }
 subm_name_sect : OPEN DELIM TAG_NAME mand_line_item             
                  { $<ctxt>$ = start_element(ELT_SUBM_NAME,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(NAME, $<ctxt>$)              
                  }              
                  no_std_subs              
@@ -1696,7 +1774,7 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item
 subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item             
                  { $<ctxt>$ = start_element(ELT_SUBM_LANG,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(LANG, $<ctxt>$)              
                  }              
                  no_std_subs              
@@ -1710,7 +1788,7 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item
 subm_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item             
                  { $<ctxt>$ = start_element(ELT_SUBM_RFN,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(RFN, $<ctxt>$)              
                  }              
                  no_std_subs              
@@ -1724,7 +1802,7 @@ subm_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item
 subm_rin_sect  : OPEN DELIM TAG_RIN mand_line_item             
                  { $<ctxt>$ = start_element(ELT_SUBM_RIN,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(RIN, $<ctxt>$)              
                  }              
                  no_std_subs              
@@ -1746,7 +1824,7 @@ addr_struc_sub : addr_sect { OCCUR2(ADDR, 0, 1) }
 addr_sect   : OPEN DELIM TAG_ADDR mand_line_item 
               { $<ctxt>$ = start_element(ELT_SUB_ADDR,
                                         PARENT, $1, $3, $4, 
-                                        GEDCOM_MAKE_STRING($4));
+                                        GEDCOM_MAKE_STRING(val1, $4));
                START(ADDR, $<ctxt>$)  
               }
               addr_subs
@@ -1773,7 +1851,7 @@ addr_sub    : addr_cont_sect  /* 0:M */
 addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_CONT,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(CONT, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1785,7 +1863,7 @@ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item
 addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR1,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(ADR1, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1797,7 +1875,7 @@ addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
 addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR2,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(ADR2, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1809,7 +1887,7 @@ addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
 addr_city_sect : OPEN DELIM TAG_CITY mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_CITY,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(CITY, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1821,7 +1899,7 @@ addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
 addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_STAE,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(STAE, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1833,7 +1911,7 @@ addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
 addr_post_sect : OPEN DELIM TAG_POST mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_POST,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(POST, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1845,7 +1923,7 @@ addr_post_sect : OPEN DELIM TAG_POST mand_line_item
 addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item              
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_CTRY,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(CTRY, $<ctxt>$)               
                  }               
                  no_std_subs               
@@ -1858,7 +1936,7 @@ addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
 phon_sect   : OPEN DELIM TAG_PHON mand_line_item              
               { $<ctxt>$ = start_element(ELT_SUB_PHON,
                                         PARENT, $1, $3, $4, 
-                                        GEDCOM_MAKE_STRING($4));
+                                        GEDCOM_MAKE_STRING(val1, $4));
                START(PHON, $<ctxt>$)               
               }               
               no_std_subs               
@@ -1873,9 +1951,12 @@ assoc_struc_sub : asso_sect /* 0:M */
                 ;
 
 asso_sect : OPEN DELIM TAG_ASSO mand_pointer
-            { $<ctxt>$ = start_element(ELT_SUB_ASSO,
+            { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                       XREF_INDI);
+             if (xr == NULL) HANDLE_ERROR;
+             $<ctxt>$ = start_element(ELT_SUB_ASSO,
                                       PARENT, $1, $3, $4, 
-                                      GEDCOM_MAKE_STRING($4));
+                                      GEDCOM_MAKE_XREF_PTR(val1, xr));
              START(ASSO, $<ctxt>$) 
             }
             asso_subs
@@ -1896,7 +1977,7 @@ asso_subs : /* empty */
 asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item               
                  { $<ctxt>$ = start_element(ELT_SUB_ASSO_TYPE,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(TYPE, $<ctxt>$)                
                  }                
                  no_std_subs                
@@ -1909,7 +1990,7 @@ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item
 asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item               
                  { $<ctxt>$ = start_element(ELT_SUB_ASSO_RELA,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(RELA, $<ctxt>$)                
                  }                
                  no_std_subs                
@@ -1926,7 +2007,7 @@ change_date_sub : change_date_chan_sect  { OCCUR2(CHAN, 0, 1) }
 change_date_chan_sect : OPEN DELIM TAG_CHAN
                         { $<ctxt>$ = start_element(ELT_SUB_CHAN,
                                                   PARENT, $1, $3, NULL, 
-                                                  GEDCOM_MAKE_NULL());
+                                                  GEDCOM_MAKE_NULL(val1));
                          START(CHAN, $<ctxt>$) 
                         }
                         change_date_chan_subs
@@ -1949,7 +2030,7 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item
                         { struct date_value dv = gedcom_parse_date($4);
                          $<ctxt>$ = start_element(ELT_SUB_CHAN_DATE,
                                                   PARENT, $1, $3, $4, 
-                                                  GEDCOM_MAKE_DATE(dv));
+                                                  GEDCOM_MAKE_DATE(val1, dv));
                          START(DATE, $<ctxt>$) }
                         change_date_date_subs
                        { CHECK0 }
@@ -1971,7 +2052,7 @@ change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
                              { $<ctxt>$
                                 = start_element(ELT_SUB_CHAN_TIME,
                                                 PARENT, $1, $3, $4, 
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                               START(TIME, $<ctxt>$) 
                              } 
                              no_std_subs 
@@ -1987,9 +2068,12 @@ chi_fam_link_sub : famc_sect  /* 0:M */
                  ;
 
 famc_sect : OPEN DELIM TAG_FAMC mand_pointer
-            { $<ctxt>$ = start_element(ELT_SUB_FAMC,
+            { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                         XREF_FAM);
+             if (xr == NULL) HANDLE_ERROR;
+             $<ctxt>$ = start_element(ELT_SUB_FAMC,
                                       PARENT, $1, $3, $4, 
-                                      GEDCOM_MAKE_STRING($4));
+                                      GEDCOM_MAKE_XREF_PTR(val1, xr));
              START(FAMC, $<ctxt>$) 
             }
             famc_subs
@@ -2011,7 +2095,7 @@ famc_sub  : famc_pedi_sect  /* 0:M */
 famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item 
                  { $<ctxt>$ = start_element(ELT_SUB_FAMC_PEDI,
                                            PARENT, $1, $3, $4, 
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(PEDI, $<ctxt>$)  
                  }  
                  no_std_subs  
@@ -2029,7 +2113,7 @@ continuation_sub : cont_sect  /* 0:M */
 cont_sect : OPEN DELIM TAG_CONT mand_line_item 
             { $<ctxt>$ = start_element(ELT_SUB_CONT,
                                       PARENT, $1, $3, $4, 
-                                      GEDCOM_MAKE_STRING($4));
+                                      GEDCOM_MAKE_STRING(val1, $4));
              START(CONT, $<ctxt>$)  
             }  
             no_std_subs  
@@ -2042,7 +2126,7 @@ cont_sect : OPEN DELIM TAG_CONT mand_line_item
 conc_sect : OPEN DELIM TAG_CONC mand_line_item 
             { $<ctxt>$ = start_element(ELT_SUB_CONC,
                                       PARENT, $1, $3, $4, 
-                                      GEDCOM_MAKE_STRING($4));
+                                      GEDCOM_MAKE_STRING(val1, $4));
              START(CONC, $<ctxt>$)  
             }  
             no_std_subs  
@@ -2066,9 +2150,10 @@ event_detail_sub : event_detail_type_sect  { OCCUR2(TYPE, 0, 1) }
                  ;
 
 event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item 
-                         { $<ctxt>$ = start_element(ELT_SUB_EVT_TYPE,
-                                                   PARENT, $1, $3, $4, 
-                                                   GEDCOM_MAKE_STRING($4));
+                         { $<ctxt>$
+                            = start_element(ELT_SUB_EVT_TYPE,
+                                            PARENT, $1, $3, $4, 
+                                            GEDCOM_MAKE_STRING(val1, $4));
                           START(TYPE, $<ctxt>$)  
                          }  
                          no_std_subs  
@@ -2080,9 +2165,10 @@ event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item
                        ;
 event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item 
                          { struct date_value dv = gedcom_parse_date($4);
-                          $<ctxt>$ = start_element(ELT_SUB_EVT_DATE,
-                                                   PARENT, $1, $3, $4, 
-                                                   GEDCOM_MAKE_DATE(dv));
+                          $<ctxt>$
+                            = start_element(ELT_SUB_EVT_DATE,
+                                            PARENT, $1, $3, $4, 
+                                            GEDCOM_MAKE_DATE(val1, dv));
                           START(DATE, $<ctxt>$)  
                          }  
                          no_std_subs  
@@ -2093,9 +2179,10 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
                         }
                        ;
 event_detail_age_sect  : OPEN DELIM TAG_AGE mand_line_item 
-                         { $<ctxt>$ = start_element(ELT_SUB_EVT_AGE,
-                                                   PARENT, $1, $3, $4, 
-                                                   GEDCOM_MAKE_STRING($4));
+                         { $<ctxt>$
+                            = start_element(ELT_SUB_EVT_AGE,
+                                            PARENT, $1, $3, $4, 
+                                            GEDCOM_MAKE_STRING(val1, $4));
                           START(AGE, $<ctxt>$)  
                          }  
                          no_std_subs  
@@ -2106,9 +2193,10 @@ event_detail_age_sect  : OPEN DELIM TAG_AGE mand_line_item
                         }
                        ;
 event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item 
-                         { $<ctxt>$ = start_element(ELT_SUB_EVT_AGNC,
-                                                   PARENT, $1, $3, $4, 
-                                                   GEDCOM_MAKE_STRING($4));
+                         { $<ctxt>$
+                            = start_element(ELT_SUB_EVT_AGNC,
+                                            PARENT, $1, $3, $4, 
+                                            GEDCOM_MAKE_STRING(val1, $4));
                           START(AGNC, $<ctxt>$)  
                          }  
                          no_std_subs  
@@ -2119,9 +2207,10 @@ event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
                         }
                        ;
 event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item 
-                         { $<ctxt>$ = start_element(ELT_SUB_EVT_CAUS,
-                                                   PARENT, $1, $3, $4, 
-                                                   GEDCOM_MAKE_STRING($4));
+                         { $<ctxt>$
+                            = start_element(ELT_SUB_EVT_CAUS,
+                                            PARENT, $1, $3, $4, 
+                                            GEDCOM_MAKE_STRING(val1, $4));
                           START(CAUS, $<ctxt>$)  
                          }  
                          no_std_subs  
@@ -2138,12 +2227,11 @@ fam_event_struc_sub : fam_event_sect
                     ;
 
 fam_event_sect : OPEN DELIM fam_event_tag opt_value  
-                 { 
-                  $<ctxt>$ = start_element(ELT_SUB_FAM_EVT,
-                                           PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_NULL_OR_STRING($4));
-                  /* set the parent context separately from START here */
-                  set_parentctxt($<ctxt>$);
+                 { $<ctxt>$
+                    = start_element(ELT_SUB_FAM_EVT,
+                                    PARENT, $1, $3, $4,
+                                    GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
+                  START2($<ctxt>$);
                 }
                  fam_event_subs
                  { CHECK0 }
@@ -2152,16 +2240,16 @@ fam_event_sect : OPEN DELIM fam_event_tag opt_value
                 }
                ;
 
-fam_event_tag : TAG_ANUL { $$ = $1; START(ANUL, NULL) }
-              | TAG_CENS { $$ = $1; START(CENS, NULL) }
-              | TAG_DIV { $$ = $1; START(DIV, NULL) }
-              | TAG_DIVF { $$ = $1; START(DIVF, NULL) }
-              | TAG_ENGA { $$ = $1; START(ENGA, NULL) }
-              | TAG_MARR { $$ = $1; START(MARR, NULL) }
-              | TAG_MARB { $$ = $1; START(MARB, NULL) }
-              | TAG_MARC { $$ = $1; START(MARC, NULL) }
-              | TAG_MARL { $$ = $1; START(MARL, NULL) }
-              | TAG_MARS { $$ = $1; START(MARS, NULL) }
+fam_event_tag : TAG_ANUL { $$ = $1; START1(ANUL) }
+              | TAG_CENS { $$ = $1; START1(CENS) }
+              | TAG_DIV { $$ = $1; START1(DIV) }
+              | TAG_DIVF { $$ = $1; START1(DIVF) }
+              | TAG_ENGA { $$ = $1; START1(ENGA) }
+              | TAG_MARR { $$ = $1; START1(MARR) }
+              | TAG_MARB { $$ = $1; START1(MARB) }
+              | TAG_MARC { $$ = $1; START1(MARC) }
+              | TAG_MARL { $$ = $1; START1(MARL) }
+              | TAG_MARS { $$ = $1; START1(MARS) }
               ;
 
 fam_event_subs : /* empty */
@@ -2177,7 +2265,7 @@ fam_event_sub : event_detail_sub
 fam_even_husb_sect : OPEN DELIM TAG_HUSB
                      { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_HUSB,
                                                PARENT, $1, $3, NULL,
-                                               GEDCOM_MAKE_NULL());
+                                               GEDCOM_MAKE_NULL(val1));
                       START(HUSB, $<ctxt>$) 
                      }
                      fam_even_husb_subs
@@ -2199,7 +2287,7 @@ fam_even_husb_sub : fam_even_age_sect  { OCCUR2(AGE, 1, 1) }
 fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item  
                     { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_AGE,
                                               PARENT, $1, $3, $4,
-                                              GEDCOM_MAKE_STRING($4));
+                                              GEDCOM_MAKE_STRING(val1, $4));
                      START(AGE, $<ctxt>$)   
                     }   
                     no_std_subs   
@@ -2213,7 +2301,7 @@ fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item
 fam_even_wife_sect : OPEN DELIM TAG_WIFE
                      { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_WIFE,
                                                PARENT, $1, $3, NULL,
-                                               GEDCOM_MAKE_NULL());
+                                               GEDCOM_MAKE_NULL(val1));
                       START(WIFE, $<ctxt>$) 
                      }
                      fam_even_husb_subs
@@ -2227,7 +2315,7 @@ fam_even_wife_sect : OPEN DELIM TAG_WIFE
 fam_gen_even_sect : OPEN DELIM TAG_EVEN
                     { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_EVEN,
                                                PARENT, $1, $3, NULL,
-                                               GEDCOM_MAKE_NULL());
+                                               GEDCOM_MAKE_NULL(val1));
                       START(EVEN, $<ctxt>$) 
                     }
                     fam_gen_even_subs
@@ -2256,7 +2344,7 @@ ident_struc_sub : ident_refn_sect  /* 0:M */
 ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item 
                   { $<ctxt>$ = start_element(ELT_SUB_IDENT_REFN,
                                             PARENT, $1, $3, $4,
-                                            GEDCOM_MAKE_STRING($4));
+                                            GEDCOM_MAKE_STRING(val1, $4));
                    START(REFN, $<ctxt>$)  
                   }
                   ident_refn_subs
@@ -2276,9 +2364,10 @@ ident_refn_sub  : ident_refn_type_sect  { OCCUR2(TYPE, 0, 1) }
                 ;
 
 ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item   
-                       { $<ctxt>$ = start_element(ELT_SUB_IDENT_REFN_TYPE,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { $<ctxt>$
+                          = start_element(ELT_SUB_IDENT_REFN_TYPE,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_STRING(val1, $4));
                         START(TYPE, $<ctxt>$)    
                        }    
                        no_std_subs    
@@ -2292,7 +2381,7 @@ ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item
 ident_rin_sect  : OPEN DELIM TAG_RIN mand_line_item   
                   { $<ctxt>$ = start_element(ELT_SUB_IDENT_RIN,
                                             PARENT, $1, $3, $4,
-                                            GEDCOM_MAKE_STRING($4));
+                                            GEDCOM_MAKE_STRING(val1, $4));
                    START(RIN, $<ctxt>$)    
                   }    
                   no_std_subs    
@@ -2311,9 +2400,8 @@ indiv_attr_struc_sub : indiv_attr_sect   /* 0:M */
 indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item
                   { $<ctxt>$ = start_element(ELT_SUB_INDIV_ATTR,
                                             PARENT, $1, $3, $4,
-                                            GEDCOM_MAKE_STRING($4));
-                   /* set the parent context separately from START here */
-                   set_parentctxt($<ctxt>$);
+                                            GEDCOM_MAKE_STRING(val1, $4));
+                   START2($<ctxt>$);
                  }
                   indiv_attr_event_subs
                   { CHECK0 }
@@ -2321,23 +2409,23 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item
                   { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>5, NULL);
                  }
 
-indiv_attr_tag  : TAG_CAST { $$ = $1; START(CAST, NULL) }
-                | TAG_DSCR { $$ = $1; START(DSCR, NULL) }
-                | TAG_EDUC { $$ = $1; START(EDUC, NULL) }
-                | TAG_IDNO { $$ = $1; START(IDNO, NULL) }
-                | TAG_NATI { $$ = $1; START(NATI, NULL) }
-                | TAG_NCHI { $$ = $1; START(NCHI, NULL) }
-                | TAG_NMR  { $$ = $1; START(NMR, NULL) }
-                | TAG_OCCU { $$ = $1; START(OCCU, NULL) }
-                | TAG_PROP { $$ = $1; START(PROP, NULL) }
-                | TAG_RELI { $$ = $1; START(RELI, NULL) }
-                | TAG_SSN  { $$ = $1; START(SSN, NULL) }
-                | TAG_TITL { $$ = $1; START(TITL, NULL) }
+indiv_attr_tag  : TAG_CAST { $$ = $1; START1(CAST) }
+                | TAG_DSCR { $$ = $1; START1(DSCR) }
+                | TAG_EDUC { $$ = $1; START1(EDUC) }
+                | TAG_IDNO { $$ = $1; START1(IDNO) }
+                | TAG_NATI { $$ = $1; START1(NATI) }
+                | TAG_NCHI { $$ = $1; START1(NCHI) }
+                | TAG_NMR  { $$ = $1; START1(NMR) }
+                | TAG_OCCU { $$ = $1; START1(OCCU) }
+                | TAG_PROP { $$ = $1; START1(PROP) }
+                | TAG_RELI { $$ = $1; START1(RELI) }
+                | TAG_SSN  { $$ = $1; START1(SSN) }
+                | TAG_TITL { $$ = $1; START1(TITL) }
 
 indiv_resi_sect : OPEN DELIM TAG_RESI 
                   { $<ctxt>$ = start_element(ELT_SUB_INDIV_RESI,
                                             PARENT, $1, $3, NULL,
-                                            GEDCOM_MAKE_NULL());
+                                            GEDCOM_MAKE_NULL(val1));
                    START(RESI, $<ctxt>$)  
                   }
                   indiv_attr_event_subs 
@@ -2363,11 +2451,11 @@ indiv_even_struc_sub : indiv_birt_sect
                      ;
 
 indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value 
-                  { $<ctxt>$ = start_element(ELT_SUB_INDIV_BIRT,
-                                            PARENT, $1, $3, $4,
-                                            GEDCOM_MAKE_NULL_OR_STRING($4));
-                   /* set the parent context separately from START here */
-                   set_parentctxt($<ctxt>$);
+                  { $<ctxt>$
+                     = start_element(ELT_SUB_INDIV_BIRT,
+                                     PARENT, $1, $3, $4,
+                                     GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
+                   START2($<ctxt>$);
                  }
                   indiv_birt_subs
                   { CHECK0 }
@@ -2376,8 +2464,8 @@ indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value
                  }
                 ;
 
-indiv_birt_tag  : TAG_BIRT { $$ = $1; START(BIRT, NULL) }
-                | TAG_CHR { $$ = $1; START(CHR, NULL) }
+indiv_birt_tag  : TAG_BIRT { $$ = $1; START1(BIRT) }
+                | TAG_CHR { $$ = $1; START1(CHR) }
                 ;
 
 indiv_birt_subs : /* empty */
@@ -2390,9 +2478,14 @@ indiv_birt_sub  : event_detail_sub
                 ;
 
 indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
-                       { $<ctxt>$ = start_element(ELT_SUB_INDIV_BIRT_FAMC,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { struct xref_value *xr = gedcom_parse_xref($4,
+                                                                  XREF_USED,
+                                                                  XREF_FAM);
+                        if (xr == NULL) HANDLE_ERROR;
+                        $<ctxt>$
+                          = start_element(ELT_SUB_INDIV_BIRT_FAMC,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                         START(FAMC, $<ctxt>$) 
                        } 
                        no_std_subs 
@@ -2404,11 +2497,11 @@ indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
                      ;
 
 indiv_gen_sect  : OPEN DELIM indiv_gen_tag opt_value 
-                  { $<ctxt>$ = start_element(ELT_SUB_INDIV_GEN,
-                                            PARENT, $1, $3, $4,
-                                            GEDCOM_MAKE_NULL_OR_STRING($4));
-                   /* set the parent context separately from START here */
-                   set_parentctxt($<ctxt>$);
+                  { $<ctxt>$
+                     = start_element(ELT_SUB_INDIV_GEN,
+                                     PARENT, $1, $3, $4,
+                                     GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
+                   START2($<ctxt>$);
                  }
                   indiv_gen_subs
                   { CHECK0 }
@@ -2417,25 +2510,25 @@ indiv_gen_sect  : OPEN DELIM indiv_gen_tag opt_value
                  }
                 ;
 
-indiv_gen_tag   : TAG_DEAT { $$ = $1; START(DEAT, NULL) }
-                | TAG_BURI { $$ = $1; START(BURI, NULL) }
-                | TAG_CREM { $$ = $1; START(CREM, NULL) }
-                | TAG_BAPM { $$ = $1; START(BAPM, NULL) }
-                | TAG_BARM { $$ = $1; START(BARM, NULL) }
-                | TAG_BASM { $$ = $1; START(BASM, NULL) }
-                | TAG_BLES { $$ = $1; START(BLES, NULL) }
-                | TAG_CHRA { $$ = $1; START(CHRA, NULL) }
-                | TAG_CONF { $$ = $1; START(CONF, NULL) }
-                | TAG_FCOM { $$ = $1; START(FCOM, NULL) }
-                | TAG_ORDN { $$ = $1; START(ORDN, NULL) }
-                | TAG_NATU { $$ = $1; START(NATU, NULL) }
-                | TAG_EMIG { $$ = $1; START(EMIG, NULL) }
-                | TAG_IMMI { $$ = $1; START(IMMI, NULL) }
-                | TAG_CENS { $$ = $1; START(CENS, NULL) }
-                | TAG_PROB { $$ = $1; START(PROB, NULL) }
-                | TAG_WILL { $$ = $1; START(WILL, NULL) }
-                | TAG_GRAD { $$ = $1; START(GRAD, NULL) }
-                | TAG_RETI { $$ = $1; START(RETI, NULL) }
+indiv_gen_tag   : TAG_DEAT { $$ = $1; START1(DEAT) }
+                | TAG_BURI { $$ = $1; START1(BURI) }
+                | TAG_CREM { $$ = $1; START1(CREM) }
+                | TAG_BAPM { $$ = $1; START1(BAPM) }
+                | TAG_BARM { $$ = $1; START1(BARM) }
+                | TAG_BASM { $$ = $1; START1(BASM) }
+                | TAG_BLES { $$ = $1; START1(BLES) }
+                | TAG_CHRA { $$ = $1; START1(CHRA) }
+                | TAG_CONF { $$ = $1; START1(CONF) }
+                | TAG_FCOM { $$ = $1; START1(FCOM) }
+                | TAG_ORDN { $$ = $1; START1(ORDN) }
+                | TAG_NATU { $$ = $1; START1(NATU) }
+                | TAG_EMIG { $$ = $1; START1(EMIG) }
+                | TAG_IMMI { $$ = $1; START1(IMMI) }
+                | TAG_CENS { $$ = $1; START1(CENS) }
+                | TAG_PROB { $$ = $1; START1(PROB) }
+                | TAG_WILL { $$ = $1; START1(WILL) }
+                | TAG_GRAD { $$ = $1; START1(GRAD) }
+                | TAG_RETI { $$ = $1; START1(RETI) }
                 ;
 
 indiv_gen_subs  : /* empty */
@@ -2447,9 +2540,10 @@ indiv_gen_sub   : event_detail_sub
                 ;
 
 indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value 
-                  { $<ctxt>$ = start_element(ELT_SUB_INDIV_ADOP,
-                                            PARENT, $1, $3, $4,
-                                            GEDCOM_MAKE_NULL_OR_STRING($4));
+                  { $<ctxt>$
+                     = start_element(ELT_SUB_INDIV_ADOP,
+                                     PARENT, $1, $3, $4,
+                                     GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
                    START(ADOP, $<ctxt>$) }
                   indiv_adop_subs
                  { CHECK0 }
@@ -2468,9 +2562,14 @@ indiv_adop_sub  : event_detail_sub
                 ;
 
 indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
-                       { $<ctxt>$ = start_element(ELT_SUB_INDIV_ADOP_FAMC,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { struct xref_value *xr = gedcom_parse_xref($4,
+                                                                  XREF_USED,
+                                                                  XREF_FAM);
+                        if (xr == NULL) HANDLE_ERROR;
+                        $<ctxt>$
+                          = start_element(ELT_SUB_INDIV_ADOP_FAMC,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                         START(FAMC, $<ctxt>$) }
                        indiv_adop_famc_subs
                       { CHECK0 }
@@ -2492,7 +2591,7 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
                             { $<ctxt>$
                                = start_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                              START(ADOP, $<ctxt>$) }    
                             no_std_subs    
                             { CHECK0 }    
@@ -2505,7 +2604,7 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
 indiv_even_sect : OPEN DELIM TAG_EVEN
                   { $<ctxt>$ = start_element(ELT_SUB_INDIV_EVEN,
                                             PARENT, $1, $3, NULL,
-                                            GEDCOM_MAKE_NULL());
+                                            GEDCOM_MAKE_NULL(val1));
                    START(EVEN, $<ctxt>$) }
                   indiv_gen_subs
                  { CHECK0 }
@@ -2522,9 +2621,8 @@ lds_indiv_ord_sub : lio_bapl_sect  /* 0:M */
 lio_bapl_sect : OPEN DELIM lio_bapl_tag 
                 { $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL,
                                           PARENT, $1, $3, NULL,
-                                          GEDCOM_MAKE_NULL());
-                 /* set the parent context separately from START here */
-                 set_parentctxt($<ctxt>$);
+                                          GEDCOM_MAKE_NULL(val1));
+                 START2($<ctxt>$);
                }
                 lio_bapl_subs
                 { CHECK0 }
@@ -2533,9 +2631,9 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag
                }
               ;
 
-lio_bapl_tag  : TAG_BAPL { $$ = $1; START(BAPL, NULL) }
-              | TAG_CONL { $$ = $1; START(CONL, NULL) }
-              | TAG_ENDL { $$ = $1; START(ENDL, NULL) }
+lio_bapl_tag  : TAG_BAPL { $$ = $1; START1(BAPL) }
+              | TAG_CONL { $$ = $1; START1(CONL) }
+              | TAG_ENDL { $$ = $1; START1(ENDL) }
               ;
 
 lio_bapl_subs : /* empty */
@@ -2554,7 +2652,7 @@ lio_bapl_sub  : lio_bapl_stat_sect  { OCCUR2(STAT, 0, 1) }
 lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item   
                      { $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_STAT,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                       START(STAT, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2568,7 +2666,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
                      { struct date_value dv = gedcom_parse_date($4);
                       $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_DATE,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_DATE(dv));
+                                               GEDCOM_MAKE_DATE(val1, dv));
                       START(DATE, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2581,7 +2679,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
 lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item   
                      { $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_TEMP,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                       START(TEMP, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2594,7 +2692,7 @@ lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
 lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item   
                      { $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_PLAC,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                       START(PLAC, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2608,7 +2706,7 @@ lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
 lio_slgc_sect : OPEN DELIM TAG_SLGC
                 { $<ctxt>$ = start_element(ELT_SUB_LIO_SLGC,
                                           PARENT, $1, $3, NULL,
-                                          GEDCOM_MAKE_NULL());
+                                          GEDCOM_MAKE_NULL(val1));
                  START(SLGC, $<ctxt>$) 
                 }
                 lio_slgc_subs
@@ -2627,9 +2725,13 @@ lio_slgc_sub  : lio_bapl_sub
               ;
 
 lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
-                     { $<ctxt>$ = start_element(ELT_SUB_LIO_SLGC_FAMC,
-                                               PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                     { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                                XREF_FAM);
+                      if (xr == NULL) HANDLE_ERROR;
+                      $<ctxt>$
+                        = start_element(ELT_SUB_LIO_SLGC_FAMC,
+                                        PARENT, $1, $3, $4,
+                                        GEDCOM_MAKE_XREF_PTR(val1, xr));
                       START(FAMC, $<ctxt>$) 
                      } 
                      no_std_subs 
@@ -2647,7 +2749,7 @@ lds_spouse_seal_sub : lss_slgs_sect
 lss_slgs_sect : OPEN DELIM TAG_SLGS
                 { $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS,
                                           PARENT, $1, $3, NULL,
-                                          GEDCOM_MAKE_NULL());
+                                          GEDCOM_MAKE_NULL(val1));
                  START(SLGS, $<ctxt>$) }
                 lss_slgs_subs
                { CHECK0 }
@@ -2672,7 +2774,7 @@ lss_slgs_sub  : lss_slgs_stat_sect  { OCCUR2(STAT, 0, 1) }
 lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item   
                      { $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_STAT,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                       START(STAT, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2686,7 +2788,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
                      { struct date_value dv = gedcom_parse_date($4);
                       $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_DATE,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_DATE(dv));
+                                               GEDCOM_MAKE_DATE(val1, dv));
                       START(DATE, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2699,7 +2801,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
 lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item   
                      { $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_TEMP,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                       START(TEMP, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2712,7 +2814,7 @@ lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
 lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item   
                      { $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_PLAC,
                                                PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                                               GEDCOM_MAKE_STRING(val1, $4));
                       START(PLAC, $<ctxt>$)    
                      }    
                      no_std_subs    
@@ -2729,9 +2831,14 @@ multim_link_sub : multim_obje_link_sect
                 ;
 
 multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER    
-                        { $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE,
-                                                  PARENT, $1, $3, $5,
-                                                  GEDCOM_MAKE_STRING($5));
+                        { struct xref_value *xr = gedcom_parse_xref($5,
+                                                                   XREF_USED,
+                                                                   XREF_OBJE);
+                         if (xr == NULL) HANDLE_ERROR;
+                         $<ctxt>$
+                           = start_element(ELT_SUB_MULTIM_OBJE,
+                                           PARENT, $1, $3, $5,
+                                           GEDCOM_MAKE_XREF_PTR(val1, xr));
                          START(OBJE, $<ctxt>$)     
                         }     
                         no_std_subs     
@@ -2745,7 +2852,7 @@ multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER
 multim_obje_emb_sect : OPEN DELIM TAG_OBJE
                        { $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE,
                                                  PARENT, $1, $3, NULL,
-                                                 GEDCOM_MAKE_NULL());
+                                                 GEDCOM_MAKE_NULL(val1));
                         START(OBJE, $<ctxt>$) 
                        }
                        multim_obje_emb_subs
@@ -2768,9 +2875,10 @@ multim_obje_emb_sub : multim_obje_form_sect  { OCCUR2(FORM, 1, 1) }
                     ;
 
 multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item    
-                        { $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE_FORM,
-                                                  PARENT, $1, $3, $4,
-                                                  GEDCOM_MAKE_STRING($4));
+                        { $<ctxt>$
+                           = start_element(ELT_SUB_MULTIM_OBJE_FORM,
+                                           PARENT, $1, $3, $4,
+                                           GEDCOM_MAKE_STRING(val1, $4));
                          START(FORM, $<ctxt>$)     
                         }     
                         no_std_subs     
@@ -2781,9 +2889,10 @@ multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
                        }
                       ;
 multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item    
-                        { $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE_TITL,
-                                                  PARENT, $1, $3, $4,
-                                                  GEDCOM_MAKE_STRING($4));
+                        { $<ctxt>$
+                           = start_element(ELT_SUB_MULTIM_OBJE_TITL,
+                                           PARENT, $1, $3, $4,
+                                           GEDCOM_MAKE_STRING(val1, $4));
                          START(TITL, $<ctxt>$)     
                         }     
                         no_std_subs     
@@ -2794,9 +2903,10 @@ multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
                        }
                       ;
 multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item    
-                        { $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE_FILE,
-                                                  PARENT, $1, $3, $4,
-                                                  GEDCOM_MAKE_STRING($4));
+                        { $<ctxt>$
+                           = start_element(ELT_SUB_MULTIM_OBJE_FILE,
+                                           PARENT, $1, $3, $4,
+                                           GEDCOM_MAKE_STRING(val1, $4));
                          START(FILE, $<ctxt>$)     
                         }     
                         no_std_subs     
@@ -2813,9 +2923,14 @@ note_struc_sub : note_struc_link_sect  /* 0:M */
                ;
 
 note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER
-                       { $<ctxt>$ = start_element(ELT_SUB_NOTE,
-                                                 PARENT, $1, $3, $5,
-                                                 GEDCOM_MAKE_STRING($5));
+                       { struct xref_value *xr = gedcom_parse_xref($5,
+                                                                  XREF_USED,
+                                                                  XREF_NOTE);
+                        if (xr == NULL) HANDLE_ERROR;
+                        $<ctxt>$
+                          = start_element(ELT_SUB_NOTE,
+                                          PARENT, $1, $3, $5,
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                         START(NOTE, $<ctxt>$) 
                        }
                        note_struc_link_subs
@@ -2837,7 +2952,7 @@ note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item
                       { $<ctxt>$
                          = start_element(ELT_SUB_NOTE,
                                          PARENT, $1, $3, $4,
-                                         GEDCOM_MAKE_NULL_OR_STRING($4));
+                                        GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
                        START(NOTE, $<ctxt>$) 
                       }
                       note_struc_emb_subs
@@ -2863,7 +2978,7 @@ pers_name_struc_sub : pers_name_sect /* 0:M */
 pers_name_sect : OPEN DELIM TAG_NAME mand_line_item 
                  { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(NAME, $<ctxt>$)  
                  }
                  pers_name_subs
@@ -2891,7 +3006,7 @@ pers_name_sub  : pers_name_npfx_sect  { OCCUR2(NPFX, 0, 1) }
 pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item    
                       { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NPFX,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(NPFX, $<ctxt>$)     
                       }     
                       no_std_subs     
@@ -2904,7 +3019,7 @@ pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item
 pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item    
                       { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_GIVN,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(GIVN, $<ctxt>$)     
                       }     
                       no_std_subs     
@@ -2917,7 +3032,7 @@ pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item
 pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item    
                       { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NICK,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(NICK, $<ctxt>$)     
                       }     
                       no_std_subs     
@@ -2930,7 +3045,7 @@ pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item
 pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item    
                       { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_SPFX,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(SPFX, $<ctxt>$)     
                       }     
                       no_std_subs     
@@ -2943,7 +3058,7 @@ pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item
 pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item    
                       { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_SURN,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(SURN, $<ctxt>$)     
                       }     
                       no_std_subs     
@@ -2956,7 +3071,7 @@ pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item
 pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item    
                       { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME_NSFX,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(NSFX, $<ctxt>$)     
                       }     
                       no_std_subs     
@@ -2972,9 +3087,10 @@ place_struc_sub : place_struc_plac_sect /* 0:M */
                 ;
 
 place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item 
-                        { $<ctxt>$ = start_element(ELT_SUB_PLAC,
-                                                  PARENT, $1, $3, $4,
-                                                  GEDCOM_MAKE_STRING($4));
+                        { $<ctxt>$
+                           = start_element(ELT_SUB_PLAC,
+                                           PARENT, $1, $3, $4,
+                                           GEDCOM_MAKE_STRING(val1, $4));
                          START(PLAC, $<ctxt>$)  
                         }
                         place_struc_plac_subs
@@ -2995,9 +3111,10 @@ place_struc_plac_sub : place_plac_form_sect  { OCCUR2(FORM, 0, 1) }
                      ;
 
 place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item    
-                       { $<ctxt>$ = start_element(ELT_SUB_PLAC_FORM,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { $<ctxt>$
+                          = start_element(ELT_SUB_PLAC_FORM,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_STRING(val1, $4));
                         START(FORM, $<ctxt>$)     
                        }     
                        no_std_subs     
@@ -3014,9 +3131,14 @@ source_cit_sub : source_cit_link_sect /* 0:M */
                ;
 
 source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER
-                       { $<ctxt>$ = start_element(ELT_SUB_SOUR,
-                                                 PARENT, $1, $3, $5,
-                                                 GEDCOM_MAKE_STRING($5));
+                       { struct xref_value *xr = gedcom_parse_xref($5,
+                                                                  XREF_USED,
+                                                                  XREF_SOUR);
+                        if (xr == NULL) HANDLE_ERROR;
+                        $<ctxt>$
+                          = start_element(ELT_SUB_SOUR,
+                                          PARENT, $1, $3, $5,
+                                          GEDCOM_MAKE_XREF_PTR(val1, xr));
                         START(SOUR, $<ctxt>$) 
                        }
                        source_cit_link_subs
@@ -3040,9 +3162,10 @@ source_cit_link_sub : source_cit_page_sect  { OCCUR2(PAGE, 0, 1) }
                     ;
 
 source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item    
-                       { $<ctxt>$ = start_element(ELT_SUB_SOUR_PAGE,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { $<ctxt>$
+                          = start_element(ELT_SUB_SOUR_PAGE,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_STRING(val1, $4));
                         START(PAGE, $<ctxt>$)     
                        }     
                        no_std_subs     
@@ -3054,9 +3177,10 @@ source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item
                      ;
 
 source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item 
-                       { $<ctxt>$ = start_element(ELT_SUB_SOUR_EVEN,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { $<ctxt>$
+                          = start_element(ELT_SUB_SOUR_EVEN,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_STRING(val1, $4));
                         START(EVEN, $<ctxt>$)     
                        }
                        source_cit_even_subs
@@ -3076,9 +3200,10 @@ source_cit_even_sub  : source_cit_even_role_sect  { OCCUR2(ROLE, 0, 1) }
                      ;
 
 source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item    
-                          { $<ctxt>$ = start_element(ELT_SUB_SOUR_EVEN_ROLE,
-                                                    PARENT, $1, $3, $4,
-                                                    GEDCOM_MAKE_STRING($4));
+                          { $<ctxt>$
+                             = start_element(ELT_SUB_SOUR_EVEN_ROLE,
+                                             PARENT, $1, $3, $4,
+                                             GEDCOM_MAKE_STRING(val1, $4));
                            START(ROLE, $<ctxt>$)     
                           }     
                           no_std_subs     
@@ -3092,7 +3217,7 @@ source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item
 source_cit_data_sect : OPEN DELIM TAG_DATA
                        { $<ctxt>$ = start_element(ELT_SUB_SOUR_DATA,
                                                  PARENT, $1, $3, NULL,
-                                                 GEDCOM_MAKE_NULL());
+                                                 GEDCOM_MAKE_NULL(val1));
                         START(DATA, $<ctxt>$) 
                        }
                        source_cit_data_subs
@@ -3114,9 +3239,10 @@ source_cit_data_sub : source_cit_data_date_sect  { OCCUR2(DATE, 0, 1) }
 
 source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item    
                             { struct date_value dv = gedcom_parse_date($4);
-                             $<ctxt>$ = start_element(ELT_SUB_SOUR_DATA_DATE,
-                                                      PARENT, $1, $3, $4,
-                                                      GEDCOM_MAKE_DATE(dv));
+                             $<ctxt>$
+                               = start_element(ELT_SUB_SOUR_DATA_DATE,
+                                               PARENT, $1, $3, $4,
+                                               GEDCOM_MAKE_DATE(val1, dv));
                              START(DATE, $<ctxt>$)     
                             }     
                             no_std_subs     
@@ -3128,9 +3254,10 @@ source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
                           ;
 
 source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item 
-                       { $<ctxt>$ = start_element(ELT_SUB_SOUR_TEXT,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { $<ctxt>$
+                          = start_element(ELT_SUB_SOUR_TEXT,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_STRING(val1, $4));
                         START(TEXT, $<ctxt>$)  
                        }
                        source_cit_text_subs
@@ -3150,9 +3277,10 @@ source_cit_text_sub : continuation_sub
                     ;
 
 source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item    
-                       { $<ctxt>$ = start_element(ELT_SUB_SOUR_QUAY,
-                                                 PARENT, $1, $3, $4,
-                                                 GEDCOM_MAKE_STRING($4));
+                       { $<ctxt>$
+                          = start_element(ELT_SUB_SOUR_QUAY,
+                                          PARENT, $1, $3, $4,
+                                          GEDCOM_MAKE_STRING(val1, $4));
                         START(QUAY, $<ctxt>$)     
                        }     
                        no_std_subs     
@@ -3166,7 +3294,7 @@ source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item
 source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item
                       { $<ctxt>$ = start_element(ELT_SUB_SOUR,
                                                 PARENT, $1, $3, $4,
-                                                GEDCOM_MAKE_STRING($4));
+                                                GEDCOM_MAKE_STRING(val1, $4));
                        START(SOUR, $<ctxt>$) 
                       }
                       source_cit_emb_subs
@@ -3191,9 +3319,13 @@ source_repos_cit_sub : source_repos_repo_sect  { OCCUR2(REPO, 0, 1) }
                      ;
 
 source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer
-                         { $<ctxt>$ = start_element(ELT_SUB_REPO,
-                                                   PARENT, $1, $3, $4,
-                                                   GEDCOM_MAKE_STRING($4));
+                         { struct xref_value *xr
+                            = gedcom_parse_xref($4, XREF_USED, XREF_REPO);
+                          if (xr == NULL) HANDLE_ERROR;
+                          $<ctxt>$
+                            = start_element(ELT_SUB_REPO,
+                                            PARENT, $1, $3, $4,
+                                            GEDCOM_MAKE_XREF_PTR(val1, xr));
                           START(REPO, $<ctxt>$) 
                          }
                          source_repos_repo_subs
@@ -3215,7 +3347,7 @@ source_repos_repo_sub  : note_struc_sub
 caln_sect : OPEN DELIM TAG_CALN mand_line_item 
             { $<ctxt>$ = start_element(ELT_SUB_REPO_CALN,
                                       PARENT, $1, $3, $4,
-                                      GEDCOM_MAKE_STRING($4));
+                                      GEDCOM_MAKE_STRING(val1, $4));
              START(CALN, $<ctxt>$) 
            }
             caln_subs
@@ -3236,7 +3368,7 @@ caln_sub  : caln_medi_sect  { OCCUR2(MEDI, 0, 1) }
 caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item    
                  { $<ctxt>$ = start_element(ELT_SUB_REPO_CALN_MEDI,
                                            PARENT, $1, $3, $4,
-                                           GEDCOM_MAKE_STRING($4));
+                                           GEDCOM_MAKE_STRING(val1, $4));
                   START(MEDI, $<ctxt>$)  
                 }   
                 no_std_subs   
@@ -3251,9 +3383,13 @@ spou_fam_link_sub : spou_fam_fams_sect  /* 0:M */
                   ;
 
 spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer
-                     { $<ctxt>$ = start_element(ELT_SUB_FAMS,
-                                               PARENT, $1, $3, $4,
-                                               GEDCOM_MAKE_STRING($4));
+                     { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
+                                                                XREF_FAM);
+                      if (xr == NULL) HANDLE_ERROR;
+                      $<ctxt>$
+                        = start_element(ELT_SUB_FAMS,
+                                        PARENT, $1, $3, $4,
+                                        GEDCOM_MAKE_XREF_PTR(val1, xr));
                       START(FAMS, $<ctxt>$) 
                      }
                      spou_fam_fams_subs
@@ -3297,9 +3433,15 @@ user_rec    : OPEN DELIM opt_xref USERTAG
                }
              }
               opt_value
-              { $<ctxt>$ = start_record(REC_USER,
-                                       $1, GEDCOM_MAKE_NULL_OR_STRING($3), $4,
-                                       $6, GEDCOM_MAKE_NULL_OR_STRING($6));
+              { struct xref_value *xr = NULL;
+               if ($3 != NULL) {
+                 xr = gedcom_parse_xref($3, XREF_DEFINED, XREF_USER);
+                 if (xr == NULL) HANDLE_ERROR;
+               }
+               $<ctxt>$ = start_record(REC_USER,
+                                       $1,
+                                       GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr),
+                                       $4, $6, &val2);
                START($4, $<ctxt>$)
              }
              user_sects
@@ -3315,8 +3457,7 @@ user_sect   : OPEN DELIM opt_xref USERTAG
                }
              }
               opt_value
-              { $<ctxt>$ = start_element(ELT_USER, PARENT, $1, $4, $6,  
-                                        GEDCOM_MAKE_NULL_OR_STRING($6));
+              { $<ctxt>$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2);
                START($4, $<ctxt>$);
              }
              user_sects
@@ -3334,12 +3475,15 @@ opt_xref    : /* empty */        { $$ = NULL; }
             | POINTER DELIM        { $$ = $1; }
             ;
 
-opt_value   : /* empty */        { $$ = NULL; }
-            | DELIM line_value        { $$ = $2; }
-            ;
-
-line_value  : POINTER        { $$ = $1; }
-            | line_item        { $$ = $1; }
+opt_value   : /* empty */        { GEDCOM_MAKE_NULL(val2);
+                                   $$ = NULL; }
+            | DELIM POINTER      { struct xref_value *xr
+                                    = gedcom_parse_xref($2, XREF_USED,
+                                                        XREF_USER);
+                                  GEDCOM_MAKE_XREF_PTR(val2, xr);
+                                  $$ = $2; }
+            | DELIM line_item    { GEDCOM_MAKE_STRING(val2, $2);
+                                  $$ = $2; }
             ;
 
 mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; }
@@ -3404,7 +3548,7 @@ error_subs  : /* empty */
 error_sect  : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { }
 
 gen_sect    : OPEN DELIM opt_xref anystdtag
-              { INVALID_TAG($4); }
+              { INVALID_TAG($4.string); }
               opt_value opt_sects CLOSE
               { }
             ;
@@ -3414,7 +3558,7 @@ gen_rec : gen_rec_top
         ;
 
 gen_rec_norm : OPEN DELIM opt_xref anystdtag
-               { INVALID_TOP_TAG($4) }
+               { INVALID_TOP_TAG($4.string) }
                opt_value opt_sects CLOSE
                { }
              ;
@@ -3600,12 +3744,12 @@ void push_countarray()
 
 void set_parenttag(char* tag)
 {
-  strncpy(tag_stack[count_level], tag, MAXSTDTAGLEN+1);
+  strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1);
 }
 
 void set_parentctxt(Gedcom_ctxt ctxt)
 {
-  ctxt_stack[count_level] = ctxt;
+  ctxt_stack[count_level+1] = ctxt;
 }
 
 char* get_parenttag()