X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=gedcom%2Fgedcom.y;h=ef95178d08664ece62d34a5cc91a6ced0adb1415;hb=8c5c11bd65273224b6b0b46762a27922602c4c58;hp=0564018e888f004ec6f70c99ece3ab97f543aaf1;hpb=f38264a8dc9d6fbaa514e9f043adaa53c52191f4;p=gedcom-parse.git

diff --git a/gedcom/gedcom.y b/gedcom/gedcom.y
index 0564018..ef95178 100644
--- a/gedcom/gedcom.y
+++ b/gedcom/gedcom.y
@@ -3680,6 +3680,11 @@ user_sect   : OPEN DELIM opt_xref USERTAG
 		      && compat_check_551_tag($4.string, &usertag_buffer)) {
 		    $4.string = get_buf_string(&usertag_buffer);
 		  }
+		  else if (compat_mode(C_SUBM_COMM) &&
+			   compat_check_subm_comm($4.string, get_parenttag(0),
+						  &usertag_buffer)) {
+		    $4.string = get_buf_string(&usertag_buffer);
+		  }
 		  else {
 		    gedcom_error(_("Undefined tag (and not a valid user tag): %s"),
 				 $4);
@@ -3696,11 +3701,21 @@ user_sect   : OPEN DELIM opt_xref USERTAG
 	      CLOSE
               { 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; }
@@ -3789,9 +3804,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