X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=f305257db49f2f0f6e59a7c1db9c17c4347036ca;hb=5962cdcec2493fc473f86aa6077d4b420c406112;hp=c83bf17daa07bfb42e2dc705132ad859d58a2fea;hpb=653d51d6948380f632845ad321e3faa9bb06f131;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index c83bf17..f305257 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -146,33 +146,28 @@
 #include "encoding.h"
 #include "interface.h"
 #include "date.h"
+#include "xref.h"
+#include "compat.h"
 
 int  count_level    = 0;
 int  fail           = 0;
-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;
 
-enum _COMPAT {
-  C_FTREE = 0x01
-};
-
 /* These are defined at the bottom of the file */ 
 void push_countarray();
 void set_parenttag(char* tag);
-char* get_parenttag(); 
+char* get_parenttag(int offset); 
 void set_parentctxt(Gedcom_ctxt ctxt);
-Gedcom_ctxt get_parentctxt();
+Gedcom_ctxt get_parentctxt(int offset);
 void pop_countarray();
 int  count_tag(int tag);
 int  check_occurrence(int tag);
-void set_compatibility(char* program);
-int  compat_mode(int flags); 
 
 #define CLEAR_BUFFER(BUF)                                                     \
      memset(BUF, 0, sizeof(BUF));
@@ -188,22 +183,30 @@ 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                                                              \
-     get_parentctxt()
+#define START(PARENTTAG,PARENTCTXT)                                           \
+     { START1(PARENTTAG);                                                     \
+       START2(PARENTCTXT);                                                    \
+     }
+#define PARENT                                                                \
+     get_parentctxt(0)
+#define GRANDPARENT(OFF)                                                      \
+     get_parentctxt(OFF)
 #define CHK(TAG)                                                              \
      { if (!check_occurrence(TAG_##TAG)) {                                    \
-         char* parenttag = get_parenttag();                                   \
+         char* parenttag = get_parenttag(0);                                  \
          gedcom_error(_("The tag '%s' is mandatory within '%s', but missing"),\
 		      #TAG, parenttag);                                       \
          HANDLE_ERROR;                                                        \
        }                                                                      \
-     }
+     } 
 #define POP                                                                   \
      { pop_countarray();                                                      \
        --count_level;                                                         \
@@ -220,14 +223,14 @@ int  compat_mode(int flags);
 #define OCCUR2(CHILDTAG, MIN, MAX)                                            \
      { int num = count_tag(TAG_##CHILDTAG);                                   \
        if (num > MAX) {                                                       \
-         char* parenttag = get_parenttag();                                   \
+         char* parenttag = get_parenttag(0);                                  \
          gedcom_error(_("The tag '%s' can maximally occur %d time(s) within '%s'"),                                                                          \
 		      #CHILDTAG, MAX, parenttag);                             \
          HANDLE_ERROR;                                                        \
        }                                                                      \
      }
 #define INVALID_TAG(CHILDTAG)                                                 \
-     { char* parenttag = get_parenttag();                                     \
+     { char* parenttag = get_parenttag(0);                                    \
        gedcom_error(_("The tag '%s' is not a valid tag within '%s'"),         \
 		    CHILDTAG, parenttag);                                     \
        HANDLE_ERROR;                                                          \
@@ -248,7 +251,7 @@ int  compat_mode(int flags);
 }
 
 %token_table
-%expect 300
+%expect 304
 
 %token <string> BADTOKEN
 %token <number> OPEN
@@ -396,7 +399,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
@@ -410,6 +412,8 @@ int  compat_mode(int flags);
 
 file        : head_sect records trlr_sect
                { if (fail == 1) YYABORT; }
+            | error
+               {  }
             ;
 
 records     : /* empty */
@@ -431,17 +435,29 @@ 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))
-		   CHECK3(SOUR, GEDC, CHAR)
+               { if (compat_mode(C_FTREE)) {
+		   CHECK3(SOUR, GEDC, CHAR);
+		   compat_generate_submitter_link($<ctxt>4);
+		 }
+	         else if (compat_mode(C_LIFELINES)) {
+		   CHECK1(SOUR);
+		   compat_generate_submitter_link($<ctxt>4);
+		   compat_generate_gedcom($<ctxt>4);
+		   if (compat_generate_char($<ctxt>4)) YYABORT;
+	         }
 	         else
 		   CHECK4(SOUR, SUBM, GEDC, CHAR)
 	       }
                CLOSE
-               { end_record(REC_HEAD, $<ctxt>4); }
+               { end_record(REC_HEAD, $<ctxt>4);
+	         if (compat_mode(C_FTREE | C_LIFELINES))
+	           compat_generate_submitter();
+	       }
              ;
 
 head_subs    : /* empty */
@@ -451,6 +467,9 @@ head_subs    : /* empty */
 head_sub     : head_sour_sect  { OCCUR2(SOUR, 1, 1) }
              | head_dest_sect  { OCCUR2(DEST, 0, 1) }
              | head_date_sect  { OCCUR2(DATE, 0, 1) }
+             | head_time_sect  { if (!compat_mode(C_LIFELINES))
+	                          INVALID_TAG("TIME");
+	                         OCCUR2(TIME, 0, 1) }
              | head_subm_sect  { OCCUR2(SUBM, 1, 1) }
              | head_subn_sect  { OCCUR2(SUBN, 0, 1) }
              | head_file_sect  { OCCUR2(FILE, 0, 1) }
@@ -468,7 +487,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 +510,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 +523,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 +536,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 +558,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 +580,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 +594,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 +612,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 +628,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 +650,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
@@ -640,11 +661,21 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
 		      }
                     ;
 
+/* HEAD.TIME (Only for 'Lifelines' compatibility) */
+/* Just ignore the time... */
+head_time_sect : OPEN DELIM TAG_TIME opt_line_item
+                 { }
+                 CLOSE
+	       ;
+
 /* 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 +687,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 +706,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 +719,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 +732,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 +753,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 +766,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 +779,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 +804,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 +819,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 +832,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 +852,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 +867,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 +896,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 +931,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 +948,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 +965,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 +984,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 +996,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 +1015,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 +1062,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 +1076,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 +1088,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 +1105,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 +1122,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 +1139,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 +1158,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 +1172,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           
@@ -1117,15 +1184,62 @@ indi_afn_sect  : OPEN DELIM TAG_AFN mand_line_item
 
 /* INDI.ADDR (Only for 'ftree' compatibility) */
 ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
-                  { START(ADDR, NULL) } no_std_subs { CHECK0 } CLOSE { }
+                  { if (compat_mode(C_FTREE)) {
+		      Gedcom_ctxt par = compat_generate_resi_start(PARENT);
+		      START(RESI, par);
+		      $<ctxt>$
+			= start_element(ELT_SUB_ADDR,
+					par, $1 + 1, $3, $4,
+					GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
+		      START(ADDR, $<ctxt>$);
+		    }
+		  else { START(ADDR, NULL) }
+		  }
+                  ftree_addr_subs
+                  { CHECK0 }
+                  CLOSE
+                  { if (compat_mode(C_FTREE)) {
+		      Gedcom_ctxt par = PARENT;
+		      end_element(ELT_SUB_ADDR, par, $<ctxt>5, NULL);
+		      CHECK0;
+		      compat_generate_resi_end(PARENT, par);
+		    } 
+		  }
+
+ftree_addr_subs : /* empty */
+                | ftree_addr_subs ftree_addr_sub
+                ;
+
+ftree_addr_sub  : continuation_sub
+                | ftree_addr_phon_sect
+                | no_std_sub
+                ;
+
+ftree_addr_phon_sect : OPEN DELIM TAG_PHON mand_line_item              
+                       { $<ctxt>$
+			   = start_element(ELT_SUB_PHON,
+					   GRANDPARENT(1), $1, $3, $4, 
+					   GEDCOM_MAKE_STRING(val1, $4));
+	                 START(PHON, $<ctxt>$)               
+		       }               
+                       no_std_subs               
+                       { CHECK0 }               
+                       CLOSE               
+                       { end_element(ELT_SUB_PHON, GRANDPARENT(1),
+				     $<ctxt>5, NULL);
+	               }
+            ;
 
 /*********************************************************************/
 /**** 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 +1265,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 +1279,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 +1293,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 +1314,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 +1327,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 +1346,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 +1363,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 +1387,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 +1416,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 +1430,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 +1465,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 +1488,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 +1510,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 +1525,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 +1542,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 +1557,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 +1579,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 +1601,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 +1615,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 +1637,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 +1659,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 +1688,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 +1707,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 +1721,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 +1735,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 +1749,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 +1763,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 +1777,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 +1791,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) }
@@ -1668,7 +1808,7 @@ subm_subs  : /* empty */
            | subm_subs subm_sub
            ;
 
-subm_sub   : subm_name_sect  { OCCUR2(NAME, 0, 1) }
+subm_sub   : subm_name_sect  { OCCUR2(NAME, 1, 1) }
            | addr_struc_sub  /* 0:1 */
            | multim_link_sub  /* 0:M */
            | subm_lang_sect  { OCCUR2(LANG, 0, 3) }
@@ -1682,7 +1822,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 +1836,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 +1850,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 +1864,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 +1886,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 +1913,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 +1925,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 +1937,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 +1949,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 +1961,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 +1973,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 +1985,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 +1998,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 +2013,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 +2039,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 +2052,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 +2069,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 +2092,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 +2114,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 +2130,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 +2157,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 +2175,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 +2188,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 +2212,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 +2227,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 +2241,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 +2255,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 +2269,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 +2289,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 +2302,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 +2327,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 +2349,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 +2363,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 +2377,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 +2406,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 +2426,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 +2443,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 +2462,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 +2471,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 +2513,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 +2526,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 +2540,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 +2559,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 +2572,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 +2602,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 +2624,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 +2653,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 +2666,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 +2683,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 +2693,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 +2714,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 +2728,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 +2741,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 +2754,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 +2768,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 +2787,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 +2811,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 +2836,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 +2850,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 +2863,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 +2876,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 +2893,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 +2914,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 +2937,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 +2951,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 +2965,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 +2985,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 +3014,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 +3040,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 +3068,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 +3081,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 +3094,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 +3107,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 +3120,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 +3133,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 +3149,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 +3173,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 +3193,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 +3224,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 +3239,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 +3262,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 +3279,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 +3301,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 +3316,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 +3339,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 +3356,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 +3381,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 +3409,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 +3430,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 +3445,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 +3495,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 +3519,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 +3537,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; }
@@ -3347,12 +3553,21 @@ mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; }
                                $$ = $2; }
              ;
 
-mand_line_item : /* empty */ { gedcom_error(_("Missing value")); YYERROR; }
+mand_line_item : /* empty */
+                 { if (compat_mode(C_LIFELINES)) {
+                     /* Lifelines tends to not care about mandatory values */
+		     gedcom_debug_print("==Val: ==");
+		     $$ = "";
+		   }
+		   else {
+		     gedcom_error(_("Missing value")); YYERROR;
+		   }
+		 }
                | DELIM line_item { gedcom_debug_print("==Val: %s==", $2);
                                    $$ = $2; }
                ;
 
-opt_line_item : /* empty */ { }
+opt_line_item : /* empty */     { $$ = NULL; }
               | DELIM line_item { gedcom_debug_print("==Val: %s==", $2);
 	                          $$ = $2; }
               ;
@@ -3404,7 +3619,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 +3629,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,22 +3815,22 @@ 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()
+char* get_parenttag(int offset)
 {
-  return tag_stack[count_level];
+  return tag_stack[count_level - offset];
 }
 
-Gedcom_ctxt get_parentctxt()
+Gedcom_ctxt get_parentctxt(int offset)
 {
-  return ctxt_stack[count_level];
+  return ctxt_stack[count_level - offset];
 }
 
 int count_tag(int tag)
@@ -3684,29 +3899,3 @@ void gedcom_set_error_handling(Gedcom_err_mech mechanism)
 {
   error_mechanism = mechanism;
 }
-
-/* Compatibility handling */
-
-void gedcom_set_compat_handling(int enable_compat)
-{
-  compat_enabled = enable_compat;
-}
-
-void set_compatibility(char* program)
-{
-  if (compat_enabled) {
-    if (! strncmp(program, "ftree", 6)) {
-      gedcom_warning(_("Enabling compatibility with 'ftree'"));
-      compatibility = C_FTREE;
-    }
-    else {
-      compatibility = 0;
-    }
-  }
-}
-
-int compat_mode(int compat_flags)
-{
-  return (compat_flags & compatibility);
-}
-