Fix #631 (I hope):

Generate a different RELAX NG pattern (and reference to it) for every occurence of an anyElement element, and update tests to match. (Previously we were trying to generate one for every content model in which an anyElement occurred, but were generation one for every content model in which an anyElement element occurred only once.)
TEIC · Oct 7, 2023 · 522e84e · 522e84e
1 parent ce346af
commit 522e84e
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 86 deletions.
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
@@ -68,7 +68,7 @@
       </choice>
     </zeroOrMore>
   </define>
-  <define name="anyElement-xenoData">
+  <define name="anyElement_xenoData_1">
     <element>
       <anyName>
         <except>
@@ -84,7 +84,7 @@
       <zeroOrMore>
         <choice>
           <text/>
-          <ref name="anyElement-xenoData"/>
+          <ref name="anyElement_xenoData_1"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -7277,7 +7277,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]</a:documentation>
       <choice>
         <text/>
-        <ref name="anyElement-xenoData"/>
+        <ref name="anyElement_xenoData_1"/>
       </choice>
       <ref name="att.global.attributes"/>
       <ref name="att.declarable.attributes"/>

diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
@@ -24,10 +24,10 @@ macro.specialPara =
    | model.inter
    | model.divPart
    | model.global)*
-anyElement-xenoData =
+anyElement_xenoData_1 =
   element * - (tei:* | teix:egXML) {
     attribute * { text }*,
-    (text | anyElement-xenoData)*
+    (text | anyElement_xenoData_1)*
   }
 att.anchoring.attributes =
   att.anchoring.attribute.anchored, att.anchoring.attribute.targetEnd
@@ -4589,7 +4589,7 @@ xenoData =
 
   ## (non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]
   element xenoData {
-    (text | anyElement-xenoData),
+    (text | anyElement_xenoData_1),
     att.global.attributes,
     att.declarable.attributes,
     att.typed.attributes,

diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
@@ -25,10 +25,10 @@ macro.specialPara =
    | model.divPart
    | model.global)*
 macro.xtext = (text | model.gLike)*
-anyElement-xenoData =
+anyElement_xenoData_1 =
   element * - (tei:* | teix:egXML) {
     attribute * { text }*,
-    (text | anyElement-xenoData)*
+    (text | anyElement_xenoData_1)*
   }
 att.anchoring.attributes =
   att.anchoring.attribute.anchored, att.anchoring.attribute.targetEnd
@@ -6428,7 +6428,7 @@ xenoData =
 
   ## (non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]
   element xenoData {
-    (text | anyElement-xenoData),
+    (text | anyElement_xenoData_1),
     att.global.attributes,
     att.declarable.attributes,
     att.typed.attributes,

diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
@@ -27,10 +27,10 @@ Tmacro.specialPara =
    | Tmodel.divPart
    | Tmodel.global)*
 Tmacro.xtext = (text | Tmodel.gLike)*
-anyElement-xenoData =
+anyElement_xenoData_1 =
   element * - (tei:* | ns2:* | teix:egXML) {
     attribute * { text }*,
-    (text | anyElement-xenoData)*
+    (text | anyElement_xenoData_1)*
   }
 Tatt.anchoring.attributes =
   Tatt.anchoring.attribute.anchored, Tatt.anchoring.attribute.targetEnd
@@ -5061,7 +5061,7 @@ TxenoData =
 
   ## (non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]
   element xenoData {
-    (text | anyElement-xenoData),
+    (text | anyElement_xenoData_1),
     Tatt.global.attributes,
     Tatt.declarable.attributes,
     Tatt.typed.attributes,

diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
@@ -28,10 +28,10 @@ tei_macro.specialPara =
    | tei_model.inter
    | tei_model.divPart
    | tei_model.global)*
-anyElement-xenoData =
+anyElement_xenoData_1 =
   element * - (tei:* | teix:egXML) {
     attribute * { text }*,
-    (text | anyElement-xenoData)*
+    (text | anyElement_xenoData_1)*
   }
 tei_att.anchoring.attributes =
   tei_att.anchoring.attribute.anchored,
@@ -4817,7 +4817,7 @@ tei_xenoData =
 
   ## (non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]
   element tei:xenoData {
-    (text | anyElement-xenoData),
+    (text | anyElement_xenoData_1),
     tei_att.global.attributes,
     tei_att.declarable.attributes,
     tei_att.typed.attributes,

diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
@@ -29,10 +29,10 @@ tei_macro.specialPara =
    | tei_model.inter
    | tei_model.divPart
    | tei_model.global)*
-anyElement-xenoData =
+anyElement_xenoData_1 =
   element * - (tei:* | teix:egXML) {
     attribute * { text }*,
-    (text | anyElement-xenoData)*
+    (text | anyElement_xenoData_1)*
   }
 tei_att.anchoring.attributes =
   tei_att.anchoring.attribute.anchored,
@@ -4820,7 +4820,7 @@ tei_xenoData =
 
   ## (non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]
   element xenoData {
-    (text | anyElement-xenoData),
+    (text | anyElement_xenoData_1),
     tei_att.global.attributes,
     tei_att.declarable.attributes,
     tei_att.typed.attributes,

diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
@@ -29,10 +29,10 @@ tei_macro.specialPara =
    | tei_model.inter
    | tei_model.divPart
    | tei_model.global)*
-anyElement-xenoData =
+anyElement_xenoData_1 =
   element * - (tei:* | teix:egXML) {
     attribute * { text }*,
-    (text | anyElement-xenoData)*
+    (text | anyElement_xenoData_1)*
   }
 tei_att.anchoring.attributes =
   tei_att.anchoring.attribute.anchored,
@@ -4798,7 +4798,7 @@ tei_xenoData =
 
   ## (non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]
   element tei:xenoData {
-    (text | anyElement-xenoData),
+    (text | anyElement_xenoData_1),
     tei_att.global.attributes,
     tei_att.declarable.attributes,
     tei_att.typed.attributes,

diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
@@ -53,7 +53,7 @@
          </choice>
       </zeroOrMore>
    </define>
-   <define name="anyElement-xenoData">
+   <define name="anyElement_xenoData_1">
       <element>
          <anyName>
             <except>
@@ -69,7 +69,7 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-xenoData"/>
+               <ref name="anyElement_xenoData_1"/>
             </choice>
          </zeroOrMore>
       </element>
@@ -6718,7 +6718,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]</a:documentation>
          <choice>
             <text/>
-            <ref name="anyElement-xenoData"/>
+            <ref name="anyElement_xenoData_1"/>
          </choice>
          <ref name="att.global.attributes"/>
          <ref name="att.declarable.attributes"/>

diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
@@ -70,7 +70,7 @@
          </choice>
       </zeroOrMore>
    </define>
-   <define name="anyElement-xenoData">
+   <define name="anyElement_xenoData_1">
       <element>
          <anyName>
             <except>
@@ -86,7 +86,7 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-xenoData"/>
+               <ref name="anyElement_xenoData_1"/>
             </choice>
          </zeroOrMore>
       </element>
@@ -7019,7 +7019,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(non-TEI metadata) provides a container element into which metadata in non-TEI formats may be placed. [2.5. Non-TEI Metadata]</a:documentation>
          <choice>
             <text/>
-            <ref name="anyElement-xenoData"/>
+            <ref name="anyElement_xenoData_1"/>
          </choice>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declarable.attributes"/>