X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=b94f7fa37c612217c3d1c036e5084375037f4bd0;hb=d41803b9c1bcafabf115a188e3b4a489103bbdca;hp=2f2e0a4acf7ebda10644c0077950e3482fcb414e;hpb=505301d49e81bcd0e1827026cd4672b8722ac349;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 2f2e0a4..b94f7fa 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -157,13 +157,18 @@ int  gedcom_high_level_debug = 0;
 Gedcom_err_mech error_mechanism = IMMED_FAIL;
 Gedcom_val_struct val1;
 Gedcom_val_struct val2; 
- 
-char line_item_buf[MAXGEDCLINELEN * UTF_FACTOR + 1];
-char *line_item_buf_ptr;
+
+void cleanup_line_item_buffer();
+struct safe_buffer line_item_buffer = { NULL, 0, NULL, 0,
+					cleanup_line_item_buffer };
 
 void cleanup_concat_buffer(); 
-struct safe_buffer concat_buffer  = { NULL, 0, cleanup_concat_buffer }; 
+struct safe_buffer concat_buffer = { NULL, 0, NULL, 0, cleanup_concat_buffer };
 
+void cleanup_usertag_buffer();
+struct safe_buffer usertag_buffer = { NULL, 0, NULL, 0,
+				      cleanup_usertag_buffer};
+ 
 /* These are defined at the bottom of the file */ 
 void push_countarray(int level);
 void set_parenttag(const char* tag);
@@ -173,16 +178,14 @@ Gedcom_ctxt get_parentctxt(int offset);
 void pop_countarray();
 int  count_tag(int tag);
 int  check_occurrence(int tag);
-void clean_up(); 
+void clean_up();
 
-#define CLEAR_BUFFER(BUF)                                                     \
-     memset(BUF, 0, sizeof(BUF));
- 
 #define HANDLE_ERROR                                                          \
      { if (error_mechanism == IMMED_FAIL) {                                   \
 	 clean_up(); YYABORT;                                                 \
        }                                                                      \
        else if (error_mechanism == DEFER_FAIL) {                              \
+         gedcom_debug_print("Fail on line %d", line_no);                      \
          yyerrok; fail = 1;                                                   \
        }                                                                      \
        else if (error_mechanism == IGNORE_ERRORS) {                           \
@@ -212,7 +215,9 @@ void clean_up();
 		      #TAG, parenttag);                                       \
          HANDLE_ERROR;                                                        \
        }                                                                      \
-     } 
+     }
+#define CHK_COND(TAG)                                                         \
+     check_occurrence(TAG_##TAG)
 #define POP                                                                   \
      { pop_countarray();                                                      \
        --count_level;                                                         \
@@ -257,7 +262,7 @@ void clean_up();
 }
 
 %token_table
-%expect 308
+%expect 317
 
 %token <string> BADTOKEN
 %token <number> OPEN
@@ -446,22 +451,24 @@ head_sect    : OPEN DELIM TAG_HEAD
 					 NULL, GEDCOM_MAKE_NULL(val2));
 	         START(HEAD, $1, $<ctxt>$) }
                head_subs
-               { if (compat_mode(C_FTREE)) {
-		   CHECK3(SOUR, GEDC, CHAR);
-		   compat_generate_submitter_link($<ctxt>4);
-		 }
-	         else if (compat_mode(C_LIFELINES)) {
-		   CHECK1(SOUR);
+               { if (compat_mode(C_NO_SUBMITTER) && ! CHK_COND(SUBM))
 		   compat_generate_submitter_link($<ctxt>4);
+	         else CHK(SUBM);
+
+	         if (compat_mode(C_NO_GEDC) && ! CHK_COND(GEDC))
 		   compat_generate_gedcom($<ctxt>4);
+		 else CHK(GEDC);
+
+		 if (compat_mode(C_NO_CHAR) && ! CHK_COND(CHAR)) {
 		   if (compat_generate_char($<ctxt>4)) HANDLE_ERROR;
-	         }
-	         else
-		   CHECK4(SOUR, SUBM, GEDC, CHAR)
+		 }
+		 else CHK(CHAR);
+
+		 CHECK1(SOUR);
 	       }
                CLOSE
-               { end_record(REC_HEAD, $<ctxt>4, NULL);
-	         if (compat_mode(C_FTREE | C_LIFELINES))
+               { end_record(REC_HEAD, $<ctxt>4, GEDCOM_MAKE_NULL(val1));
+	         if (compat_mode(C_NO_SUBMITTER))
 	           compat_generate_submitter();
 	       }
              ;
@@ -473,7 +480,7 @@ 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))
+             | head_time_sect  { if (!compat_mode(C_HEAD_TIME))
 	                          INVALID_TAG("TIME");
 	                         OCCUR2(TIME, 0, 1) }
              | head_subm_sect  { OCCUR2(SUBM, 1, 1) }
@@ -490,7 +497,7 @@ head_sub     : head_sour_sect  { OCCUR2(SOUR, 1, 1) }
 
 /* HEAD.SOUR */
 head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item 
-                 { set_compatibility($4);
+                 { set_compatibility_program($4);
 		   $<ctxt>$ = start_element(ELT_HEAD_SOUR, PARENT,
 					    $1, $3, $4,
 					    GEDCOM_MAKE_STRING(val1, $4));
@@ -499,7 +506,9 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item
                  head_sour_subs
                  { CHECK0 }
 		 CLOSE
-                 { end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5, NULL); }
+                 { compute_compatibility();
+		   end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1)); }
                ;
 
 head_sour_subs : /* empty */
@@ -514,7 +523,8 @@ 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,
+                      { set_compatibility_version($4);
+			$<ctxt>$ = start_element(ELT_HEAD_SOUR_VERS, PARENT,
 						 $1, $3, $4,
 						 GEDCOM_MAKE_STRING(val1, $4));
 		        START(VERS, $1, $<ctxt>$)
@@ -523,7 +533,7 @@ head_sour_vers_sect : OPEN DELIM TAG_VERS mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_SOUR_VERS,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
@@ -536,7 +546,7 @@ head_sour_name_sect : OPEN DELIM TAG_NAME mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_SOUR_NAME,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item 
@@ -549,7 +559,7 @@ head_sour_corp_sect : OPEN DELIM TAG_CORP mand_line_item
 		      { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_SOUR_CORP,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -571,7 +581,7 @@ head_sour_data_sect : OPEN DELIM TAG_DATA mand_line_item
                       { CHECK0 }
 		      CLOSE
                       { end_element(ELT_HEAD_SOUR_DATA,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -596,7 +606,8 @@ head_sour_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
                            { CHECK0 }
                            CLOSE
                            { end_element(ELT_HEAD_SOUR_DATA_DATE,
-					 PARENT, $<ctxt>5, NULL);
+					 PARENT, $<ctxt>5,
+					 GEDCOM_MAKE_NULL(val1));
 			   }
                          ;
 head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
@@ -610,7 +621,8 @@ head_sour_data_copr_sect : OPEN DELIM TAG_COPR mand_line_item
                            { CHECK0 }
                            CLOSE
                            { end_element(ELT_HEAD_SOUR_DATA_COPR,
-					 PARENT, $<ctxt>5, NULL);
+					 PARENT, $<ctxt>5,
+					 GEDCOM_MAKE_NULL(val1));
 			   }
                          ;
 
@@ -625,7 +637,7 @@ head_dest_sect : OPEN DELIM TAG_DEST mand_line_item
                  { CHECK0 }
                  CLOSE
                  { end_element(ELT_HEAD_DEST,
-			       PARENT, $<ctxt>5, NULL);
+			       PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -635,13 +647,15 @@ 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));
+		   if (compat_mode(C_HEAD_TIME))
+		     compat_save_head_date_context($<ctxt>$);
 		   START(DATE, $1, $<ctxt>$)
 		 }
                  head_date_subs
 		 { CHECK0 }
                  CLOSE
                  { end_element(ELT_HEAD_DATE,
-			       PARENT, $<ctxt>5, NULL);
+			       PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -663,14 +677,20 @@ head_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_DATE_TIME,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
-/* 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.TIME (Only for compatibility) */
+head_time_sect : OPEN DELIM TAG_TIME opt_line_item
+                 { if (compat_mode(C_HEAD_TIME)) {
+		     $<ctxt>$ = compat_generate_head_time_start($1, $3, $4);
+                   }
+                 }
+                 CLOSE
+                 { if (compat_mode (C_HEAD_TIME)) {
+		     compat_generate_head_time_end($<ctxt>5);
+		   }
                  }
 	       ;
 
@@ -688,7 +708,7 @@ head_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
                  { CHECK0 }
                  CLOSE
                  { end_element(ELT_HEAD_SUBM,
-			       PARENT, $<ctxt>5, NULL);
+			       PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 /* HEAD.SUBN */
@@ -705,7 +725,7 @@ head_subn_sect : OPEN DELIM TAG_SUBN mand_pointer
                  { CHECK0 }
                  CLOSE
                  { end_element(ELT_HEAD_SUBN,
-			       PARENT, $<ctxt>5, NULL);
+			       PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 /* HEAD.FILE */
@@ -718,7 +738,8 @@ head_file_sect : OPEN DELIM TAG_FILE mand_line_item
                  no_std_subs
                  { CHECK0 }
                  CLOSE
-                 { end_element(ELT_HEAD_FILE, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_HEAD_FILE, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 /* HEAD.COPR */
@@ -731,7 +752,8 @@ head_copr_sect : OPEN DELIM TAG_COPR mand_line_item
                  no_std_subs
                  { CHECK0 }
                  CLOSE
-                 { end_element(ELT_HEAD_COPR, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_HEAD_COPR, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 /* HEAD.GEDC */
@@ -742,9 +764,16 @@ head_gedc_sect : OPEN DELIM TAG_GEDC
 		   START(GEDC, $1, $<ctxt>$)
 		 }
                  head_gedc_subs
-		 { CHECK2(VERS, FORM) }
+		 { if (compat_mode(C_NO_GEDC_FORM) && ! CHK_COND(FORM))
+		     compat_generate_gedcom_form($<ctxt>4);
+		   else CHK(FORM);
+		 
+		   CHECK1(VERS)  
+		 }
+
                  CLOSE
-                 { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4, NULL);
+                 { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -766,7 +795,7 @@ head_gedc_vers_sect : OPEN DELIM TAG_VERS mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_GEDC_VERS,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item   
@@ -779,7 +808,7 @@ head_gedc_form_sect : OPEN DELIM TAG_FORM mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_GEDC_FORM,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -796,7 +825,8 @@ head_char_sect : OPEN DELIM TAG_CHAR mand_line_item
                  head_char_subs
 		 { CHECK0 }
                  CLOSE
-                 { end_element(ELT_HEAD_CHAR, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_HEAD_CHAR, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -817,7 +847,7 @@ head_char_vers_sect : OPEN DELIM TAG_VERS mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_CHAR_VERS,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -831,7 +861,8 @@ head_lang_sect : OPEN DELIM TAG_LANG mand_line_item
                  no_std_subs
                  { CHECK0 }
                  CLOSE
-                 { end_element(ELT_HEAD_LANG, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_HEAD_LANG, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 /* HEAD.PLAC */
@@ -844,7 +875,8 @@ head_plac_sect : OPEN DELIM TAG_PLAC
                  head_plac_subs
 		 { CHECK1(FORM) }
                  CLOSE
-                 { end_element(ELT_HEAD_PLAC, PARENT, $<ctxt>4, NULL);
+                 { end_element(ELT_HEAD_PLAC, PARENT, $<ctxt>4,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -865,7 +897,7 @@ head_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
                       { CHECK0 }
                       CLOSE
                       { end_element(ELT_HEAD_PLAC_FORM,
-				    PARENT, $<ctxt>5, NULL);
+				    PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -917,7 +949,7 @@ fam_rec      : OPEN DELIM POINTER DELIM TAG_FAM
                fam_subs
 	       { CHECK0 }
                CLOSE
-               { end_record(REC_FAM, $<ctxt>6, NULL); }
+               { end_record(REC_FAM, $<ctxt>6, GEDCOM_MAKE_NULL(val1)); }
              ;
 
 fam_subs     : /* empty */
@@ -952,7 +984,8 @@ fam_husb_sect : OPEN DELIM TAG_HUSB mand_pointer
                 no_std_subs
                 { CHECK0 }
                 CLOSE
-                { end_element(ELT_FAM_HUSB, PARENT, $<ctxt>5, NULL);
+                { end_element(ELT_FAM_HUSB, PARENT, $<ctxt>5,
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -969,7 +1002,8 @@ fam_wife_sect : OPEN DELIM TAG_WIFE mand_pointer
                 no_std_subs
                 { CHECK0 }
                 CLOSE
-                { end_element(ELT_FAM_WIFE, PARENT, $<ctxt>5, NULL);
+                { end_element(ELT_FAM_WIFE, PARENT, $<ctxt>5,
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -986,7 +1020,8 @@ fam_chil_sect : OPEN DELIM TAG_CHIL mand_pointer
 		no_std_subs 
 		{ CHECK0 } 
 		CLOSE
-                { end_element(ELT_FAM_CHIL, PARENT, $<ctxt>5, NULL);
+                { end_element(ELT_FAM_CHIL, PARENT, $<ctxt>5,
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -1000,7 +1035,8 @@ fam_nchi_sect : OPEN DELIM TAG_NCHI mand_line_item
 		no_std_subs  
 		{ CHECK0 }  
 		CLOSE
-                { end_element(ELT_FAM_NCHI, PARENT, $<ctxt>5, NULL);
+                { end_element(ELT_FAM_NCHI, PARENT, $<ctxt>5,
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -1017,7 +1053,8 @@ fam_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 		no_std_subs   
 		{ CHECK0 }   
 		CLOSE
-                { end_element(ELT_FAM_SUBM, PARENT, $<ctxt>5, NULL);
+                { end_element(ELT_FAM_SUBM, PARENT, $<ctxt>5,
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -1035,7 +1072,10 @@ indiv_rec   : OPEN DELIM POINTER DELIM TAG_INDI
               indi_subs
 	      { CHECK0 }
               CLOSE
-              { end_record(REC_INDI, $<ctxt>6, NULL); }
+              { end_record(REC_INDI, $<ctxt>6, GEDCOM_MAKE_NULL(val1));
+	        if (compat_mode(C_NO_SLGC_FAMC))
+		  compat_generate_slgc_famc_fam();
+	      }
             ;
 
 indi_subs   : /* empty */
@@ -1062,7 +1102,7 @@ indi_sub    : indi_resn_sect  { OCCUR2(RESN, 0, 1) }
             | indi_afn_sect  /* 0:M */
             | ident_struc_sub  /* 0:1 */
             | change_date_sub  /* 0:1 */
-	    | ftree_addr_sect { if (!compat_mode(C_FTREE))
+	    | indi_addr_sect { if (!compat_mode(C_INDI_ADDR))
 	                          INVALID_TAG("ADDR");
 	                      }
 	    | no_std_sub
@@ -1078,7 +1118,8 @@ indi_resn_sect : OPEN DELIM TAG_RESN mand_line_item
 		 no_std_subs     
 		 { CHECK0 }     
 		 CLOSE     
-		 { end_element(ELT_INDI_RESN, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_RESN, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1092,7 +1133,8 @@ indi_sex_sect  : OPEN DELIM TAG_SEX mand_line_item
 		 no_std_subs     
 		 { CHECK0 }     
 		 CLOSE     
-		 { end_element(ELT_INDI_SEX, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_SEX, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1109,7 +1151,8 @@ indi_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
 		 no_std_subs      
 		 { CHECK0 }      
 		 CLOSE      
-		 { end_element(ELT_INDI_SUBM, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_SUBM, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1126,7 +1169,8 @@ indi_alia_sect : OPEN DELIM TAG_ALIA mand_pointer
 		 no_std_subs       
 		 { CHECK0 }       
 		 CLOSE       
-		 { end_element(ELT_INDI_ALIA, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_ALIA, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1143,7 +1187,8 @@ indi_anci_sect : OPEN DELIM TAG_ANCI mand_pointer
 		 no_std_subs        
 		 { CHECK0 }        
 		 CLOSE        
-		 { end_element(ELT_INDI_ANCI, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_ANCI, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1160,7 +1205,8 @@ indi_desi_sect : OPEN DELIM TAG_DESI mand_pointer
 		 no_std_subs         
 		 { CHECK0 }         
 		 CLOSE         
-		 { end_element(ELT_INDI_DESI, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_DESI, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1174,7 +1220,8 @@ indi_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item
 		 no_std_subs          
 		 { CHECK0 }          
 		 CLOSE          
-		 { end_element(ELT_INDI_RFN, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_RFN, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1188,29 +1235,34 @@ indi_afn_sect  : OPEN DELIM TAG_AFN mand_line_item
 		 no_std_subs           
 		 { CHECK0 }           
 		 CLOSE           
-		 { end_element(ELT_INDI_AFN, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_INDI_AFN, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
-/* INDI.ADDR (Only for 'ftree' compatibility) */
-ftree_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
-                  { if (compat_mode(C_FTREE)) {
+/* INDI.ADDR (Only for compatibility) */
+indi_addr_sect : OPEN DELIM TAG_ADDR opt_line_item
+                  { if (compat_mode(C_INDI_ADDR)) {
 		      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>$);
+		      reset_buffer(&concat_buffer);
+		      safe_buf_append(&concat_buffer, $4);
+		      START(ADDR, $1 + 1, $<ctxt>$);
 		    }
 		  else { START(ADDR, $1, NULL) }
 		  }
                   ftree_addr_subs
                   { CHECK0 }
                   CLOSE
-                  { if (compat_mode(C_FTREE)) {
+                  { if (compat_mode(C_INDI_ADDR)) {
 		      Gedcom_ctxt par = PARENT;
-		      end_element(ELT_SUB_ADDR, par, $<ctxt>5, NULL);
+		      char* complete = get_buf_string(&concat_buffer);
+		      end_element(ELT_SUB_ADDR, par, $<ctxt>5,
+				  GEDCOM_MAKE_STRING(val1, complete));
 		      CHECK0;
 		      compat_generate_resi_end(PARENT, par);
 		    } 
@@ -1237,7 +1289,7 @@ ftree_addr_phon_sect : OPEN DELIM TAG_PHON mand_line_item
                        { CHECK0 }               
                        CLOSE               
                        { end_element(ELT_SUB_PHON, GRANDPARENT(1),
-				     $<ctxt>5, NULL);
+				     $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 	               }
             ;
 
@@ -1255,7 +1307,7 @@ multim_rec  : OPEN DELIM POINTER DELIM TAG_OBJE
               obje_subs
 	      { CHECK2(FORM, BLOB) }
               CLOSE
-              { end_record(REC_OBJE, $<ctxt>6, NULL); }
+              { end_record(REC_OBJE, $<ctxt>6, GEDCOM_MAKE_NULL(val1)); }
             ;
 
 obje_subs   : /* empty */
@@ -1282,7 +1334,8 @@ obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
 		 no_std_subs            
 		 { CHECK0 }            
 		 CLOSE            
-		 { end_element(ELT_OBJE_FORM, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_OBJE_FORM, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1296,7 +1349,8 @@ obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
 		 no_std_subs             
 		 { CHECK0 }             
 		 CLOSE             
-		 { end_element(ELT_OBJE_TITL, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_OBJE_TITL, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1306,7 +1360,6 @@ obje_blob_sect : OPEN DELIM TAG_BLOB
 					    PARENT, $1, $3, NULL,
 					    GEDCOM_MAKE_NULL(val1));
 		   reset_buffer(&concat_buffer);
-		   safe_buf_append(&concat_buffer, "");
 		   START(BLOB, $1, $<ctxt>$)              
 		 }
                  obje_blob_subs
@@ -1337,7 +1390,7 @@ obje_blob_cont_sect : OPEN DELIM TAG_CONT mand_line_item
 		      { CHECK0 }                
 		      CLOSE                
 		      { end_element(ELT_OBJE_BLOB_CONT, PARENT,
-				    $<ctxt>5, NULL);
+				    $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -1354,7 +1407,8 @@ obje_obje_sect : OPEN DELIM TAG_OBJE mand_pointer
                  no_std_subs  
                  { CHECK0 }  
                  CLOSE  
-                 { end_element(ELT_OBJE_OBJE, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_OBJE_OBJE, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1380,11 +1434,11 @@ note_rec    : OPEN DELIM POINTER DELIM TAG_NOTE note_line_item
             ;
 
 note_line_item : /* empty */
-                   { if (!compat_mode(C_FTREE)) {
+                   { if (!compat_mode(C_NOTE_NO_VALUE)) {
 		       gedcom_error(_("Missing value")); YYERROR;
 		     }
 		     else {
-		       $$ = "";
+		       $$ = VALUE_IF_MISSING;
 		     }
 		   }
                | DELIM line_item
@@ -1400,9 +1454,32 @@ note_sub    : continuation_sub  /* 0:M */
             | source_cit_sub  /* 0:M */
             | ident_struc_sub  /* 0:1 */
             | change_date_sub  /* 0:1 */
+            | note_note_sect  { if (!compat_mode(C_NOTE_NOTE))
+	                          INVALID_TAG("NOTE");
+                              }
             | no_std_sub
             ;
 
+/* Same actions as cont_sect, for compatibility */
+note_note_sect : OPEN DELIM TAG_NOTE opt_line_item
+            { $3.string = "CONT";
+	      $3.value  = TAG_CONT;
+	      $<ctxt>$ = start_element(ELT_SUB_CONT,
+				       PARENT, $1, $3, $4, 
+				       GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
+	      SAFE_BUF_ADDCHAR(&concat_buffer, '\n');
+	      if (GEDCOM_IS_STRING(&val1))
+	        safe_buf_append(&concat_buffer, $4);
+	      START(CONT, $1, $<ctxt>$)  
+            }  
+            no_std_subs  
+            { CHECK0 }  
+            CLOSE  
+            { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5,
+			  GEDCOM_MAKE_NULL(val1));
+	    }
+            ;
+
 /*********************************************************************/
 /**** Repository record                                           ****/
 /*********************************************************************/
@@ -1417,7 +1494,7 @@ repos_rec   : OPEN DELIM POINTER DELIM TAG_REPO
               repo_subs
 	      { CHECK0 }
               CLOSE
-              { end_record(REC_REPO, $<ctxt>6, NULL); }
+              { end_record(REC_REPO, $<ctxt>6, GEDCOM_MAKE_NULL(val1)); }
             ;
 
 repo_subs   : /* empty */
@@ -1442,7 +1519,8 @@ repo_name_sect : OPEN DELIM TAG_NAME mand_line_item
                  no_std_subs          
                  { CHECK0 }          
                  CLOSE          
-                 { end_element(ELT_REPO_NAME, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_REPO_NAME, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1460,7 +1538,7 @@ source_rec  : OPEN DELIM POINTER DELIM TAG_SOUR
               sour_subs
 	      { CHECK0 }
               CLOSE
-              { end_record(REC_SOUR, $<ctxt>6, NULL); }
+              { end_record(REC_SOUR, $<ctxt>6, GEDCOM_MAKE_NULL(val1)); }
             ;
 
 sour_subs   : /* empty */
@@ -1473,6 +1551,24 @@ sour_sub    : sour_data_sect  { OCCUR2(DATA, 0, 1) }
             | sour_abbr_sect  { OCCUR2(ABBR, 0, 1) }
             | sour_publ_sect  { OCCUR2(PUBL, 0, 1) }
             | sour_text_sect  { OCCUR2(TEXT, 0, 1) }
+            | sour_type_sect  { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+	                          INVALID_TAG("TYPE");
+	                        OCCUR2(TYPE, 0, 1) }
+            | sour_file_sect  { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+	                          INVALID_TAG("FILE");
+	                        OCCUR2(FILE, 0, 1) }
+            | sour_plac_sect  { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+	                          INVALID_TAG("PLAC");
+	                        OCCUR2(PLAC, 0, 1) }
+            | sour_date_sect  { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+	                          INVALID_TAG("DATE");
+	                        OCCUR2(DATE, 0, 1) }
+            | sour_medi_sect  { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+	                          INVALID_TAG("MEDI");
+	                        OCCUR2(MEDI, 0, 1) }
+            | sour_page_sect  { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+	                          INVALID_TAG("PAGE");
+	                        OCCUR2(PAGE, 0, 1) }
             | source_repos_cit_sub  /* 0:1 */
             | multim_link_sub  /* 0:M */
             | note_struc_sub  /* 0:M */
@@ -1491,7 +1587,8 @@ sour_data_sect : OPEN DELIM TAG_DATA
                  sour_data_subs
 		 { CHECK0 }
                  CLOSE 
-                 { end_element(ELT_SOUR_DATA, PARENT, $<ctxt>4, NULL);
+                 { end_element(ELT_SOUR_DATA, PARENT, $<ctxt>4,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1515,7 +1612,7 @@ sour_data_even_sect : OPEN DELIM TAG_EVEN mand_line_item
 		      { CHECK0 }
                       CLOSE  
                       { end_element(ELT_SOUR_DATA_EVEN, PARENT,
-				    $<ctxt>5, NULL);
+				    $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -1540,7 +1637,7 @@ sour_data_even_date_sect : OPEN DELIM TAG_DATE mand_line_item
                            { CHECK0 }           
                            CLOSE           
                            { end_element(ELT_SOUR_DATA_EVEN_DATE, PARENT,
-					 $<ctxt>5, NULL);
+					 $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		           }
                          ;
 
@@ -1555,7 +1652,7 @@ sour_data_even_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
                            { CHECK0 }           
                            CLOSE           
                            { end_element(ELT_SOUR_DATA_EVEN_PLAC, PARENT,
-					 $<ctxt>5, NULL);
+					 $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		           }
                          ;
 
@@ -1569,7 +1666,7 @@ sour_data_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
                       { CHECK0 }           
                       CLOSE           
                       { end_element(ELT_SOUR_DATA_AGNC, PARENT,
-				    $<ctxt>5, NULL);
+				    $<ctxt>5, GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -1635,7 +1732,8 @@ sour_abbr_sect : OPEN DELIM TAG_ABBR mand_line_item
                  no_std_subs            
                  { CHECK0 }            
                  CLOSE            
-                 { end_element(ELT_SOUR_ABBR, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SOUR_ABBR, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1691,6 +1789,90 @@ sour_text_sub  : continuation_sub  /* 0:M */
                | no_std_sub
                ;
 
+/* Only for compatibility */
+sour_type_sect : OPEN DELIM TAG_TYPE opt_line_item  
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
+/* Only for compatibility */
+sour_file_sect : OPEN DELIM TAG_FILE opt_line_item  
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
+/* Only for compatibility */
+sour_plac_sect : OPEN DELIM TAG_PLAC opt_line_item  
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
+/* Only for compatibility */
+sour_date_sect : OPEN DELIM TAG_DATE opt_line_item  
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
+/* Only for compatibility */
+sour_medi_sect : OPEN DELIM TAG_MEDI opt_line_item  
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
+/* Only for compatibility */
+sour_page_sect : OPEN DELIM TAG_PAGE opt_line_item  
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
 /*********************************************************************/
 /**** Submission record                                           ****/
 /*********************************************************************/
@@ -1705,7 +1887,7 @@ submis_rec  : OPEN DELIM POINTER DELIM TAG_SUBN
               subn_subs
 	      { CHECK0 }
               CLOSE
-              { end_record(REC_SUBN, $<ctxt>6, NULL); }
+              { end_record(REC_SUBN, $<ctxt>6, GEDCOM_MAKE_NULL(val1)); }
             ;
 
 subn_subs   : /* empty */
@@ -1735,7 +1917,8 @@ subn_subm_sect : OPEN DELIM TAG_SUBM mand_pointer
                  no_std_subs 
                  { CHECK0 } 
                  CLOSE 
-                 { end_element(ELT_SUBN_SUBM, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_SUBM, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1749,7 +1932,8 @@ subn_famf_sect : OPEN DELIM TAG_FAMF mand_line_item
                  no_std_subs             
                  { CHECK0 }             
                  CLOSE             
-                 { end_element(ELT_SUBN_FAMF, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_FAMF, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1763,7 +1947,8 @@ subn_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
                  no_std_subs             
                  { CHECK0 }             
                  CLOSE             
-                 { end_element(ELT_SUBN_TEMP, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_TEMP, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1777,7 +1962,8 @@ subn_ance_sect : OPEN DELIM TAG_ANCE mand_line_item
                  no_std_subs             
                  { CHECK0 }             
                  CLOSE             
-                 { end_element(ELT_SUBN_ANCE, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_ANCE, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1791,7 +1977,8 @@ subn_desc_sect : OPEN DELIM TAG_DESC mand_line_item
                  no_std_subs             
                  { CHECK0 }             
                  CLOSE             
-                 { end_element(ELT_SUBN_DESC, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_DESC, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1805,7 +1992,8 @@ subn_ordi_sect : OPEN DELIM TAG_ORDI mand_line_item
                  no_std_subs             
                  { CHECK0 }             
                  CLOSE             
-                 { end_element(ELT_SUBN_ORDI, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_ORDI, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1819,7 +2007,8 @@ subn_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
                  no_std_subs             
                  { CHECK0 }             
                  CLOSE             
-                 { end_element(ELT_SUBN_RIN, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBN_RIN, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1833,11 +2022,14 @@ 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, $1, $<ctxt>$) }
+	       START(SUBM, $1, $<ctxt>$) }
              subm_subs
 	     { CHECK1(NAME) }
              CLOSE
-             { end_record(REC_SUBM, $<ctxt>6, NULL); }
+             { end_record(REC_SUBM, $<ctxt>6, GEDCOM_MAKE_NULL(val1));
+	       if (compat_mode(C_SUBM_CTRY))
+		 compat_free_ctry_parent_context();
+	     }
            ;
 
 subm_subs  : /* empty */
@@ -1851,6 +2043,9 @@ subm_sub   : subm_name_sect  { OCCUR2(NAME, 1, 1) }
            | subm_rfn_sect  { OCCUR2(RFN, 0, 1) }
            | subm_rin_sect  { OCCUR2(RIN, 0, 1) }
            | change_date_sub  /* 0:1 */
+	   | subm_ctry_sect  { if (!compat_mode(C_SUBM_CTRY))
+	                          INVALID_TAG("CTRY");
+	                       OCCUR2(CTRY, 0, 1) }
            | no_std_sub
            ;
 
@@ -1864,7 +2059,8 @@ subm_name_sect : OPEN DELIM TAG_NAME mand_line_item
                  no_std_subs              
                  { CHECK0 }              
                  CLOSE              
-                 { end_element(ELT_SUBM_NAME, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBM_NAME, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1878,7 +2074,8 @@ subm_lang_sect : OPEN DELIM TAG_LANG mand_line_item
                  no_std_subs              
                  { CHECK0 }              
                  CLOSE              
-                 { end_element(ELT_SUBM_LANG, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBM_LANG, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1892,7 +2089,8 @@ subm_rfn_sect  : OPEN DELIM TAG_RFN mand_line_item
                  no_std_subs              
                  { CHECK0 }              
                  CLOSE              
-                 { end_element(ELT_SUBM_RFN, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBM_RFN, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -1906,10 +2104,24 @@ subm_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
                  no_std_subs              
                  { CHECK0 }              
                  CLOSE              
-                 { end_element(ELT_SUBM_RIN, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUBM_RIN, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
+/* SUBM.CTRY (Only for compatibility) */
+subm_ctry_sect : OPEN DELIM TAG_CTRY opt_line_item
+                 { if (compat_mode(C_SUBM_CTRY)) {
+		     $<ctxt>$ = compat_generate_addr_ctry_start($1, $3, $4);
+                   }
+                 }
+                 CLOSE
+                 { if (compat_mode (C_SUBM_CTRY)) {
+		     compat_generate_addr_ctry_end($<ctxt>5);
+		   }
+                 }
+	       ;
+
 /*********************************************************************/
 /**** Substructures                                               ****/
 /*********************************************************************/
@@ -1925,7 +2137,9 @@ addr_sect   : OPEN DELIM TAG_ADDR mand_line_item
 					 GEDCOM_MAKE_STRING(val1, $4));
 	        reset_buffer(&concat_buffer);
 		safe_buf_append(&concat_buffer, $4);
-	        START(ADDR, $1, $<ctxt>$)  
+	        START(ADDR, $1, $<ctxt>$);
+		if (compat_mode(C_SUBM_CTRY))
+		  compat_save_ctry_parent_context($<ctxt>$);
               }
               addr_subs
 	      { CHECK0 }
@@ -1954,14 +2168,15 @@ 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));
-		   safe_buf_append(&concat_buffer, "\n");
+		   SAFE_BUF_ADDCHAR(&concat_buffer, '\n');
 		   safe_buf_append(&concat_buffer, $4);
 		   START(CONT, $1, $<ctxt>$)               
                  }               
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_CONT, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_CONT, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item              
@@ -1973,7 +2188,8 @@ addr_adr1_sect : OPEN DELIM TAG_ADR1 mand_line_item
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_ADR1, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_ADR1, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item              
@@ -1985,7 +2201,8 @@ addr_adr2_sect : OPEN DELIM TAG_ADR2 mand_line_item
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_ADR2, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_ADR2, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 addr_city_sect : OPEN DELIM TAG_CITY mand_line_item              
@@ -1997,7 +2214,8 @@ addr_city_sect : OPEN DELIM TAG_CITY mand_line_item
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_CITY, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_CITY, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item              
@@ -2009,7 +2227,8 @@ addr_stae_sect : OPEN DELIM TAG_STAE mand_line_item
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_STAE, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_STAE, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 addr_post_sect : OPEN DELIM TAG_POST mand_line_item              
@@ -2021,7 +2240,8 @@ addr_post_sect : OPEN DELIM TAG_POST mand_line_item
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_POST, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_POST, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item              
@@ -2033,7 +2253,8 @@ addr_ctry_sect : OPEN DELIM TAG_CTRY mand_line_item
                  no_std_subs               
                  { CHECK0 }               
                  CLOSE               
-                 { end_element(ELT_SUB_ADDR_CTRY, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ADDR_CTRY, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -2046,7 +2267,8 @@ phon_sect   : OPEN DELIM TAG_PHON mand_line_item
               no_std_subs               
               { CHECK0 }               
               CLOSE               
-              { end_element(ELT_SUB_PHON, PARENT, $<ctxt>5, NULL);
+              { end_element(ELT_SUB_PHON, PARENT, $<ctxt>5,
+			    GEDCOM_MAKE_NULL(val1));
 	      }
             ;
 
@@ -2066,7 +2288,8 @@ asso_sect : OPEN DELIM TAG_ASSO mand_pointer
             asso_subs
 	    { CHECK2(TYPE,RELA) }
             CLOSE 
-            { end_element(ELT_SUB_ASSO, PARENT, $<ctxt>5, NULL);
+            { end_element(ELT_SUB_ASSO, PARENT, $<ctxt>5,
+			  GEDCOM_MAKE_NULL(val1));
 	    }
           ;
 
@@ -2087,7 +2310,8 @@ asso_type_sect : OPEN DELIM TAG_TYPE mand_line_item
                  no_std_subs                
                  { CHECK0 }                
                  CLOSE                
-                 { end_element(ELT_SUB_ASSO_TYPE, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ASSO_TYPE, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -2100,7 +2324,8 @@ asso_rela_sect : OPEN DELIM TAG_RELA mand_line_item
                  no_std_subs                
                  { CHECK0 }                
                  CLOSE                
-                 { end_element(ELT_SUB_ASSO_RELA, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_ASSO_RELA, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -2117,7 +2342,8 @@ change_date_chan_sect : OPEN DELIM TAG_CHAN
                         change_date_chan_subs
 			{ CHECK1(DATE) }
                         CLOSE 
-                        { end_element(ELT_SUB_CHAN, PARENT, $<ctxt>4, NULL);
+                        { end_element(ELT_SUB_CHAN, PARENT, $<ctxt>4,
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 
@@ -2140,7 +2366,7 @@ change_date_date_sect : OPEN DELIM TAG_DATE mand_line_item
 			{ CHECK0 }
                         CLOSE 
 			{ end_element(ELT_SUB_CHAN_DATE, PARENT, $<ctxt>5,
-				      NULL);
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 
@@ -2163,7 +2389,7 @@ change_date_date_time_sect : OPEN DELIM TAG_TIME mand_line_item
                              { CHECK0 } 
                              CLOSE 
                              { end_element(ELT_SUB_CHAN_TIME, PARENT, $<ctxt>5,
-					   NULL);
+					   GEDCOM_MAKE_NULL(val1));
 			     }
                            ;
 
@@ -2183,7 +2409,8 @@ famc_sect : OPEN DELIM TAG_FAMC mand_pointer
             famc_subs
 	    { CHECK0 }
             CLOSE 
-            { end_element(ELT_SUB_FAMC, PARENT, $<ctxt>5, NULL);
+            { end_element(ELT_SUB_FAMC, PARENT, $<ctxt>5,
+			  GEDCOM_MAKE_NULL(val1));
 	    }
           ;
 
@@ -2205,7 +2432,8 @@ famc_pedi_sect : OPEN DELIM TAG_PEDI mand_line_item
                  no_std_subs  
                  { CHECK0 }  
                  CLOSE  
-                 { end_element(ELT_SUB_FAMC_PEDI, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_FAMC_PEDI, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -2214,18 +2442,20 @@ continuation_sub : cont_sect  /* 0:M */
                  | conc_sect  /* 0:M */
                  ;
 
-cont_sect : OPEN DELIM TAG_CONT mand_line_item 
+cont_sect : OPEN DELIM TAG_CONT opt_line_item 
             { $<ctxt>$ = start_element(ELT_SUB_CONT,
 				       PARENT, $1, $3, $4, 
-				       GEDCOM_MAKE_STRING(val1, $4));
-	      safe_buf_append(&concat_buffer, "\n");
-	      safe_buf_append(&concat_buffer, $4);
+				       GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
+	      SAFE_BUF_ADDCHAR(&concat_buffer, '\n');
+	      if (GEDCOM_IS_STRING(&val1))
+	        safe_buf_append(&concat_buffer, $4);
 	      START(CONT, $1, $<ctxt>$)  
             }  
-            no_std_subs  
+            cont_conc_subs  
             { CHECK0 }  
             CLOSE  
-            { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5, NULL);
+            { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5,
+			  GEDCOM_MAKE_NULL(val1));
 	    }
           ;
 
@@ -2233,16 +2463,47 @@ conc_sect : OPEN DELIM TAG_CONC mand_line_item
             { $<ctxt>$ = start_element(ELT_SUB_CONC,
 				       PARENT, $1, $3, $4, 
 				       GEDCOM_MAKE_STRING(val1, $4));
+	      if (compat_mode(C_CONC_NEEDS_SPACE)) {
+		safe_buf_append(&concat_buffer, " ");
+	      }
 	      safe_buf_append(&concat_buffer, $4);
 	      START(CONC, $1, $<ctxt>$)  
             }  
-            no_std_subs  
+            cont_conc_subs  
             { CHECK0 }  
             CLOSE  
-            { end_element(ELT_SUB_CONC, PARENT, $<ctxt>5, NULL);
+            { end_element(ELT_SUB_CONC, PARENT, $<ctxt>5,
+			  GEDCOM_MAKE_NULL(val1));
 	    }
           ; 
 
+cont_conc_subs : /* empty */
+               | cont_conc_subs cont_conc_sub
+               ;
+
+cont_conc_sub  : cont_conc_sour_sect { if (!compat_mode(C_NOTE_CONC_SOUR))
+	                                 INVALID_TAG("SOUR");
+	                               OCCUR2(SOUR, 0, 1) } 
+               | no_std_sub
+	       ;
+
+/* Only for compatibility */
+cont_conc_sour_sect : OPEN DELIM TAG_SOUR DELIM POINTER
+                      { if (compat_mode(C_NOTE_CONC_SOUR)) {
+		          $<ctxt>$
+			    = compat_generate_note_sour_start(GRANDPARENT(1),
+							      $1, $3, $5);
+			  if ($<ctxt>$ == (void*)-1) HANDLE_ERROR;
+                        }
+                      }
+                      no_std_subs
+                      CLOSE
+                      { if (compat_mode(C_NOTE_CONC_SOUR)) {
+		          compat_generate_note_sour_end($<ctxt>6);
+		        }
+                      }
+	              ;
+
 /* EVENT DETAIL */
 event_detail_sub : event_detail_type_sect  { OCCUR2(TYPE, 0, 1) }
                  | event_detail_date_sect  { OCCUR2(DATE, 0, 1) }
@@ -2267,7 +2528,7 @@ event_detail_type_sect : OPEN DELIM TAG_TYPE mand_line_item
                          { CHECK0 }  
                          CLOSE  
                          { end_element(ELT_SUB_EVT_TYPE, PARENT, $<ctxt>5,
-				       NULL);
+				       GEDCOM_MAKE_NULL(val1));
 			 }
                        ;
 event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item 
@@ -2282,7 +2543,7 @@ event_detail_date_sect : OPEN DELIM TAG_DATE mand_line_item
                          { CHECK0 }  
                          CLOSE  
                          { end_element(ELT_SUB_EVT_DATE, PARENT, $<ctxt>5,
-				       NULL);
+				       GEDCOM_MAKE_NULL(val1));
 			 }
                        ;
 event_detail_age_sect  : OPEN DELIM TAG_AGE mand_line_item 
@@ -2297,7 +2558,7 @@ event_detail_age_sect  : OPEN DELIM TAG_AGE mand_line_item
                          { CHECK0 }  
                          CLOSE  
                          { end_element(ELT_SUB_EVT_AGE, PARENT, $<ctxt>5,
-				       NULL);
+				       GEDCOM_MAKE_NULL(val1));
 			 }
                        ;
 event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item 
@@ -2311,7 +2572,7 @@ event_detail_agnc_sect : OPEN DELIM TAG_AGNC mand_line_item
                          { CHECK0 }  
                          CLOSE  
                          { end_element(ELT_SUB_EVT_AGNC, PARENT, $<ctxt>5,
-				       NULL);
+				       GEDCOM_MAKE_NULL(val1));
 			 }
                        ;
 event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item 
@@ -2325,7 +2586,7 @@ event_detail_caus_sect : OPEN DELIM TAG_CAUS mand_line_item
                          { CHECK0 }  
                          CLOSE  
                          { end_element(ELT_SUB_EVT_CAUS, PARENT, $<ctxt>5,
-				       NULL);
+				       GEDCOM_MAKE_NULL(val1));
 			 }
                        ;
 
@@ -2344,7 +2605,8 @@ fam_event_sect : OPEN DELIM fam_event_tag opt_value
                  fam_event_subs
                  { CHECK0 }
                  CLOSE 
-                 { end_element(ELT_SUB_FAM_EVT, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_FAM_EVT, PARENT, $<ctxt>5,
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -2380,7 +2642,7 @@ fam_even_husb_sect : OPEN DELIM TAG_HUSB
 		     { CHECK1(AGE) }
                      CLOSE 
                      { end_element(ELT_SUB_FAM_EVT_HUSB, PARENT, $<ctxt>4,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 
@@ -2403,7 +2665,7 @@ fam_even_age_sect : OPEN DELIM TAG_AGE mand_line_item
                     { CHECK0 }   
                     CLOSE   
                     { end_element(ELT_SUB_FAM_EVT_AGE, PARENT, $<ctxt>5,
-				  NULL);
+				  GEDCOM_MAKE_NULL(val1));
 		    }
                   ;
 
@@ -2417,7 +2679,7 @@ fam_even_wife_sect : OPEN DELIM TAG_WIFE
 		     { CHECK1(AGE) }
                      CLOSE 
                      { end_element(ELT_SUB_FAM_EVT_WIFE, PARENT, $<ctxt>4,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 
@@ -2431,7 +2693,7 @@ fam_gen_even_sect : OPEN DELIM TAG_EVEN
 		    { CHECK0 }
                     CLOSE 
                     { end_element(ELT_SUB_FAM_EVT_EVEN, PARENT, $<ctxt>4,
-				  NULL);
+				  GEDCOM_MAKE_NULL(val1));
 		    }
                   ;
 
@@ -2460,7 +2722,7 @@ ident_refn_sect : OPEN DELIM TAG_REFN mand_line_item
 		  { CHECK0 }
                   CLOSE  
                   { end_element(ELT_SUB_IDENT_REFN, PARENT, $<ctxt>5,
-				NULL);
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2483,7 +2745,7 @@ ident_refn_type_sect : OPEN DELIM TAG_TYPE mand_line_item
                        { CHECK0 }    
                        CLOSE    
                        { end_element(ELT_SUB_IDENT_REFN_TYPE, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -2497,7 +2759,7 @@ ident_rin_sect  : OPEN DELIM TAG_RIN mand_line_item
                   { CHECK0 }    
                   CLOSE    
                   { end_element(ELT_SUB_IDENT_RIN, PARENT, $<ctxt>5,
-				NULL);
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2515,7 +2777,8 @@ indiv_attr_sect : OPEN DELIM indiv_attr_tag mand_line_item
                   indiv_attr_event_subs
                   { CHECK0 }
                   CLOSE
-                  { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>5, NULL);
+                  { end_element(ELT_SUB_INDIV_ATTR, PARENT, $<ctxt>5,
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2542,7 +2805,8 @@ indiv_resi_sect : OPEN DELIM TAG_RESI
                   indiv_attr_event_subs 
 		  { CHECK0 }
                   CLOSE  
-                  { end_element(ELT_SUB_INDIV_RESI, PARENT, $<ctxt>4, NULL);
+                  { end_element(ELT_SUB_INDIV_RESI, PARENT, $<ctxt>4,
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2571,7 +2835,8 @@ indiv_birt_sect : OPEN DELIM indiv_birt_tag opt_value
                   indiv_birt_subs
                   { CHECK0 }
                   CLOSE 
-                  { end_element(ELT_SUB_INDIV_BIRT, PARENT, $<ctxt>5, NULL);
+                  { end_element(ELT_SUB_INDIV_BIRT, PARENT, $<ctxt>5,
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2603,7 +2868,7 @@ indiv_birt_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
                        { CHECK0 } 
                        CLOSE 
                        { end_element(ELT_SUB_INDIV_BIRT_FAMC, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -2617,7 +2882,8 @@ indiv_gen_sect  : OPEN DELIM indiv_gen_tag opt_value
                   indiv_gen_subs
                   { CHECK0 }
                   CLOSE 
-                  { end_element(ELT_SUB_INDIV_GEN, PARENT, $<ctxt>5, NULL);
+                  { end_element(ELT_SUB_INDIV_GEN, PARENT, $<ctxt>5, 
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2659,7 +2925,8 @@ indiv_adop_sect : OPEN DELIM TAG_ADOP opt_value
                   indiv_adop_subs
 		  { CHECK0 }
                   CLOSE 
-                  { end_element(ELT_SUB_INDIV_ADOP, PARENT, $<ctxt>5, NULL);
+                  { end_element(ELT_SUB_INDIV_ADOP, PARENT, $<ctxt>5, 
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2686,7 +2953,7 @@ indiv_adop_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
 		       { CHECK0 }
                        CLOSE 
 		       { end_element(ELT_SUB_INDIV_ADOP_FAMC, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -2708,7 +2975,8 @@ indiv_adop_famc_adop_sect : OPEN DELIM TAG_ADOP mand_line_item
                             { CHECK0 }    
                             CLOSE    
                             { end_element(ELT_SUB_INDIV_ADOP_FAMC_ADOP,
-					  PARENT, $<ctxt>5, NULL);
+					  PARENT, $<ctxt>5, 
+					  GEDCOM_MAKE_NULL(val1));
 			    }
                           ;
 
@@ -2720,7 +2988,8 @@ indiv_even_sect : OPEN DELIM TAG_EVEN
                   indiv_gen_subs
 		  { CHECK0 }
                   CLOSE    
-                  { end_element(ELT_SUB_INDIV_EVEN, PARENT, $<ctxt>4, NULL);
+                  { end_element(ELT_SUB_INDIV_EVEN, PARENT, $<ctxt>4, 
+				GEDCOM_MAKE_NULL(val1));
 		  }
                 ;
 
@@ -2738,7 +3007,8 @@ lio_bapl_sect : OPEN DELIM lio_bapl_tag
                 lio_bapl_subs
                 { CHECK0 }
                 CLOSE 
-                { end_element(ELT_SUB_LIO_BAPL, PARENT, $<ctxt>4, NULL);
+                { end_element(ELT_SUB_LIO_BAPL, PARENT, $<ctxt>4, 
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -2770,7 +3040,7 @@ lio_bapl_stat_sect : OPEN DELIM TAG_STAT mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LIO_BAPL_STAT, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item   
@@ -2784,7 +3054,7 @@ lio_bapl_date_sect : OPEN DELIM TAG_DATE mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LIO_BAPL_DATE, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item   
@@ -2797,7 +3067,7 @@ lio_bapl_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LIO_BAPL_TEMP, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item   
@@ -2810,7 +3080,7 @@ lio_bapl_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LIO_BAPL_PLAC, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 
@@ -2821,9 +3091,14 @@ lio_slgc_sect : OPEN DELIM TAG_SLGC
 		  START(SLGC, $1, $<ctxt>$) 
                 }
                 lio_slgc_subs
-		{ CHECK1(FAMC) }
+                { if (compat_mode(C_NO_SLGC_FAMC) && ! CHK_COND(FAMC))
+		    compat_generate_slgc_famc_link($<ctxt>4);
+		  else CHK(FAMC);
+		  CHECK0;
+		}
                 CLOSE 
-                { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4, NULL);
+                { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4, 
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -2849,7 +3124,7 @@ lio_slgc_famc_sect : OPEN DELIM TAG_FAMC mand_pointer
                      { CHECK0 } 
                      CLOSE 
                      { end_element(ELT_SUB_LIO_SLGC_FAMC, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 
@@ -2865,7 +3140,8 @@ lss_slgs_sect : OPEN DELIM TAG_SLGS
                 lss_slgs_subs
 		{ CHECK0 }
                 CLOSE 
-                { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4, NULL);
+                { end_element(ELT_SUB_LIO_SLGC, PARENT, $<ctxt>4, 
+			      GEDCOM_MAKE_NULL(val1));
 		}
               ;
 
@@ -2892,7 +3168,7 @@ lss_slgs_stat_sect : OPEN DELIM TAG_STAT mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LSS_SLGS_STAT, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item   
@@ -2906,7 +3182,7 @@ lss_slgs_date_sect : OPEN DELIM TAG_DATE mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LSS_SLGS_DATE, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item   
@@ -2919,7 +3195,7 @@ lss_slgs_temp_sect : OPEN DELIM TAG_TEMP mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LSS_SLGS_TEMP, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item   
@@ -2932,7 +3208,7 @@ lss_slgs_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
                      { CHECK0 }    
                      CLOSE    
                      { end_element(ELT_SUB_LSS_SLGS_PLAC, PARENT, $<ctxt>5,
-				   NULL);
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 
@@ -2956,7 +3232,7 @@ multim_obje_link_sect : OPEN DELIM TAG_OBJE DELIM POINTER
                         { CHECK0 }     
                         CLOSE     
                         { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $<ctxt>6,
-				      NULL);
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 
@@ -2970,7 +3246,7 @@ multim_obje_emb_sect : OPEN DELIM TAG_OBJE
 		       { CHECK2(FORM,FILE) }
                        CLOSE 
                        { end_element(ELT_SUB_MULTIM_OBJE, PARENT, $<ctxt>4,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -2996,7 +3272,8 @@ multim_obje_form_sect : OPEN DELIM TAG_FORM mand_line_item
                         { CHECK0 }     
                         CLOSE     
                         { end_element(ELT_SUB_MULTIM_OBJE_FORM,
-				      PARENT, $<ctxt>5, NULL);
+				      PARENT, $<ctxt>5, 
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item    
@@ -3010,7 +3287,8 @@ multim_obje_titl_sect : OPEN DELIM TAG_TITL mand_line_item
                         { CHECK0 }     
                         CLOSE     
                         { end_element(ELT_SUB_MULTIM_OBJE_TITL,
-				      PARENT, $<ctxt>5, NULL);
+				      PARENT, $<ctxt>5, 
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item    
@@ -3024,7 +3302,8 @@ multim_obje_file_sect : OPEN DELIM TAG_FILE mand_line_item
                         { CHECK0 }     
                         CLOSE     
                         { end_element(ELT_SUB_MULTIM_OBJE_FILE,
-				      PARENT, $<ctxt>5, NULL);
+				      PARENT, $<ctxt>5, 
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 
@@ -3047,7 +3326,8 @@ note_struc_link_sect : OPEN DELIM TAG_NOTE DELIM POINTER
                        note_struc_link_subs
 		       { CHECK0 }
                        CLOSE 
-                       { end_element(ELT_SUB_NOTE, PARENT, $<ctxt>6, NULL);
+                       { end_element(ELT_SUB_NOTE, PARENT, $<ctxt>6, 
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3060,14 +3340,19 @@ note_struc_link_sub : source_cit_sub
                     ;
 
 note_struc_emb_sect : OPEN DELIM TAG_NOTE opt_line_item
-                      { $<ctxt>$
+                      { char* str = $4;
+		        if (compat_mode(C_NOTE_TOO_LONG))
+			  str = compat_long_line_get_prefix($4);
+			$<ctxt>$
 			  = start_element(ELT_SUB_NOTE,
-					  PARENT, $1, $3, $4,
-					 GEDCOM_MAKE_NULL_OR_STRING(val1, $4));
+					  PARENT, $1, $3, str,
+					GEDCOM_MAKE_NULL_OR_STRING(val1, str));
 		        reset_buffer(&concat_buffer);
 			if ($4)
 			  safe_buf_append(&concat_buffer, $4);
-		        START(NOTE, $1, $<ctxt>$) 
+		        START(NOTE, $1, $<ctxt>$);
+			if (compat_mode(C_NOTE_TOO_LONG))
+			  compat_long_line_finish($<ctxt>$, $1);
                       }
                       note_struc_emb_subs
 		      { CHECK0 }
@@ -3100,7 +3385,8 @@ pers_name_sect : OPEN DELIM TAG_NAME mand_line_item
                  pers_name_subs
 		 { CHECK0 }
                  CLOSE  
-                 { end_element(ELT_SUB_PERS_NAME, PARENT, $<ctxt>5, NULL);
+                 { end_element(ELT_SUB_PERS_NAME, PARENT, $<ctxt>5, 
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
 
@@ -3129,7 +3415,7 @@ pers_name_npfx_sect : OPEN DELIM TAG_NPFX mand_line_item
                       { CHECK0 }     
                       CLOSE     
                       { end_element(ELT_SUB_PERS_NAME_NPFX, PARENT, $<ctxt>5,
-				    NULL);
+				    GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item    
@@ -3142,7 +3428,7 @@ pers_name_givn_sect : OPEN DELIM TAG_GIVN mand_line_item
                       { CHECK0 }     
                       CLOSE     
                       { end_element(ELT_SUB_PERS_NAME_GIVN, PARENT, $<ctxt>5,
-				    NULL);
+				    GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item    
@@ -3155,7 +3441,7 @@ pers_name_nick_sect : OPEN DELIM TAG_NICK mand_line_item
                       { CHECK0 }     
                       CLOSE     
                       { end_element(ELT_SUB_PERS_NAME_NICK, PARENT, $<ctxt>5,
-				    NULL);
+				    GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item    
@@ -3168,7 +3454,7 @@ pers_name_spfx_sect : OPEN DELIM TAG_SPFX mand_line_item
                       { CHECK0 }     
                       CLOSE     
                       { end_element(ELT_SUB_PERS_NAME_SPFX, PARENT, $<ctxt>5,
-				    NULL);
+				    GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item    
@@ -3181,7 +3467,7 @@ pers_name_surn_sect : OPEN DELIM TAG_SURN mand_line_item
                       { CHECK0 }     
                       CLOSE     
                       { end_element(ELT_SUB_PERS_NAME_SURN, PARENT, $<ctxt>5,
-				    NULL);
+				    GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item    
@@ -3194,7 +3480,7 @@ pers_name_nsfx_sect : OPEN DELIM TAG_NSFX mand_line_item
                       { CHECK0 }     
                       CLOSE     
                       { end_element(ELT_SUB_PERS_NAME_NSFX, PARENT, $<ctxt>5,
-				    NULL);
+				    GEDCOM_MAKE_NULL(val1));
 		      }
                     ;
 
@@ -3212,7 +3498,8 @@ place_struc_plac_sect : OPEN DELIM TAG_PLAC mand_line_item
                         place_struc_plac_subs
 			{ CHECK0 }
                         CLOSE  
-                        { end_element(ELT_SUB_PLAC, PARENT, $<ctxt>5, NULL);
+                        { end_element(ELT_SUB_PLAC, PARENT, $<ctxt>5, 
+				      GEDCOM_MAKE_NULL(val1));
 			}
                       ;
 
@@ -3237,7 +3524,7 @@ place_plac_form_sect : OPEN DELIM TAG_FORM mand_line_item
                        { CHECK0 }     
                        CLOSE     
                        { end_element(ELT_SUB_PLAC_FORM, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3260,7 +3547,8 @@ source_cit_link_sect : OPEN DELIM TAG_SOUR DELIM POINTER
                        source_cit_link_subs
 		       { CHECK0 }
                        CLOSE 
-                       { end_element(ELT_SUB_SOUR, PARENT, $<ctxt>6, NULL);
+                       { end_element(ELT_SUB_SOUR, PARENT, $<ctxt>6, 
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3288,7 +3576,7 @@ source_cit_page_sect : OPEN DELIM TAG_PAGE mand_line_item
                        { CHECK0 }     
                        CLOSE     
                        { end_element(ELT_SUB_SOUR_PAGE, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3303,7 +3591,7 @@ source_cit_even_sect : OPEN DELIM TAG_EVEN mand_line_item
 		       { CHECK0 }
                        CLOSE     
                        { end_element(ELT_SUB_SOUR_EVEN, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3326,7 +3614,8 @@ source_cit_even_role_sect : OPEN DELIM TAG_ROLE mand_line_item
                           { CHECK0 }     
                           CLOSE     
                           { end_element(ELT_SUB_SOUR_EVEN_ROLE,
-					PARENT, $<ctxt>5, NULL);
+					PARENT, $<ctxt>5, 
+					GEDCOM_MAKE_NULL(val1));
 			  }
                           ;
 
@@ -3340,7 +3629,7 @@ source_cit_data_sect : OPEN DELIM TAG_DATA
 		       { CHECK0 }
                        CLOSE 
                        { end_element(ELT_SUB_SOUR_DATA, PARENT, $<ctxt>4,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3365,7 +3654,8 @@ source_cit_data_date_sect : OPEN DELIM TAG_DATE mand_line_item
                             { CHECK0 }     
                             CLOSE     
                             { end_element(ELT_SUB_SOUR_DATA_DATE,
-					  PARENT, $<ctxt>5, NULL);
+					  PARENT, $<ctxt>5, 
+					  GEDCOM_MAKE_NULL(val1));
 			    }
                           ;
 
@@ -3406,7 +3696,7 @@ source_cit_quay_sect : OPEN DELIM TAG_QUAY mand_line_item
                        { CHECK0 }     
                        CLOSE     
                        { end_element(ELT_SUB_SOUR_QUAY, PARENT, $<ctxt>5,
-				     NULL);
+				     GEDCOM_MAKE_NULL(val1));
 		       }
                      ;
 
@@ -3439,22 +3729,42 @@ source_cit_emb_sub : continuation_sub
 
 /* SOURCE REPOSITORY CITATION */
 source_repos_cit_sub : source_repos_repo_sect  { OCCUR2(REPO, 0, 1) }
+                     | source_repos_repo_txt_sect
+                       { if (!compat_mode(C_NONSTD_SOUR_TAGS))
+			   INVALID_TAG("REPO");
+		         OCCUR2(REPO, 0, 1)
+		       }
                      ;
 
-source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer
+/* Only for compatibility */
+source_repos_repo_txt_sect : OPEN DELIM TAG_REPO opt_line_item
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS)) {
+		     $<ctxt>$ =
+		       compat_generate_nonstd_sour_start(PARENT, $1, $3, $4,
+							 &usertag_buffer);
+		   }
+                 }
+                 CLOSE            
+                 { if (compat_mode(C_NONSTD_SOUR_TAGS))
+		     compat_generate_nonstd_sour_end(PARENT, $<ctxt>5);
+		 }
+               ;
+
+source_repos_repo_sect : OPEN DELIM TAG_REPO DELIM POINTER
                          { struct xref_value *xr
-			     = gedcom_parse_xref($4, XREF_USED, XREF_REPO);
-		           if (xr == NULL) HANDLE_ERROR;
+			     = gedcom_parse_xref($5, XREF_USED, XREF_REPO);
+			   if (xr == NULL) HANDLE_ERROR;
 			   $<ctxt>$
 			     = start_element(ELT_SUB_REPO,
-					     PARENT, $1, $3, $4,
+					     PARENT, $1, $3, $5,
 					     GEDCOM_MAKE_XREF_PTR(val1, xr));
-			   START(REPO, $1, $<ctxt>$) 
-                         }
+			   START(REPO, $1, $<ctxt>$);
+			 }
                          source_repos_repo_subs
 			 { CHECK0 }
                          CLOSE 
-                         { end_element(ELT_SUB_REPO, PARENT, $<ctxt>5, NULL);
+                         { end_element(ELT_SUB_REPO, PARENT, $<ctxt>6, 
+				       GEDCOM_MAKE_NULL(val1));
 			 }
                        ;
 
@@ -3476,7 +3786,8 @@ caln_sect : OPEN DELIM TAG_CALN mand_line_item
             caln_subs
 	    { CHECK0 }
             CLOSE  
-	    { end_element(ELT_SUB_REPO_CALN, PARENT, $<ctxt>5, NULL);
+	    { end_element(ELT_SUB_REPO_CALN, PARENT, $<ctxt>5, 
+			  GEDCOM_MAKE_NULL(val1));
 	    }
           ;
 
@@ -3497,7 +3808,8 @@ caln_medi_sect : OPEN DELIM TAG_MEDI mand_line_item
 		 no_std_subs   
 		 { CHECK0 }   
 		 CLOSE   
-		 { end_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $<ctxt>5, NULL);
+		 { end_element(ELT_SUB_REPO_CALN_MEDI, PARENT, $<ctxt>5, 
+			       GEDCOM_MAKE_NULL(val1));
 		 }
                ;
  
@@ -3518,7 +3830,8 @@ spou_fam_fams_sect : OPEN DELIM TAG_FAMS mand_pointer
                      spou_fam_fams_subs
 		     { CHECK0 }
                      CLOSE 
-                     { end_element(ELT_SUB_FAMS, PARENT, $<ctxt>5, NULL);
+                     { end_element(ELT_SUB_FAMS, PARENT, $<ctxt>5, 
+				   GEDCOM_MAKE_NULL(val1));
 		     }
                    ;
 
@@ -3552,9 +3865,18 @@ no_std_rec  : user_rec /* 0:M */
 
 user_rec    : OPEN DELIM opt_xref USERTAG
               { if ($4.string[0] != '_') {
-		  gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
-			       $4);
-		  YYERROR;
+		  if ((compat_mode(C_551_TAGS)
+		       && compat_check_551_tag($4.string, &usertag_buffer))
+		      ||
+		      (compat_mode(C_NONSTD_SOUR_TAGS)
+		       && compat_check_sour_tag($4.string, &usertag_buffer))) {
+		    $4.string = get_buf_string(&usertag_buffer);
+		  }
+		  else {		  
+		    gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
+				 $4);
+		    YYERROR;
+		  }
 	        }
 	      }
               opt_value
@@ -3572,13 +3894,26 @@ user_rec    : OPEN DELIM opt_xref USERTAG
 	      user_sects
               { CHECK0 }
 	      CLOSE
-              { end_record(REC_USER, $<ctxt>7, NULL); }
+              { end_record(REC_USER, $<ctxt>7, GEDCOM_MAKE_NULL(val1)); }
             ;
 user_sect   : OPEN DELIM opt_xref USERTAG
               { if ($4.string[0] != '_') {
-		  gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
-			       $4);
-		  YYERROR;
+		  if ((compat_mode(C_551_TAGS)
+		       && compat_check_551_tag($4.string, &usertag_buffer))
+		      ||
+		      (compat_mode(C_SUBM_COMM)
+		       && compat_check_subm_comm($4.string, get_parenttag(0),
+						 &usertag_buffer))
+		      ||
+		      (compat_mode(C_NONSTD_SOUR_TAGS)
+		       && compat_check_sour_tag($4.string, &usertag_buffer))) {
+		    $4.string = get_buf_string(&usertag_buffer);
+		  }
+		  else {
+		    gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
+				 $4);
+		    YYERROR;
+		  }
 	        }
 	      }
               opt_value
@@ -3588,12 +3923,23 @@ user_sect   : OPEN DELIM opt_xref USERTAG
 	      user_sects
               { CHECK0 }
 	      CLOSE
-              { end_element(ELT_USER, PARENT, $<ctxt>7, NULL);
+              { end_element(ELT_USER, PARENT, $<ctxt>7, 
+			    GEDCOM_MAKE_NULL(val1));
+	        if (compat_mode(C_SUBM_COMM))
+	          compat_close_subm_comm();
 	      }
             ;
 
 user_sects   : /* empty */     { }
             | user_sects user_sect { }
+            | user_sects gen_sect
+              { if (compat_mode(C_SUBM_COMM)) {
+                }
+	        else {
+		  gedcom_error(_("Standard tag not allowed in user section"));
+		  YYERROR;
+		}
+	      }
             ;
 
 opt_xref    : /* empty */        { $$ = NULL; }
@@ -3617,10 +3963,9 @@ mand_pointer : /* empty */ { gedcom_error(_("Missing pointer")); YYERROR; }
              ;
 
 mand_line_item : /* empty */
-                 { if (compat_mode(C_LIFELINES)) {
-                     /* Lifelines tends to not care about mandatory values */
-		     gedcom_debug_print("==Val: ==");
-		     $$ = "";
+                 { if (compat_mode(C_NO_REQUIRED_VALUES)) {
+                     gedcom_debug_print("==Val: ==");
+		     $$ = VALUE_IF_MISSING;
 		   }
 		   else {
 		     gedcom_error(_("Missing value")); YYERROR;
@@ -3636,38 +3981,36 @@ opt_line_item : /* empty */     { $$ = NULL; }
               ;
 
 line_item   : anychar  { size_t i;
-		         CLEAR_BUFFER(line_item_buf);
-			 line_item_buf_ptr = line_item_buf;
-			 /* The following also takes care of '@@' */
+                         reset_buffer(&line_item_buffer); 
+		         /* The following also takes care of '@@' */
 			 if (!strncmp($1, "@@", 3))
-			   *line_item_buf_ptr++ = '@';
+			   SAFE_BUF_ADDCHAR(&line_item_buffer, '@')
 			 else
 			   for (i=0; i < strlen($1); i++)
-			     *line_item_buf_ptr++ = $1[i];
-			 $$ = line_item_buf;
+			     SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i])
+			 $$ = get_buf_string(&line_item_buffer);
                        }
             | ESCAPE   { size_t i;
-                         CLEAR_BUFFER(line_item_buf);
-	                 line_item_buf_ptr = line_item_buf;
-			 for (i=0; i < strlen($1); i++)
-			   *line_item_buf_ptr++ = $1[i];
-			 $$ = line_item_buf;
+                         reset_buffer(&line_item_buffer); 
+		         for (i=0; i < strlen($1); i++)
+			   SAFE_BUF_ADDCHAR(&line_item_buffer, $1[i])
+			 $$ = get_buf_string(&line_item_buffer);
 	               }
             | line_item anychar
                   { size_t i;
 		    /* The following also takes care of '@@' */
 		    if (!strncmp($2, "@@", 3))
-		      *line_item_buf_ptr++ = '@';
+		      SAFE_BUF_ADDCHAR(&line_item_buffer, '@')
 		    else
 		      for (i=0; i < strlen($2); i++)
-			*line_item_buf_ptr++ = $2[i];
-		    $$ = line_item_buf;
+			SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i])
+		    $$ = get_buf_string(&line_item_buffer);
 		  }
             | line_item ESCAPE
                   { size_t i;
 		    for (i=0; i < strlen($2); i++)
-		      *line_item_buf_ptr++ = $2[i];
-		    $$ = line_item_buf;
+		      SAFE_BUF_ADDCHAR(&line_item_buffer, $2[i])
+		    $$ = get_buf_string(&line_item_buffer);
 		  }
             | line_item error anychar { HANDLE_ERROR; }
             | line_item error ESCAPE  { HANDLE_ERROR; }
@@ -3685,9 +4028,23 @@ error_sect  : OPEN DELIM opt_xref anytag opt_value error_subs CLOSE { }
             ;
 
 gen_sect    : OPEN DELIM opt_xref anystdtag
-              { INVALID_TAG($4.string); }
-              opt_value opt_sects CLOSE
-              { }
+              { if (compat_mode(C_SUBM_COMM)
+		    && compat_check_subm_comm_cont($4.string)) {
+		  /* Will pass here */
+		}
+	        else {
+		  INVALID_TAG($4.string);
+		}
+	      }
+              opt_value
+              { if (compat_mode(C_SUBM_COMM)) {
+		  $<ctxt>$ = compat_subm_comm_cont_start(PARENT, $6);
+                }
+	      }
+	      opt_sects CLOSE
+              { if (compat_mode(C_SUBM_COMM))
+		  compat_subm_comm_cont_end(PARENT, $<ctxt>7);
+	      }
             ;
 
 gen_rec : gen_rec_top
@@ -3864,7 +4221,7 @@ Gedcom_ctxt ctxt_stack[MAXGEDCLEVEL+1];
 void push_countarray(int level)
 {
   int *count = NULL;
-  gedcom_debug_print("Push Count level: %d, level: %d\n", count_level, level);
+  gedcom_debug_print("Push Count level: %d, level: %d", count_level, level);
   if (count_level != level + 1) {
     gedcom_error(_("Internal error: count level mismatch"));
     exit(1);
@@ -3874,7 +4231,7 @@ void push_countarray(int level)
     exit(1);
   }
   else {
-    gedcom_debug_print("calloc countarray %d\n", count_level);
+    gedcom_debug_print("calloc countarray %d", count_level);
     count = (int *)calloc(YYNTOKENS, sizeof(int));
     if (count == NULL) {
       gedcom_error(_("Internal error: count array calloc error"));
@@ -3921,14 +4278,14 @@ int check_occurrence(int tag)
 void pop_countarray()
 {
   int *count;
-  gedcom_debug_print("Pop Count level: %d\n", count_level);
+  gedcom_debug_print("Pop Count level: %d", 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);
+    gedcom_debug_print("free countarray %d", count_level);
     free(count);
     count_arrays[count_level] = NULL;
   }
@@ -3936,7 +4293,7 @@ void pop_countarray()
 
 void clean_up()
 {
-  gedcom_debug_print("Cleanup countarrays\n");
+  gedcom_debug_print("Cleanup countarrays");
   while (count_level > 0) {
     pop_countarray();
     --count_level;
@@ -3948,6 +4305,16 @@ void cleanup_concat_buffer()
   cleanup_buffer(&concat_buffer);
 }
 
+void cleanup_line_item_buffer()
+{
+  cleanup_buffer(&line_item_buffer);
+}
+
+void cleanup_usertag_buffer()
+{
+  cleanup_buffer(&usertag_buffer);
+}
+
 /* Enabling debug mode */
 /* level 0: no debugging */
 /* level 1: only internal */