dlugolecki.net.pl
projects / gedcom-parse.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Compatibility with Personal Ancestral File.
[gedcom-parse.git] / gedcom / gedcom.y
diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 2f2e0a4acf7ebda10644c0077950e3482fcb414e..4a131b04a6718da38792cdd6af3dbdad1a4395bb 100644 (file)
--- 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);
@@ -175,9 +180,6 @@ int  count_tag(int tag);
 int  check_occurrence(int tag);
 void clean_up(); 
 
-#define CLEAR_BUFFER(BUF)                                                     \
-     memset(BUF, 0, sizeof(BUF));
- 
 #define HANDLE_ERROR                                                          \
      { if (error_mechanism == IMMED_FAIL) {                                   \
         clean_up(); YYABORT;                                                 \
@@ -212,7 +214,9 @@ void clean_up();
                      #TAG, parenttag);                                       \
          HANDLE_ERROR;                                                        \
        }                                                                      \
-     } 
+     }
+#define CHK_COND(TAG)                                                         \
+     check_occurrence(TAG_##TAG)
 #define POP                                                                   \
      { pop_countarray();                                                      \
        --count_level;                                                         \
@@ -446,22 +450,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 +479,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) }
@@ -499,7 +505,8 @@ head_sour_sect : OPEN DELIM TAG_SOUR mand_line_item
                  head_sour_subs
                  { CHECK0 }
                 CLOSE
-                 { end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5, NULL); }
+                 { end_element(ELT_HEAD_SOUR, PARENT, $<ctxt>5,
+                              GEDCOM_MAKE_NULL(val1)); }
                ;
 
 head_sour_subs : /* empty */
@@ -523,7 +530,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 +543,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 +556,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 +578,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 +603,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 +618,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 +634,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));
                 }
                ;
 
@@ -641,7 +650,7 @@ head_date_sect : OPEN DELIM TAG_DATE mand_line_item
                 { CHECK0 }
                  CLOSE
                  { end_element(ELT_HEAD_DATE,
-                              PARENT, $<ctxt>5, NULL);
+                              PARENT, $<ctxt>5, GEDCOM_MAKE_NULL(val1));
                 }
                ;
 
@@ -663,11 +672,11 @@ 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) */
+/* HEAD.TIME (Only for 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"));
@@ -688,7 +697,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 +714,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 +727,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 +741,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 */
@@ -744,7 +755,8 @@ head_gedc_sect : OPEN DELIM TAG_GEDC
                  head_gedc_subs
                 { CHECK2(VERS, FORM) }
                  CLOSE
-                 { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4, NULL);
+                 { end_element(ELT_HEAD_GEDC, PARENT, $<ctxt>4,
+                              GEDCOM_MAKE_NULL(val1));
                 }
                ;
 
@@ -766,7 +778,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 +791,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 +808,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 +830,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 +844,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 +858,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 +880,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 +932,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 +967,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 +985,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 +1003,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 +1018,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 +1036,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 +1055,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 +1085,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 +1101,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 +1116,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 +1134,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 +1152,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 +1170,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 +1188,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 +1203,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 +1218,31 @@ 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>$);
+                     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);
+                     end_element(ELT_SUB_ADDR, par, $<ctxt>5,
+                                 GEDCOM_MAKE_NULL(val1));
                      CHECK0;
                      compat_generate_resi_end(PARENT, par);
                    } 
@@ -1237,7 +1269,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 +1287,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 +1314,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 +1329,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 +1340,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 +1370,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 +1387,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,7 +1414,7 @@ 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 {
@@ -1417,7 +1451,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 +1476,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 +1495,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 */
@@ -1491,7 +1526,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 +1551,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 +1576,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 +1591,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 +1605,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 +1671,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));
                 }
                ;
 
@@ -1705,7 +1742,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 +1772,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 +1787,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 +1802,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 +1817,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 +1832,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 +1847,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 +1862,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));
                 }
                ;
 
@@ -1837,7 +1881,7 @@ submit_rec : OPEN DELIM POINTER DELIM TAG_SUBM
              subm_subs
             { CHECK1(NAME) }
              CLOSE
-             { end_record(REC_SUBM, $<ctxt>6, NULL); }
+             { end_record(REC_SUBM, $<ctxt>6, GEDCOM_MAKE_NULL(val1)); }
            ;
 
 subm_subs  : /* empty */
@@ -1864,7 +1908,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 +1923,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 +1938,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,7 +1953,8 @@ 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));
                 }
                ;
 
@@ -1954,14 +2002,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 +2022,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 +2035,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 +2048,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 +2061,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 +2074,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 +2087,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 +2101,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 +2122,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 +2144,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 +2158,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 +2176,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 +2200,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 +2223,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 +2243,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 +2266,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));
                 }
                ;
 
@@ -2218,14 +2280,15 @@ cont_sect : OPEN DELIM TAG_CONT mand_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_ADDCHAR(&concat_buffer, '\n');
              safe_buf_append(&concat_buffer, $4);
              START(CONT, $1, $<ctxt>$)  
             }  
             no_std_subs  
             { CHECK0 }  
             CLOSE  
-            { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5, NULL);
+            { end_element(ELT_SUB_CONT, PARENT, $<ctxt>5,
+                         GEDCOM_MAKE_NULL(val1));
            }
           ;
 
@@ -2239,7 +2302,8 @@ conc_sect : OPEN DELIM TAG_CONC mand_line_item
             no_std_subs  
             { CHECK0 }  
             CLOSE  
-            { end_element(ELT_SUB_CONC, PARENT, $<ctxt>5, NULL);
+            { end_element(ELT_SUB_CONC, PARENT, $<ctxt>5,
+                         GEDCOM_MAKE_NULL(val1));
            }
           ; 
 
@@ -2267,7 +2331,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 +2346,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 +2361,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 +2375,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 +2389,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 +2408,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 +2445,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 +2468,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 +2482,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 +2496,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 +2525,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 +2548,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 +2562,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 +2580,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 +2608,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 +2638,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 +2671,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 +2685,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 +2728,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 +2756,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 +2778,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 +2791,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 +2810,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 +2843,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 +2857,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 +2870,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 +2883,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 +2894,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 +2927,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 +2943,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 +2971,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 +2985,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 +2998,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 +3011,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 +3035,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 +3049,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 +3075,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 +3090,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 +3105,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 +3129,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));
                       }
                      ;
 
@@ -3100,7 +3183,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 +3213,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 +3226,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 +3239,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 +3252,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 +3265,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 +3278,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 +3296,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 +3322,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 +3345,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 +3374,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 +3389,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 +3412,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 +3427,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 +3452,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 +3494,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));
                       }
                      ;
 
@@ -3454,7 +3542,8 @@ source_repos_repo_sect : OPEN DELIM TAG_REPO mand_pointer
                          source_repos_repo_subs
                         { CHECK0 }
                          CLOSE 
-                         { end_element(ELT_SUB_REPO, PARENT, $<ctxt>5, NULL);
+                         { end_element(ELT_SUB_REPO, PARENT, $<ctxt>5, 
+                                      GEDCOM_MAKE_NULL(val1));
                         }
                        ;
 
@@ -3476,7 +3565,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 +3587,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 +3609,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 +3644,15 @@ 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)) {
+                   $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 +3670,19 @@ 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)) {
+                   $4.string = get_buf_string(&usertag_buffer);
+                 }
+                 else {
+                   gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
+                                $4);
+                   YYERROR;
+                 }
                }
              }
               opt_value
@@ -3588,7 +3692,8 @@ 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));
              }
             ;
 
@@ -3617,9 +3722,8 @@ 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: ==");
                     $$ = "";
                   }
                   else {
@@ -3636,38 +3740,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; }
@@ -3948,6 +4050,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 */
Git mirror of gedcom-parse library from: http://sourceforge.net/projects/gedcom-parse/