X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=56f10c2297263ec70a8e6c885a7c0d9463d2dbb0;hb=7cbefaec45b82eb0449465da19d38a89f2ff2cf3;hp=3302c1b808fa718eab3af3e93aeae6f7992ce75b;hpb=3068ed1f64a96d42cdde19cfebf1468ec9169e62;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 3302c1b..56f10c2 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -146,13 +146,13 @@
 #include "encoding.h"
 #include "interface.h"
 #include "date.h"
+#include "age.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 val1;
 Gedcom_val_struct val2; 
@@ -160,28 +160,23 @@ 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(); 
+void push_countarray(int level);
+void set_parenttag(const char* tag);
+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); 
+void clean_up(); 
 
 #define CLEAR_BUFFER(BUF)                                                     \
      memset(BUF, 0, sizeof(BUF));
  
 #define HANDLE_ERROR                                                          \
      { if (error_mechanism == IMMED_FAIL) {                                   \
-	 YYABORT;                                                             \
+	 clean_up(); YYABORT;                                                 \
        }                                                                      \
        else if (error_mechanism == DEFER_FAIL) {                              \
          yyerrok; fail = 1;                                                   \
@@ -193,25 +188,27 @@ int  compat_mode(int flags);
 #define START1(PARENTTAG)                                                     \
      { set_parenttag(#PARENTTAG);                                             \
      }
-#define START2(PARENTCTXT)                                                    \
+#define START2(LEVEL,PARENTCTXT)                                              \
      { set_parentctxt(PARENTCTXT);                                            \
        ++count_level;                                                         \
-       push_countarray();                                                     \
+       push_countarray(LEVEL);                                                \
      }
-#define START(PARENTTAG,PARENTCTXT)                                           \
+#define START(PARENTTAG,LEVEL,PARENTCTXT)                                     \
      { START1(PARENTTAG);                                                     \
-       START2(PARENTCTXT);                                                    \
+       START2(LEVEL,PARENTCTXT);                                              \
      }
 #define PARENT                                                                \
-     get_parentctxt()
+     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;                                                         \
@@ -228,14 +225,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;                                                          \
@@ -256,7 +253,7 @@ int  compat_mode(int flags);
 }
 
 %token_table
-%expect 300
+%expect 308
 
 %token <string> BADTOKEN
 %token <number> OPEN
@@ -417,6 +414,8 @@ int  compat_mode(int flags);
 
 file        : head_sect records trlr_sect
                { if (fail == 1) YYABORT; }
+            | error
+               { clean_up(); }
             ;
 
 records     : /* empty */
@@ -441,15 +440,26 @@ head_sect    : OPEN DELIM TAG_HEAD
                { $<ctxt>$ = start_record(REC_HEAD, $1, GEDCOM_MAKE_NULL(val1),
 					 $3,
 					 NULL, GEDCOM_MAKE_NULL(val2));
-	         START(HEAD, $<ctxt>$) }
+	         START(HEAD, $1, $<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)) HANDLE_ERROR;
+	         }
 	         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 */
@@ -459,6 +469,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) }
@@ -477,7 +490,7 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item
 		   $<ctxt>$ = start_element(ELT_HEAD_SOUR, PARENT,
 					    $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(SOUR, $<ctxt>$)
+		   START(SOUR, $1, $<ctxt>$)
 		 }
                  head_sour_subs
                  { CHECK0 }
@@ -500,7 +513,7 @@ 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(val1, $4));
-		        START(VERS, $<ctxt>$)
+		        START(VERS, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -513,7 +526,7 @@ 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(val1, $4));
-			START(NAME, $<ctxt>$)
+			START(NAME, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -526,7 +539,7 @@ 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(val1, $4));
-			START(CORP, $<ctxt>$)
+			START(CORP, $1, $<ctxt>$)
 		      }
                       head_sour_corp_subs
 		      { CHECK0 }
@@ -548,7 +561,7 @@ 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(val1, $4));
-			START(DATA, $<ctxt>$)
+			START(DATA, $1, $<ctxt>$)
 		      }
                       head_sour_data_subs
                       { CHECK0 }
@@ -573,7 +586,7 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
 			       = start_element(ELT_HEAD_SOUR_DATA_DATE,
 					       PARENT, $1, $3, $4,
 					       GEDCOM_MAKE_DATE(val1, dv));
-			     START(DATE, $<ctxt>$)
+			     START(DATE, $1, $<ctxt>$)
 			   }
                            no_std_subs
                            { CHECK0 }
@@ -587,7 +600,7 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
 			       = start_element(ELT_HEAD_SOUR_DATA_COPR,
 					       PARENT, $1, $3, $4,
 					       GEDCOM_MAKE_STRING(val1, $4));
-			     START(COPR, $<ctxt>$)
+			     START(COPR, $1, $<ctxt>$)
 			   }
                            no_std_subs
                            { CHECK0 }
@@ -602,7 +615,7 @@ head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_DEST,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(DEST, $<ctxt>$)
+		   START(DEST, $1, $<ctxt>$)
 		 }
                  no_std_subs
                  { CHECK0 }
@@ -618,7 +631,7 @@ head_date_sect : OPEN DELIM TAG_DATE mand_line_item
 		   $<ctxt>$ = start_element(ELT_HEAD_DATE,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_DATE(val1, dv));
-		   START(DATE, $<ctxt>$)
+		   START(DATE, $1, $<ctxt>$)
 		 }
                  head_date_subs
 		 { CHECK0 }
@@ -640,7 +653,7 @@ 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(val1, $4));
-		        START(TIME, $<ctxt>$)
+		        START(TIME, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -650,6 +663,13 @@ 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
+                 { gedcom_warning(_("Header change time lost in the compatibility"));
+                 }
+	       ;
+
 /* HEAD.SUBM */
 head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
                  { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
@@ -658,7 +678,7 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 		   $<ctxt>$ = start_element(ELT_HEAD_SUBM,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(SUBM, $<ctxt>$)
+		   START(SUBM, $1, $<ctxt>$)
 		 }
                  no_std_subs
                  { CHECK0 }
@@ -675,7 +695,7 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
 		   $<ctxt>$ = start_element(ELT_HEAD_SUBN,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(SUBN, $<ctxt>$)
+		   START(SUBN, $1, $<ctxt>$)
 		 }
                  no_std_subs
                  { CHECK0 }
@@ -689,7 +709,7 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_FILE,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(FILE, $<ctxt>$)
+		   START(FILE, $1, $<ctxt>$)
 		 }
                  no_std_subs
                  { CHECK0 }
@@ -702,7 +722,7 @@ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_COPR,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(COPR, $<ctxt>$)
+		   START(COPR, $1, $<ctxt>$)
 		 }
                  no_std_subs
                  { CHECK0 }
@@ -715,7 +735,7 @@ head_gedc_sect : OPEN DELIM TAG_GEDC
                  { $<ctxt>$ = start_element(ELT_HEAD_GEDC,
 					    PARENT, $1, $3, NULL,
 					    GEDCOM_MAKE_NULL(val1));
-		   START(GEDC, $<ctxt>$)
+		   START(GEDC, $1, $<ctxt>$)
 		 }
                  head_gedc_subs
 		 { CHECK2(VERS, FORM) }
@@ -736,7 +756,7 @@ 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(val1, $4));
-		        START(VERS, $<ctxt>$)
+		        START(VERS, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -749,7 +769,7 @@ 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(val1, $4));
-		        START(FORM, $<ctxt>$)
+		        START(FORM, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -761,11 +781,13 @@ 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) HANDLE_ERROR;
 		   $<ctxt>$ = start_element(ELT_HEAD_CHAR,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(CHAR, $<ctxt>$)
+		   START(CHAR, $1, $<ctxt>$)
 		 }
                  head_char_subs
 		 { CHECK0 }
@@ -785,7 +807,7 @@ 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(val1, $4));
-		        START(VERS, $<ctxt>$)
+		        START(VERS, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -800,7 +822,7 @@ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_LANG,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(LANG, $<ctxt>$)
+		   START(LANG, $1, $<ctxt>$)
 		 }
                  no_std_subs
                  { CHECK0 }
@@ -813,7 +835,7 @@ head_plac_sect : OPEN DELIM TAG_PLAC
                  { $<ctxt>$ = start_element(ELT_HEAD_PLAC,
 					    PARENT, $1, $3, NULL,
 					    GEDCOM_MAKE_NULL(val1));
-		   START(PLAC, $<ctxt>$)
+		   START(PLAC, $1, $<ctxt>$)
 		 }
                  head_plac_subs
 		 { CHECK1(FORM) }
@@ -833,7 +855,7 @@ 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(val1, $4));
-		        START(FORM, $<ctxt>$)
+		        START(FORM, $1, $<ctxt>$)
 		      }
                       no_std_subs
                       { CHECK0 }
@@ -848,7 +870,7 @@ head_note_sect : OPEN DELIM TAG_NOTE mand_line_item
                  { $<ctxt>$ = start_element(ELT_HEAD_NOTE,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(NOTE, $<ctxt>$)
+		   START(NOTE, $1, $<ctxt>$)
 		 }
                  head_note_subs
 		 { CHECK0 }
@@ -883,7 +905,7 @@ fam_rec      : OPEN DELIM POINTER DELIM TAG_FAM
 					 $1, GEDCOM_MAKE_XREF_PTR(val1, xr),
 					 $5,
 					 NULL, GEDCOM_MAKE_NULL(val2));
-		 START(FAM, $<ctxt>$) }
+		 START(FAM, $1, $<ctxt>$) }
                fam_subs
 	       { CHECK0 }
                CLOSE
@@ -917,7 +939,7 @@ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer
 		  $<ctxt>$ = start_element(ELT_FAM_HUSB,
 					   PARENT, $1, $3, $4, 
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		  START(HUSB, $<ctxt>$)
+		  START(HUSB, $1, $<ctxt>$)
 		}
                 no_std_subs
                 { CHECK0 }
@@ -934,7 +956,7 @@ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer
 		  $<ctxt>$ = start_element(ELT_FAM_WIFE,
 					   PARENT, $1, $3, $4, 
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		  START(WIFE, $<ctxt>$)
+		  START(WIFE, $1, $<ctxt>$)
 		}
                 no_std_subs
                 { CHECK0 }
@@ -951,7 +973,7 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
 		  $<ctxt>$ = start_element(ELT_FAM_CHIL,
 					   PARENT, $1, $3, $4, 
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		  START(CHIL, $<ctxt>$) 
+		  START(CHIL, $1, $<ctxt>$) 
 		} 
 		no_std_subs 
 		{ CHECK0 } 
@@ -965,7 +987,7 @@ fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
                 { $<ctxt>$ = start_element(ELT_FAM_NCHI,
 					   PARENT, $1, $3, $4, 
 					   GEDCOM_MAKE_STRING(val1, $4));
-		  START(NCHI, $<ctxt>$)  
+		  START(NCHI, $1, $<ctxt>$)  
 		}  
 		no_std_subs  
 		{ CHECK0 }  
@@ -982,7 +1004,7 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 		  $<ctxt>$ = start_element(ELT_FAM_SUBM,
 					   PARENT, $1, $3, $4, 
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		  START(SUBM, $<ctxt>$)   
+		  START(SUBM, $1, $<ctxt>$)   
 		}   
 		no_std_subs   
 		{ CHECK0 }   
@@ -1001,7 +1023,7 @@ indiv_rec   : OPEN DELIM POINTER DELIM TAG_INDI
 		$<ctxt>$ = start_record(REC_INDI,
 					$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 					NULL, GEDCOM_MAKE_NULL(val2));
-		START(INDI, $<ctxt>$) }
+		START(INDI, $1, $<ctxt>$) }
               indi_subs
 	      { CHECK0 }
               CLOSE
@@ -1043,7 +1065,7 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item
                  { $<ctxt>$ = start_element(ELT_INDI_RESN,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(RESN, $<ctxt>$)    
+		   START(RESN, $1, $<ctxt>$)    
 		 }    
 		 no_std_subs     
 		 { CHECK0 }     
@@ -1057,7 +1079,7 @@ indi_sex_sect  : OPEN DELIM TAG_SEX mand_line_item
                  { $<ctxt>$ = start_element(ELT_INDI_SEX,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(SEX, $<ctxt>$)     
+		   START(SEX, $1, $<ctxt>$)     
 		 }     
 		 no_std_subs     
 		 { CHECK0 }     
@@ -1074,7 +1096,7 @@ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 		   $<ctxt>$ = start_element(ELT_INDI_SUBM,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(SUBM, $<ctxt>$)      
+		   START(SUBM, $1, $<ctxt>$)      
 		 }      
 		 no_std_subs      
 		 { CHECK0 }      
@@ -1091,7 +1113,7 @@ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
 		   $<ctxt>$ = start_element(ELT_INDI_ALIA,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(ALIA, $<ctxt>$)       
+		   START(ALIA, $1, $<ctxt>$)       
 		 }       
 		 no_std_subs       
 		 { CHECK0 }       
@@ -1108,7 +1130,7 @@ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
 		   $<ctxt>$ = start_element(ELT_INDI_ANCI,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(ANCI, $<ctxt>$)        
+		   START(ANCI, $1, $<ctxt>$)        
 		 }        
 		 no_std_subs        
 		 { CHECK0 }        
@@ -1125,7 +1147,7 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
 		   $<ctxt>$ = start_element(ELT_INDI_DESI,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(DESI, $<ctxt>$)         
+		   START(DESI, $1, $<ctxt>$)         
 		 }         
 		 no_std_subs         
 		 { CHECK0 }         
@@ -1139,7 +1161,7 @@ indi_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item
                  { $<ctxt>$ = start_element(ELT_INDI_RFN,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(RFN, $<ctxt>$)          
+		   START(RFN, $1, $<ctxt>$)          
 		 }          
 		 no_std_subs          
 		 { CHECK0 }          
@@ -1153,7 +1175,7 @@ indi_afn_sect  : OPEN DELIM TAG_AFN mand_line_item
                  { $<ctxt>$ = start_element(ELT_INDI_AFN,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(AFN, $<ctxt>$)           
+		   START(AFN, $1, $<ctxt>$)           
 		 }           
 		 no_std_subs           
 		 { CHECK0 }           
@@ -1164,7 +1186,52 @@ 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, $1, par);
+		      $<ctxt>$
+			= start_element(ELT_SUB_ADDR,
+					par, $1 + 1, $3, $4,
+					GEDCOM_MAKE_NULL_OR_STRING(val2, $4));
+		      START(ADDR, $1, $<ctxt>$);
+		    }
+		  else { START(ADDR, $1, 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, $1, $<ctxt>$)               
+		       }               
+                       no_std_subs               
+                       { CHECK0 }               
+                       CLOSE               
+                       { end_element(ELT_SUB_PHON, GRANDPARENT(1),
+				     $<ctxt>5, NULL);
+	               }
+            ;
 
 /*********************************************************************/
 /**** Multimedia record                                           ****/
@@ -1176,7 +1243,7 @@ multim_rec  : OPEN DELIM POINTER DELIM TAG_OBJE
 		$<ctxt>$ = start_record(REC_OBJE,
 					$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 					NULL, GEDCOM_MAKE_NULL(val2));
-		START(OBJE, $<ctxt>$) }
+		START(OBJE, $1, $<ctxt>$) }
               obje_subs
 	      { CHECK2(FORM, BLOB) }
               CLOSE
@@ -1202,7 +1269,7 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
                  { $<ctxt>$ = start_element(ELT_OBJE_FORM,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(FORM, $<ctxt>$)            
+		   START(FORM, $1, $<ctxt>$)            
 		 }            
 		 no_std_subs            
 		 { CHECK0 }            
@@ -1216,7 +1283,7 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
                  { $<ctxt>$ = start_element(ELT_OBJE_TITL,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(TITL, $<ctxt>$)             
+		   START(TITL, $1, $<ctxt>$)             
 		 }             
 		 no_std_subs             
 		 { CHECK0 }             
@@ -1230,7 +1297,7 @@ obje_blob_sect : OPEN DELIM TAG_BLOB
                  { $<ctxt>$ = start_element(ELT_OBJE_BLOB,
 					    PARENT, $1, $3, NULL,
 					    GEDCOM_MAKE_NULL(val1));
-		   START(BLOB, $<ctxt>$)              
+		   START(BLOB, $1, $<ctxt>$)              
 		 }
                  obje_blob_subs
 		 { CHECK1(CONT) }
@@ -1251,7 +1318,7 @@ 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(val1, $4));
-		        START(CONT, $<ctxt>$)               
+		        START(CONT, $1, $<ctxt>$)               
 		      }                
 		      no_std_subs                
 		      { CHECK0 }                
@@ -1269,7 +1336,7 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
 		   $<ctxt>$ = start_element(ELT_OBJE_OBJE,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(OBJE, $<ctxt>$)  
+		   START(OBJE, $1, $<ctxt>$)  
                  }  
                  no_std_subs  
                  { CHECK0 }  
@@ -1288,7 +1355,7 @@ note_rec    : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
 		$<ctxt>$ = start_record(REC_NOTE,
 					$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 					$6, GEDCOM_MAKE_STRING(val2, $6));
-		START(NOTE, $<ctxt>$) }
+		START(NOTE, $1, $<ctxt>$) }
               note_subs
 	      { CHECK0 }
               CLOSE
@@ -1329,7 +1396,7 @@ repos_rec   : OPEN DELIM POINTER DELIM TAG_REPO
 		$<ctxt>$ = start_record(REC_REPO,
 					$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 					NULL, GEDCOM_MAKE_NULL(val2));
-		START(REPO, $<ctxt>$) }
+		START(REPO, $1, $<ctxt>$) }
               repo_subs
 	      { CHECK0 }
               CLOSE
@@ -1353,7 +1420,7 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
                  { $<ctxt>$ = start_element(ELT_REPO_NAME,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(NAME, $<ctxt>$)          
+		   START(NAME, $1, $<ctxt>$)          
                  }          
                  no_std_subs          
                  { CHECK0 }          
@@ -1372,7 +1439,7 @@ source_rec  : OPEN DELIM POINTER DELIM TAG_SOUR
 		$<ctxt>$ = start_record(REC_SOUR,
 					$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 					NULL, GEDCOM_MAKE_NULL(val2));
-		START(SOUR, $<ctxt>$) }
+		START(SOUR, $1, $<ctxt>$) }
               sour_subs
 	      { CHECK0 }
               CLOSE
@@ -1402,7 +1469,7 @@ sour_data_sect : OPEN DELIM TAG_DATA
                  { $<ctxt>$ = start_element(ELT_SOUR_DATA,
 					    PARENT, $1, $3, NULL,
 					    GEDCOM_MAKE_NULL(val1));
-		   START(DATA, $<ctxt>$) 
+		   START(DATA, $1, $<ctxt>$) 
                  }
                  sour_data_subs
 		 { CHECK0 }
@@ -1425,7 +1492,7 @@ 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(val1, $4));
-		        START(EVEN, $<ctxt>$)  
+		        START(EVEN, $1, $<ctxt>$)  
                       }
                       sour_data_even_subs
 		      { CHECK0 }
@@ -1450,7 +1517,7 @@ sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item
 			       = start_element(ELT_SOUR_DATA_EVEN_DATE,
 					       PARENT, $1, $3, $4, 
 					       GEDCOM_MAKE_DATE(val1, dv));
-		             START(DATE, $<ctxt>$)           
+		             START(DATE, $1, $<ctxt>$)           
                            }           
                            no_std_subs           
                            { CHECK0 }           
@@ -1465,7 +1532,7 @@ sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
 			       = start_element(ELT_SOUR_DATA_EVEN_PLAC,
 					       PARENT, $1, $3, $4, 
 					       GEDCOM_MAKE_STRING(val1, $4));
-		             START(PLAC, $<ctxt>$)           
+		             START(PLAC, $1, $<ctxt>$)           
                            }           
                            no_std_subs           
                            { CHECK0 }           
@@ -1479,7 +1546,7 @@ 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(val1, $4));
-		        START(AGNC, $<ctxt>$)           
+		        START(AGNC, $1, $<ctxt>$)           
                       }           
                       no_std_subs           
                       { CHECK0 }           
@@ -1494,7 +1561,7 @@ sour_auth_sect : OPEN DELIM TAG_AUTH mand_line_item
                  { $<ctxt>$ = start_element(ELT_SOUR_AUTH,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(AUTH, $<ctxt>$) 
+		   START(AUTH, $1, $<ctxt>$) 
                  }
                  sour_auth_subs
 		 { CHECK0 }
@@ -1516,7 +1583,7 @@ sour_titl_sect : OPEN DELIM TAG_TITL mand_line_item
                  { $<ctxt>$ = start_element(ELT_SOUR_TITL,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(TITL, $<ctxt>$)   
+		   START(TITL, $1, $<ctxt>$)   
                  }
                  sour_titl_subs 
 		 { CHECK0 }
@@ -1538,7 +1605,7 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item
                  { $<ctxt>$ = start_element(ELT_SOUR_ABBR,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(ABBR, $<ctxt>$)            
+		   START(ABBR, $1, $<ctxt>$)            
                  }            
                  no_std_subs            
                  { CHECK0 }            
@@ -1552,7 +1619,7 @@ sour_publ_sect : OPEN DELIM TAG_PUBL mand_line_item
                  { $<ctxt>$ = start_element(ELT_SOUR_PUBL,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(PUBL, $<ctxt>$)            
+		   START(PUBL, $1, $<ctxt>$)            
                  }
                  sour_publ_subs  
 		 { CHECK0 }
@@ -1574,7 +1641,7 @@ sour_text_sect : OPEN DELIM TAG_TEXT mand_line_item
                  { $<ctxt>$ = start_element(ELT_SOUR_TEXT,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(TEXT, $<ctxt>$)    
+		   START(TEXT, $1, $<ctxt>$)    
                  }
                  sour_text_subs  
 		 { CHECK0 }
@@ -1601,7 +1668,7 @@ submis_rec  : OPEN DELIM POINTER DELIM TAG_SUBN
 		$<ctxt>$ = start_record(REC_SUBN,
 					$1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 					NULL, GEDCOM_MAKE_NULL(val2));
-		START(SUBN, $<ctxt>$) }
+		START(SUBN, $1, $<ctxt>$) }
               subn_subs
 	      { CHECK0 }
               CLOSE
@@ -1630,7 +1697,7 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 		   $<ctxt>$ = start_element(ELT_SUBN_SUBM,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-		   START(SUBM, $<ctxt>$) 
+		   START(SUBM, $1, $<ctxt>$) 
                  } 
                  no_std_subs 
                  { CHECK0 } 
@@ -1644,7 +1711,7 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBN_FAMF,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(FAMF, $<ctxt>$)             
+		   START(FAMF, $1, $<ctxt>$)             
                  }             
                  no_std_subs             
                  { CHECK0 }             
@@ -1658,7 +1725,7 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBN_TEMP,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(TEMP, $<ctxt>$)             
+		   START(TEMP, $1, $<ctxt>$)             
                  }             
                  no_std_subs             
                  { CHECK0 }             
@@ -1672,7 +1739,7 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBN_ANCE,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(ANCE, $<ctxt>$)             
+		   START(ANCE, $1, $<ctxt>$)             
                  }             
                  no_std_subs             
                  { CHECK0 }             
@@ -1686,7 +1753,7 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBN_DESC,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(DESC, $<ctxt>$)             
+		   START(DESC, $1, $<ctxt>$)             
                  }             
                  no_std_subs             
                  { CHECK0 }             
@@ -1700,7 +1767,7 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBN_ORDI,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(ORDI, $<ctxt>$)             
+		   START(ORDI, $1, $<ctxt>$)             
                  }             
                  no_std_subs             
                  { CHECK0 }             
@@ -1714,7 +1781,7 @@ subn_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBN_RIN,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(RIN, $<ctxt>$)             
+		   START(RIN, $1, $<ctxt>$)             
                  }             
                  no_std_subs             
                  { CHECK0 }             
@@ -1733,7 +1800,7 @@ submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM
 	       $<ctxt>$ = start_record(REC_SUBM,
 				       $1, GEDCOM_MAKE_XREF_PTR(val1, xr), $5,
 				       NULL, GEDCOM_MAKE_NULL(val2));
-		START(SUBM, $<ctxt>$) }
+		START(SUBM, $1, $<ctxt>$) }
              subm_subs
 	     { CHECK1(NAME) }
              CLOSE
@@ -1744,7 +1811,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) }
@@ -1759,7 +1826,7 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBM_NAME,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(NAME, $<ctxt>$)              
+		   START(NAME, $1, $<ctxt>$)              
                  }              
                  no_std_subs              
                  { CHECK0 }              
@@ -1773,7 +1840,7 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBM_LANG,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(LANG, $<ctxt>$)              
+		   START(LANG, $1, $<ctxt>$)              
                  }              
                  no_std_subs              
                  { CHECK0 }              
@@ -1787,7 +1854,7 @@ subm_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBM_RFN,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(RFN, $<ctxt>$)              
+		   START(RFN, $1, $<ctxt>$)              
                  }              
                  no_std_subs              
                  { CHECK0 }              
@@ -1801,7 +1868,7 @@ subm_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUBM_RIN,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(RIN, $<ctxt>$)              
+		   START(RIN, $1, $<ctxt>$)              
                  }              
                  no_std_subs              
                  { CHECK0 }              
@@ -1823,7 +1890,7 @@ addr_sect   : OPEN DELIM TAG_ADDR mand_line_item
               { $<ctxt>$ = start_element(ELT_SUB_ADDR,
 					 PARENT, $1, $3, $4, 
 					 GEDCOM_MAKE_STRING(val1, $4));
-	        START(ADDR, $<ctxt>$)  
+	        START(ADDR, $1, $<ctxt>$)  
               }
               addr_subs
 	      { CHECK0 }
@@ -1850,7 +1917,7 @@ addr_cont_sect : OPEN DELIM TAG_CONT mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_CONT,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(CONT, $<ctxt>$)               
+		   START(CONT, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1862,7 +1929,7 @@ addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR1,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(ADR1, $<ctxt>$)               
+		   START(ADR1, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1874,7 +1941,7 @@ addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_ADR2,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(ADR2, $<ctxt>$)               
+		   START(ADR2, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1886,7 +1953,7 @@ addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_CITY,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(CITY, $<ctxt>$)               
+		   START(CITY, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1898,7 +1965,7 @@ addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_STAE,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(STAE, $<ctxt>$)               
+		   START(STAE, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1910,7 +1977,7 @@ addr_post_sect : OPEN DELIM TAG_POST mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_POST,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(POST, $<ctxt>$)               
+		   START(POST, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1922,7 +1989,7 @@ addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ADDR_CTRY,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(CTRY, $<ctxt>$)               
+		   START(CTRY, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
@@ -1935,7 +2002,7 @@ phon_sect   : OPEN DELIM TAG_PHON mand_line_item
               { $<ctxt>$ = start_element(ELT_SUB_PHON,
 					 PARENT, $1, $3, $4, 
 					 GEDCOM_MAKE_STRING(val1, $4));
-	        START(PHON, $<ctxt>$)               
+	        START(PHON, $1, $<ctxt>$)               
               }               
               no_std_subs               
               { CHECK0 }               
@@ -1950,12 +2017,12 @@ assoc_struc_sub : asso_sect /* 0:M */
 
 asso_sect : OPEN DELIM TAG_ASSO mand_pointer
             { struct xref_value *xr = gedcom_parse_xref($4, XREF_USED,
-							XREF_INDI);
+							XREF_ANY);
 	      if (xr == NULL) HANDLE_ERROR;
 	      $<ctxt>$ = start_element(ELT_SUB_ASSO,
 				       PARENT, $1, $3, $4, 
 				       GEDCOM_MAKE_XREF_PTR(val1, xr));
-	      START(ASSO, $<ctxt>$) 
+	      START(ASSO, $1, $<ctxt>$) 
             }
             asso_subs
 	    { CHECK2(TYPE,RELA) }
@@ -1976,7 +2043,7 @@ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ASSO_TYPE,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(TYPE, $<ctxt>$)                
+		   START(TYPE, $1, $<ctxt>$)                
                  }                
                  no_std_subs                
                  { CHECK0 }                
@@ -1989,7 +2056,7 @@ asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_ASSO_RELA,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(RELA, $<ctxt>$)                
+		   START(RELA, $1, $<ctxt>$)                
                  }                
                  no_std_subs                
                  { CHECK0 }                
@@ -2006,7 +2073,7 @@ change_date_chan_sect : OPEN DELIM TAG_CHAN
                         { $<ctxt>$ = start_element(ELT_SUB_CHAN,
 						   PARENT, $1, $3, NULL, 
 						   GEDCOM_MAKE_NULL(val1));
-			  START(CHAN, $<ctxt>$) 
+			  START(CHAN, $1, $<ctxt>$) 
                         }
                         change_date_chan_subs
 			{ CHECK1(DATE) }
@@ -2029,7 +2096,7 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item
 			  $<ctxt>$ = start_element(ELT_SUB_CHAN_DATE,
 						   PARENT, $1, $3, $4, 
 						   GEDCOM_MAKE_DATE(val1, dv));
-			  START(DATE, $<ctxt>$) }
+			  START(DATE, $1, $<ctxt>$) }
                         change_date_date_subs
 			{ CHECK0 }
                         CLOSE 
@@ -2051,7 +2118,7 @@ change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
 				 = start_element(ELT_SUB_CHAN_TIME,
 						 PARENT, $1, $3, $4, 
 						 GEDCOM_MAKE_STRING(val1, $4));
-			       START(TIME, $<ctxt>$) 
+			       START(TIME, $1, $<ctxt>$) 
                              } 
                              no_std_subs 
                              { CHECK0 } 
@@ -2072,7 +2139,7 @@ famc_sect : OPEN DELIM TAG_FAMC mand_pointer
 	      $<ctxt>$ = start_element(ELT_SUB_FAMC,
 				       PARENT, $1, $3, $4, 
 				       GEDCOM_MAKE_XREF_PTR(val1, xr));
-	      START(FAMC, $<ctxt>$) 
+	      START(FAMC, $1, $<ctxt>$) 
             }
             famc_subs
 	    { CHECK0 }
@@ -2094,7 +2161,7 @@ famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_FAMC_PEDI,
 					    PARENT, $1, $3, $4, 
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(PEDI, $<ctxt>$)  
+		   START(PEDI, $1, $<ctxt>$)  
                  }  
                  no_std_subs  
                  { CHECK0 }  
@@ -2112,7 +2179,7 @@ cont_sect : OPEN DELIM TAG_CONT mand_line_item
             { $<ctxt>$ = start_element(ELT_SUB_CONT,
 				       PARENT, $1, $3, $4, 
 				       GEDCOM_MAKE_STRING(val1, $4));
-	      START(CONT, $<ctxt>$)  
+	      START(CONT, $1, $<ctxt>$)  
             }  
             no_std_subs  
             { CHECK0 }  
@@ -2125,7 +2192,7 @@ conc_sect : OPEN DELIM TAG_CONC mand_line_item
             { $<ctxt>$ = start_element(ELT_SUB_CONC,
 				       PARENT, $1, $3, $4, 
 				       GEDCOM_MAKE_STRING(val1, $4));
-	      START(CONC, $<ctxt>$)  
+	      START(CONC, $1, $<ctxt>$)  
             }  
             no_std_subs  
             { CHECK0 }  
@@ -2152,7 +2219,7 @@ event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item
 			     = start_element(ELT_SUB_EVT_TYPE,
 					     PARENT, $1, $3, $4, 
 					     GEDCOM_MAKE_STRING(val1, $4));
-			   START(TYPE, $<ctxt>$)  
+			   START(TYPE, $1, $<ctxt>$)  
                          }  
                          no_std_subs  
                          { CHECK0 }  
@@ -2167,7 +2234,7 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
 			     = start_element(ELT_SUB_EVT_DATE,
 					     PARENT, $1, $3, $4, 
 					     GEDCOM_MAKE_DATE(val1, dv));
-			   START(DATE, $<ctxt>$)  
+			   START(DATE, $1, $<ctxt>$)  
                          }  
                          no_std_subs  
                          { CHECK0 }  
@@ -2177,11 +2244,12 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
 			 }
                        ;
 event_detail_age_sect  : OPEN DELIM TAG_AGE mand_line_item 
-                         { $<ctxt>$
+                         { struct age_value age = gedcom_parse_age($4);
+			   $<ctxt>$
 			     = start_element(ELT_SUB_EVT_AGE,
 					     PARENT, $1, $3, $4, 
-					     GEDCOM_MAKE_STRING(val1, $4));
-			   START(AGE, $<ctxt>$)  
+					     GEDCOM_MAKE_AGE(val1, age));
+			   START(AGE, $1, $<ctxt>$)  
                          }  
                          no_std_subs  
                          { CHECK0 }  
@@ -2195,7 +2263,7 @@ event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
 			     = start_element(ELT_SUB_EVT_AGNC,
 					     PARENT, $1, $3, $4, 
 					     GEDCOM_MAKE_STRING(val1, $4));
-			   START(AGNC, $<ctxt>$)  
+			   START(AGNC, $1, $<ctxt>$)  
                          }  
                          no_std_subs  
                          { CHECK0 }  
@@ -2209,7 +2277,7 @@ event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
 			     = start_element(ELT_SUB_EVT_CAUS,
 					     PARENT, $1, $3, $4, 
 					     GEDCOM_MAKE_STRING(val1, $4));
-			   START(CAUS, $<ctxt>$)  
+			   START(CAUS, $1, $<ctxt>$)  
                          }  
                          no_std_subs  
                          { CHECK0 }  
@@ -2229,7 +2297,7 @@ fam_event_sect : OPEN DELIM fam_event_tag opt_value
 		     = start_element(ELT_SUB_FAM_EVT,
 				     PARENT, $1, $3, $4,
 				     GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
-		   START2($<ctxt>$);
+		   START2($1, $<ctxt>$);
 		 }
                  fam_event_subs
                  { CHECK0 }
@@ -2264,7 +2332,7 @@ fam_even_husb_sect : OPEN DELIM TAG_HUSB
                      { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_HUSB,
 						PARENT, $1, $3, NULL,
 						GEDCOM_MAKE_NULL(val1));
-		       START(HUSB, $<ctxt>$) 
+		       START(HUSB, $1, $<ctxt>$) 
                      }
                      fam_even_husb_subs
 		     { CHECK1(AGE) }
@@ -2283,10 +2351,11 @@ 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,
+                    { struct age_value age = gedcom_parse_age($4);
+		      $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_AGE,
 					       PARENT, $1, $3, $4,
-					       GEDCOM_MAKE_STRING(val1, $4));
-		      START(AGE, $<ctxt>$)   
+					       GEDCOM_MAKE_AGE(val1, age));
+		      START(AGE, $1, $<ctxt>$)   
                     }   
                     no_std_subs   
                     { CHECK0 }   
@@ -2300,7 +2369,7 @@ fam_even_wife_sect : OPEN DELIM TAG_WIFE
                      { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_WIFE,
 						PARENT, $1, $3, NULL,
 						GEDCOM_MAKE_NULL(val1));
-		       START(WIFE, $<ctxt>$) 
+		       START(WIFE, $1, $<ctxt>$) 
                      }
                      fam_even_husb_subs
 		     { CHECK1(AGE) }
@@ -2314,7 +2383,7 @@ fam_gen_even_sect : OPEN DELIM TAG_EVEN
                     { $<ctxt>$ = start_element(ELT_SUB_FAM_EVT_EVEN,
 						PARENT, $1, $3, NULL,
 						GEDCOM_MAKE_NULL(val1));
-		       START(EVEN, $<ctxt>$) 
+		       START(EVEN, $1, $<ctxt>$) 
                     }
                     fam_gen_even_subs
 		    { CHECK0 }
@@ -2343,7 +2412,7 @@ ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item
                   { $<ctxt>$ = start_element(ELT_SUB_IDENT_REFN,
 					     PARENT, $1, $3, $4,
 					     GEDCOM_MAKE_STRING(val1, $4));
-		    START(REFN, $<ctxt>$)  
+		    START(REFN, $1, $<ctxt>$)  
                   }
                   ident_refn_subs
 		  { CHECK0 }
@@ -2366,7 +2435,7 @@ ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item
 			   = start_element(ELT_SUB_IDENT_REFN_TYPE,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_STRING(val1, $4));
-		         START(TYPE, $<ctxt>$)    
+		         START(TYPE, $1, $<ctxt>$)    
                        }    
                        no_std_subs    
                        { CHECK0 }    
@@ -2380,7 +2449,7 @@ ident_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
                   { $<ctxt>$ = start_element(ELT_SUB_IDENT_RIN,
 					     PARENT, $1, $3, $4,
 					     GEDCOM_MAKE_STRING(val1, $4));
-		    START(RIN, $<ctxt>$)    
+		    START(RIN, $1, $<ctxt>$)    
                   }    
                   no_std_subs    
                   { CHECK0 }    
@@ -2399,13 +2468,14 @@ 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(val1, $4));
-		    START2($<ctxt>$);
+		    START2($1, $<ctxt>$);
 		  }
                   indiv_attr_event_subs
                   { CHECK0 }
                   CLOSE
                   { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>5, NULL);
 		  }
+                ;
 
 indiv_attr_tag  : TAG_CAST { $$ = $1; START1(CAST) }
                 | TAG_DSCR { $$ = $1; START1(DSCR) }
@@ -2419,12 +2489,13 @@ indiv_attr_tag  : TAG_CAST { $$ = $1; START1(CAST) }
                 | 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(val1));
-		    START(RESI, $<ctxt>$)  
+		    START(RESI, $1, $<ctxt>$)  
                   }
                   indiv_attr_event_subs 
 		  { CHECK0 }
@@ -2453,7 +2524,7 @@ indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value
 		      = start_element(ELT_SUB_INDIV_BIRT,
 				      PARENT, $1, $3, $4,
 				      GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
-		    START2($<ctxt>$);
+		    START2($1, $<ctxt>$);
 		  }
                   indiv_birt_subs
                   { CHECK0 }
@@ -2484,7 +2555,7 @@ indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
 			   = start_element(ELT_SUB_INDIV_BIRT_FAMC,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		         START(FAMC, $<ctxt>$) 
+		         START(FAMC, $1, $<ctxt>$) 
                        } 
                        no_std_subs 
                        { CHECK0 } 
@@ -2499,7 +2570,7 @@ indiv_gen_sect  : OPEN DELIM indiv_gen_tag opt_value
 		      = start_element(ELT_SUB_INDIV_GEN,
 				      PARENT, $1, $3, $4,
 				      GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
-		    START2($<ctxt>$);
+		    START2($1, $<ctxt>$);
 		  }
                   indiv_gen_subs
                   { CHECK0 }
@@ -2542,7 +2613,7 @@ indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value
 		      = start_element(ELT_SUB_INDIV_ADOP,
 				      PARENT, $1, $3, $4,
 				      GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
-		    START(ADOP, $<ctxt>$) }
+		    START(ADOP, $1, $<ctxt>$) }
                   indiv_adop_subs
 		  { CHECK0 }
                   CLOSE 
@@ -2568,7 +2639,7 @@ indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
 			   = start_element(ELT_SUB_INDIV_ADOP_FAMC,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		         START(FAMC, $<ctxt>$) }
+		         START(FAMC, $1, $<ctxt>$) }
                        indiv_adop_famc_subs
 		       { CHECK0 }
                        CLOSE 
@@ -2590,7 +2661,7 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
 				= start_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
 						PARENT, $1, $3, $4,
 						GEDCOM_MAKE_STRING(val1, $4));
-			      START(ADOP, $<ctxt>$) }    
+			      START(ADOP, $1, $<ctxt>$) }    
                             no_std_subs    
                             { CHECK0 }    
                             CLOSE    
@@ -2603,7 +2674,7 @@ indiv_even_sect : OPEN DELIM TAG_EVEN
                   { $<ctxt>$ = start_element(ELT_SUB_INDIV_EVEN,
 					     PARENT, $1, $3, NULL,
 					     GEDCOM_MAKE_NULL(val1));
-		    START(EVEN, $<ctxt>$) }
+		    START(EVEN, $1, $<ctxt>$) }
                   indiv_gen_subs
 		  { CHECK0 }
                   CLOSE    
@@ -2620,7 +2691,7 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag
                 { $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL,
 					   PARENT, $1, $3, NULL,
 					   GEDCOM_MAKE_NULL(val1));
-		  START2($<ctxt>$);
+		  START2($1, $<ctxt>$);
 		}
                 lio_bapl_subs
                 { CHECK0 }
@@ -2651,7 +2722,7 @@ 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(val1, $4));
-		       START(STAT, $<ctxt>$)    
+		       START(STAT, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2665,7 +2736,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
 		       $<ctxt>$ = start_element(ELT_SUB_LIO_BAPL_DATE,
 						PARENT, $1, $3, $4,
 						GEDCOM_MAKE_DATE(val1, dv));
-		       START(DATE, $<ctxt>$)    
+		       START(DATE, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2678,7 +2749,7 @@ 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(val1, $4));
-		       START(TEMP, $<ctxt>$)    
+		       START(TEMP, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2691,7 +2762,7 @@ 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(val1, $4));
-		       START(PLAC, $<ctxt>$)    
+		       START(PLAC, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2705,7 +2776,7 @@ lio_slgc_sect : OPEN DELIM TAG_SLGC
                 { $<ctxt>$ = start_element(ELT_SUB_LIO_SLGC,
 					   PARENT, $1, $3, NULL,
 					   GEDCOM_MAKE_NULL(val1));
-		  START(SLGC, $<ctxt>$) 
+		  START(SLGC, $1, $<ctxt>$) 
                 }
                 lio_slgc_subs
 		{ CHECK1(FAMC) }
@@ -2730,7 +2801,7 @@ lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
 			 = start_element(ELT_SUB_LIO_SLGC_FAMC,
 					 PARENT, $1, $3, $4,
 					 GEDCOM_MAKE_XREF_PTR(val1, xr));
-		       START(FAMC, $<ctxt>$) 
+		       START(FAMC, $1, $<ctxt>$) 
                      } 
                      no_std_subs 
                      { CHECK0 } 
@@ -2748,7 +2819,7 @@ lss_slgs_sect : OPEN DELIM TAG_SLGS
                 { $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS,
 					   PARENT, $1, $3, NULL,
 					   GEDCOM_MAKE_NULL(val1));
-		  START(SLGS, $<ctxt>$) }
+		  START(SLGS, $1, $<ctxt>$) }
                 lss_slgs_subs
 		{ CHECK0 }
                 CLOSE 
@@ -2773,7 +2844,7 @@ 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(val1, $4));
-		       START(STAT, $<ctxt>$)    
+		       START(STAT, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2787,7 +2858,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
 		       $<ctxt>$ = start_element(ELT_SUB_LSS_SLGS_DATE,
 						PARENT, $1, $3, $4,
 						GEDCOM_MAKE_DATE(val1, dv));
-		       START(DATE, $<ctxt>$)    
+		       START(DATE, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2800,7 +2871,7 @@ 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(val1, $4));
-		       START(TEMP, $<ctxt>$)    
+		       START(TEMP, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2813,7 +2884,7 @@ 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(val1, $4));
-		       START(PLAC, $<ctxt>$)    
+		       START(PLAC, $1, $<ctxt>$)    
                      }    
                      no_std_subs    
                      { CHECK0 }    
@@ -2837,7 +2908,7 @@ multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER
 			    = start_element(ELT_SUB_MULTIM_OBJE,
 					    PARENT, $1, $3, $5,
 					    GEDCOM_MAKE_XREF_PTR(val1, xr));
-			  START(OBJE, $<ctxt>$)     
+			  START(OBJE, $1, $<ctxt>$)     
                         }     
                         no_std_subs     
                         { CHECK0 }     
@@ -2851,7 +2922,7 @@ multim_obje_emb_sect : OPEN DELIM TAG_OBJE
                        { $<ctxt>$ = start_element(ELT_SUB_MULTIM_OBJE,
 						  PARENT, $1, $3, NULL,
 						  GEDCOM_MAKE_NULL(val1));
-		         START(OBJE, $<ctxt>$) 
+		         START(OBJE, $1, $<ctxt>$) 
                        }
                        multim_obje_emb_subs
 		       { CHECK2(FORM,FILE) }
@@ -2877,7 +2948,7 @@ multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
 			    = start_element(ELT_SUB_MULTIM_OBJE_FORM,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		          START(FORM, $<ctxt>$)     
+		          START(FORM, $1, $<ctxt>$)     
                         }     
                         no_std_subs     
                         { CHECK0 }     
@@ -2891,7 +2962,7 @@ multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
 			    = start_element(ELT_SUB_MULTIM_OBJE_TITL,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		          START(TITL, $<ctxt>$)     
+		          START(TITL, $1, $<ctxt>$)     
                         }     
                         no_std_subs     
                         { CHECK0 }     
@@ -2905,7 +2976,7 @@ multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
 			    = start_element(ELT_SUB_MULTIM_OBJE_FILE,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		          START(FILE, $<ctxt>$)     
+		          START(FILE, $1, $<ctxt>$)     
                         }     
                         no_std_subs     
                         { CHECK0 }     
@@ -2929,7 +3000,7 @@ note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER
 			   = start_element(ELT_SUB_NOTE,
 					   PARENT, $1, $3, $5,
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		         START(NOTE, $<ctxt>$) 
+		         START(NOTE, $1, $<ctxt>$) 
                        }
                        note_struc_link_subs
 		       { CHECK0 }
@@ -2951,7 +3022,7 @@ note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item
 			  = start_element(ELT_SUB_NOTE,
 					  PARENT, $1, $3, $4,
 					 GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
-		        START(NOTE, $<ctxt>$) 
+		        START(NOTE, $1, $<ctxt>$) 
                       }
                       note_struc_emb_subs
 		      { CHECK0 }
@@ -2977,7 +3048,7 @@ pers_name_sect : OPEN DELIM TAG_NAME mand_line_item
                  { $<ctxt>$ = start_element(ELT_SUB_PERS_NAME,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		   START(NAME, $<ctxt>$)  
+		   START(NAME, $1, $<ctxt>$)  
                  }
                  pers_name_subs
 		 { CHECK0 }
@@ -3005,7 +3076,7 @@ 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(val1, $4));
-		        START(NPFX, $<ctxt>$)     
+		        START(NPFX, $1, $<ctxt>$)     
                       }     
                       no_std_subs     
                       { CHECK0 }     
@@ -3018,7 +3089,7 @@ 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(val1, $4));
-		        START(GIVN, $<ctxt>$)     
+		        START(GIVN, $1, $<ctxt>$)     
                       }     
                       no_std_subs     
                       { CHECK0 }     
@@ -3031,7 +3102,7 @@ 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(val1, $4));
-		        START(NICK, $<ctxt>$)     
+		        START(NICK, $1, $<ctxt>$)     
                       }     
                       no_std_subs     
                       { CHECK0 }     
@@ -3044,7 +3115,7 @@ 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(val1, $4));
-		        START(SPFX, $<ctxt>$)     
+		        START(SPFX, $1, $<ctxt>$)     
                       }     
                       no_std_subs     
                       { CHECK0 }     
@@ -3057,7 +3128,7 @@ 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(val1, $4));
-		        START(SURN, $<ctxt>$)     
+		        START(SURN, $1, $<ctxt>$)     
                       }     
                       no_std_subs     
                       { CHECK0 }     
@@ -3070,7 +3141,7 @@ 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(val1, $4));
-		        START(NSFX, $<ctxt>$)     
+		        START(NSFX, $1, $<ctxt>$)     
                       }     
                       no_std_subs     
                       { CHECK0 }     
@@ -3089,7 +3160,7 @@ place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
 			    = start_element(ELT_SUB_PLAC,
 					    PARENT, $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
-		          START(PLAC, $<ctxt>$)  
+		          START(PLAC, $1, $<ctxt>$)  
                         }
                         place_struc_plac_subs
 			{ CHECK0 }
@@ -3113,7 +3184,7 @@ place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
 			   = start_element(ELT_SUB_PLAC_FORM,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_STRING(val1, $4));
-		         START(FORM, $<ctxt>$)     
+		         START(FORM, $1, $<ctxt>$)     
                        }     
                        no_std_subs     
                        { CHECK0 }     
@@ -3137,7 +3208,7 @@ source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER
 			   = start_element(ELT_SUB_SOUR,
 					   PARENT, $1, $3, $5,
 					   GEDCOM_MAKE_XREF_PTR(val1, xr));
-		         START(SOUR, $<ctxt>$) 
+		         START(SOUR, $1, $<ctxt>$) 
                        }
                        source_cit_link_subs
 		       { CHECK0 }
@@ -3164,7 +3235,7 @@ source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item
 			   = start_element(ELT_SUB_SOUR_PAGE,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_STRING(val1, $4));
-		         START(PAGE, $<ctxt>$)     
+		         START(PAGE, $1, $<ctxt>$)     
                        }     
                        no_std_subs     
                        { CHECK0 }     
@@ -3179,7 +3250,7 @@ source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item
 			   = start_element(ELT_SUB_SOUR_EVEN,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_STRING(val1, $4));
-		         START(EVEN, $<ctxt>$)     
+		         START(EVEN, $1, $<ctxt>$)     
                        }
                        source_cit_even_subs
 		       { CHECK0 }
@@ -3202,7 +3273,7 @@ source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item
 			      = start_element(ELT_SUB_SOUR_EVEN_ROLE,
 					      PARENT, $1, $3, $4,
 					      GEDCOM_MAKE_STRING(val1, $4));
-			    START(ROLE, $<ctxt>$)     
+			    START(ROLE, $1, $<ctxt>$)     
                           }     
                           no_std_subs     
                           { CHECK0 }     
@@ -3216,7 +3287,7 @@ source_cit_data_sect : OPEN DELIM TAG_DATA
                        { $<ctxt>$ = start_element(ELT_SUB_SOUR_DATA,
 						  PARENT, $1, $3, NULL,
 						  GEDCOM_MAKE_NULL(val1));
-		         START(DATA, $<ctxt>$) 
+		         START(DATA, $1, $<ctxt>$) 
                        }
                        source_cit_data_subs
 		       { CHECK0 }
@@ -3241,7 +3312,7 @@ source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
 				= start_element(ELT_SUB_SOUR_DATA_DATE,
 						PARENT, $1, $3, $4,
 						GEDCOM_MAKE_DATE(val1, dv));
-			      START(DATE, $<ctxt>$)     
+			      START(DATE, $1, $<ctxt>$)     
                             }     
                             no_std_subs     
                             { CHECK0 }     
@@ -3256,7 +3327,7 @@ source_cit_text_sect : OPEN DELIM TAG_TEXT mand_line_item
 			   = start_element(ELT_SUB_SOUR_TEXT,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_STRING(val1, $4));
-		         START(TEXT, $<ctxt>$)  
+		         START(TEXT, $1, $<ctxt>$)  
                        }
                        source_cit_text_subs
 		       { CHECK0 }
@@ -3279,7 +3350,7 @@ source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item
 			   = start_element(ELT_SUB_SOUR_QUAY,
 					   PARENT, $1, $3, $4,
 					   GEDCOM_MAKE_STRING(val1, $4));
-		         START(QUAY, $<ctxt>$)     
+		         START(QUAY, $1, $<ctxt>$)     
                        }     
                        no_std_subs     
                        { CHECK0 }     
@@ -3293,7 +3364,7 @@ source_cit_emb_sect : OPEN DELIM TAG_SOUR mand_line_item
                       { $<ctxt>$ = start_element(ELT_SUB_SOUR,
 						 PARENT, $1, $3, $4,
 						 GEDCOM_MAKE_STRING(val1, $4));
-		        START(SOUR, $<ctxt>$) 
+		        START(SOUR, $1, $<ctxt>$) 
                       }
                       source_cit_emb_subs
 		      { CHECK0 }
@@ -3324,7 +3395,7 @@ source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer
 			     = start_element(ELT_SUB_REPO,
 					     PARENT, $1, $3, $4,
 					     GEDCOM_MAKE_XREF_PTR(val1, xr));
-			   START(REPO, $<ctxt>$) 
+			   START(REPO, $1, $<ctxt>$) 
                          }
                          source_repos_repo_subs
 			 { CHECK0 }
@@ -3346,7 +3417,7 @@ caln_sect : OPEN DELIM TAG_CALN mand_line_item
             { $<ctxt>$ = start_element(ELT_SUB_REPO_CALN,
 				       PARENT, $1, $3, $4,
 				       GEDCOM_MAKE_STRING(val1, $4));
-	      START(CALN, $<ctxt>$) 
+	      START(CALN, $1, $<ctxt>$) 
 	    }
             caln_subs
 	    { CHECK0 }
@@ -3367,7 +3438,7 @@ 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(val1, $4));
-		   START(MEDI, $<ctxt>$)  
+		   START(MEDI, $1, $<ctxt>$)  
 		 }   
 		 no_std_subs   
 		 { CHECK0 }   
@@ -3388,7 +3459,7 @@ spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer
 			 = start_element(ELT_SUB_FAMS,
 					 PARENT, $1, $3, $4,
 					 GEDCOM_MAKE_XREF_PTR(val1, xr));
-		       START(FAMS, $<ctxt>$) 
+		       START(FAMS, $1, $<ctxt>$) 
                      }
                      spou_fam_fams_subs
 		     { CHECK0 }
@@ -3415,12 +3486,14 @@ no_std_subs : /* empty */
 
 no_std_sub  : user_sect /* 0:M */
 	    | gen_sect
-	    | error error_subs CLOSE  { HANDLE_ERROR }
+            | error error_subs
+              CLOSE  { HANDLE_ERROR }
 	    ;
 
 no_std_rec  : user_rec /* 0:M */
 	    | gen_rec
-	    | error error_subs CLOSE  { HANDLE_ERROR }
+            | error error_subs
+              CLOSE  { HANDLE_ERROR }
 	    ;
 
 user_rec    : OPEN DELIM opt_xref USERTAG
@@ -3440,7 +3513,7 @@ user_rec    : OPEN DELIM opt_xref USERTAG
 					$1,
 					GEDCOM_MAKE_NULL_OR_XREF_PTR(val1, xr),
 					$4, $6, &val2);
-	        START($4, $<ctxt>$)
+	        START($4, $1, $<ctxt>$)
 	      }
 	      user_sects
               { CHECK0 }
@@ -3456,7 +3529,7 @@ user_sect   : OPEN DELIM opt_xref USERTAG
 	      }
               opt_value
               { $<ctxt>$ = start_element(ELT_USER, PARENT, $1, $4, $6, &val2);
-		START($4, $<ctxt>$);
+		START($4, $1, $<ctxt>$);
 	      }
 	      user_sects
               { CHECK0 }
@@ -3489,12 +3562,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; }
               ;
@@ -3533,6 +3615,8 @@ line_item   : anychar  { size_t i;
 		      *line_item_buf_ptr++ = $2[i];
 		    $$ = line_item_buf;
 		  }
+            | line_item error anychar { HANDLE_ERROR; }
+            | line_item error ESCAPE  { HANDLE_ERROR; }
             ;
 
 anychar     : ANYCHAR        { }
@@ -3544,9 +3628,10 @@ 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
               { }
             ;
@@ -3556,7 +3641,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
                { }
              ;
@@ -3712,6 +3797,7 @@ anystdtag   : TAG_ABBR
             | TAG_VERS   { }
             | TAG_WIFE   { }
             | TAG_WILL   { }
+            ;
 
 %%
 
@@ -3721,14 +3807,20 @@ int* count_arrays[MAXGEDCLEVEL+1];
 char tag_stack[MAXGEDCLEVEL+1][MAXSTDTAGLEN+1];
 Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1];
 
-void push_countarray()
+void push_countarray(int level)
 {
   int *count = NULL;
+  gedcom_debug_print("Push Count level: %d, level: %d\n", count_level, level);
+  if (count_level != level + 1) {
+    gedcom_error(_("Internal error: count level mismatch"));
+    exit(1);
+  }
   if (count_level > MAXGEDCLEVEL) {
     gedcom_error(_("Internal error: count array overflow"));
     exit(1);
   }
   else {
+    gedcom_debug_print("calloc countarray %d\n", count_level);
     count = (int *)calloc(YYNTOKENS, sizeof(int));
     if (count == NULL) {
       gedcom_error(_("Internal error: count array calloc error"));
@@ -3740,7 +3832,7 @@ void push_countarray()
   }
 }
 
-void set_parenttag(char* tag)
+void set_parenttag(const char* tag)
 {
   strncpy(tag_stack[count_level+1], tag, MAXSTDTAGLEN+1);
 }
@@ -3750,14 +3842,14 @@ void set_parentctxt(Gedcom_ctxt 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)
@@ -3775,17 +3867,28 @@ int check_occurrence(int tag)
 void pop_countarray()
 {
   int *count;
+  gedcom_debug_print("Pop Count level: %d\n", count_level);
   if (count_level < 0) {
     gedcom_error(_("Internal error: count array underflow"));
     exit(1);
   }
   else {
     count = count_arrays[count_level];
+    gedcom_debug_print("free countarray %d\n", count_level);
     free(count);
     count_arrays[count_level] = NULL;
   }
 }
 
+void clean_up()
+{
+  gedcom_debug_print("Cleanup countarrays\n");
+  while (count_level > 0) {
+    pop_countarray();
+    --count_level;
+  }
+}
+
 /* Enabling debug mode */
 /* level 0: no debugging */
 /* level 1: only internal */
@@ -3808,7 +3911,7 @@ void gedcom_set_debug_level(int level, FILE* f)
   }
 }
 
-int gedcom_debug_print(char* s, ...)
+int gedcom_debug_print(const char* s, ...)
 {
   int res = 0;
   if (gedcom_high_level_debug) {
@@ -3826,29 +3929,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);
-}
-