From 522e84e35eab9b115ad955574f3912217a153fbb Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Fri, 6 Oct 2023 21:44:50 -0400
Subject: [PATCH 1/5] 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.)

---
 Test/expected-results/test.rng             |   6 +-
 Test/expected-results/test15.odd.rnc       |   6 +-
 Test/expected-results/test21.odd.rnc       |   6 +-
 Test/expected-results/test30.rnc           |   6 +-
 Test/expected-results/test33.rnc           |   6 +-
 Test/expected-results/test34.rnc           |   6 +-
 Test/expected-results/test35.rnc           |   6 +-
 Test2/expected-results/testAttValQuant.rng |   6 +-
 Test2/expected-results/testPure1.rng       |   6 +-
 odds/odd2relax.xsl                         | 152 +++++++++++++--------
 odds/teiodds.xsl                           |  15 +-
 11 files changed, 135 insertions(+), 86 deletions(-)

diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index e2a2bd35c..f116905e0 100644
--- 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
index 5d8dbe21e..a2844a2ba 100644
--- 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
index 33cd31fbd..22a44fbb8 100644
--- 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
index 0af31fc7c..d323bc7bd 100644
--- 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
index e7a452db1..7fabe7167 100644
--- 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
index 2749ee8b6..56f28e374 100644
--- 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
index cfba7812e..78716f919 100644
--- 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
index eb6be5e95..06c3c24f9 100644
--- 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
index 97bb0a7ec..59e5fb99a 100644
--- 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"/>
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index fc425c21a..bb23356d9 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -27,7 +27,7 @@
 Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
 
 2. http://www.opensource.org/licenses/BSD-2-Clause
-		
+                
 
 
 Redistribution and use in source and binary forms, with or without
@@ -73,12 +73,12 @@ of this software, even if advised of the possibility of such damage.
   <xsl:param name="splitLevel">-1</xsl:param>
   <xsl:variable name="oddmode">dtd</xsl:variable>
   <xsl:variable name="filesuffix"/>
-   <!-- get list of output files -->
+  <!-- get list of output files -->
   <xsl:variable name="linkColor"/>
   <xsl:template match="tei:moduleSpec[@type='decls']"/>
   <xsl:template match="/">
     <xsl:variable name="resolvedClassatts">
-      <xsl:apply-templates  mode="classatts"/>
+      <xsl:apply-templates mode="classatts"/>
     </xsl:variable>
     <xsl:for-each select="$resolvedClassatts">
       <xsl:choose>
@@ -220,9 +220,26 @@ of this software, even if advised of the possibility of such damage.
         </root>
       </xsl:for-each>
     </xsl:variable>
-    <xsl:for-each select="$pass2/root">
-      <xsl:apply-templates mode="pass3"/>
-    </xsl:for-each>
+    <xsl:variable name="pass3">
+      <xsl:for-each select="$pass2/root">
+        <xsl:apply-templates mode="pass3"/>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:sequence select="$pass3"/>
+    <!--
+      <!-\- debugging output: -\->
+    <a:documentation> ========= above is pass3, next is pass2 ========= </a:documentation>
+    <rng:div xml:id="pass2">
+      <xsl:copy-of select="$pass2"/>
+    </rng:div>
+    <a:documentation> ========= above is pass2, next is pass1 ========= </a:documentation>
+    <rng:div xml:id="pass1">
+      <xsl:copy-of select="$pass1"/>
+    </rng:div>
+    <a:documentation> ========= above is pass1, next is input ========= </a:documentation>
+    <rng:div xml:id="pass0">
+      <xsl:copy-of select="/*"/>
+    </rng:div> -->
   </xsl:template>
 
   <xsl:template match="tei:moduleSpec">
@@ -242,7 +259,7 @@ of this software, even if advised of the possibility of such damage.
                            <xsl:text>Schema generated </xsl:text>
                            <xsl:sequence select="tei:whatsTheDate()"/>
                            <xsl:call-template name="makeTEIVersion"/>
-			   <xsl:call-template name="copyright"/>
+                           <xsl:call-template name="copyright"/>
                            <xsl:sequence select="tei:makeDescription(., true(), true())"/>
                         </xsl:comment>
                         <xsl:call-template name="moduleSpec-body"/>
@@ -299,7 +316,7 @@ of this software, even if advised of the possibility of such damage.
     <xsl:for-each select="key('MacroModule',@ident)">
       <xsl:choose>
         <xsl:when test="@predeclare='true'"/>
-        <!--	<xsl:when test="key('PredeclareMacros',@ident)"/>-->
+        <!--    <xsl:when test="key('PredeclareMacros',@ident)"/>-->
         <xsl:otherwise>
           <xsl:apply-templates mode="tangle" select="."/>
         </xsl:otherwise>
@@ -309,9 +326,9 @@ of this software, even if advised of the possibility of such damage.
 
   <xsl:template name="copyright">
     <xsl:for-each
-	select="/tei:TEI/tei:teiHeader/tei:fileDesc/tei:publicationStmt/tei:availability">
+        select="/tei:TEI/tei:teiHeader/tei:fileDesc/tei:publicationStmt/tei:availability">
       <xsl:if test="count(tei:licence)&gt;1">
-	<xsl:text>This material is dual-licensed.&#10;</xsl:text>
+        <xsl:text>This material is dual-licensed.&#10;</xsl:text>
       </xsl:if>
       <xsl:apply-templates/>
     </xsl:for-each>
@@ -327,14 +344,20 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
 
   <xsl:template name="NameList">
-<!-- walk over all the elementSpec elements and make list of 
-       elements -->
+    <!-- walk over all the elementSpec elements and make list of 
+         elements -->
     <xsl:for-each select="key('ELEMENTDOCS',1)">
-         <xsl:sort select="@ident"/>
-         <define xmlns="http://relaxng.org/ns/structure/1.0" combine="choice" name="{@ident}">
-            <notAllowed/>
-         </define>
-      </xsl:for-each>
+      <xsl:sort select="@ident"/>
+      <xsl:if test="@ident ne 'anyElement'">
+        <!-- Don't auto-generate a defition for an <anyElement>, those
+             definitions will be created when we actually hit
+             <anyElement> elements, as the @name of the <define> is
+             modified to be unique. -->
+        <define xmlns="http://relaxng.org/ns/structure/1.0" combine="choice" name="{@ident}">
+          <notAllowed/>
+        </define>
+      </xsl:if>
+    </xsl:for-each>
   </xsl:template>
 
   <xsl:template name="predeclare-classes">
@@ -357,7 +380,10 @@ of this software, even if advised of the possibility of such damage.
     <xsl:variable name="apos">'</xsl:variable>
     <xsl:variable name="spec" select="ancestor::tei:elementSpec|ancestor::tei:macroSpec"/>
     <xsl:variable name="current" select="."/>
-    <xsl:variable name="id" select="concat('anyElement-',$spec/@ident)"/>
+    <xsl:variable name="disambiguator" as="xs:string">
+      <xsl:number level="any" format="{$anyElement_disambiguator_format}"/>
+    </xsl:variable>
+    <xsl:variable name="id" select="concat('anyElement_', $spec/@ident, $disambiguator )"/>
     <xsl:variable name="exclude">
       <xsl:choose>
         <xsl:when test="@exclude"><xsl:value-of select="@exclude"/></xsl:when>
@@ -404,8 +430,9 @@ of this software, even if advised of the possibility of such damage.
         </zeroOrMore>
       </element>
       <xsl:if test="@require and ancestor::tei:elementSpec">
-        <xsl:variable name="ns"><xsl:if
-          test="ancestor::tei:content//tei:*">, 'http://www.tei-c.org/ns/1.0'</xsl:if></xsl:variable>
+        <xsl:variable name="ns">
+          <xsl:if test="ancestor::tei:content//tei:*">, 'http://www.tei-c.org/ns/1.0'</xsl:if>
+        </xsl:variable>
         <xsl:variable name="computed-prefix">
           <xsl:for-each select="in-scope-prefixes($current)">
             <xsl:if test="$spec/@ns = namespace-uri-for-prefix(., $current)">
@@ -477,38 +504,32 @@ of this software, even if advised of the possibility of such damage.
 
 <!-- pass 2, clean up unused elements -->
   <xsl:template  match="rng:anyName[parent::rng:define]"
-		 mode='pass2'>
+                 mode='pass2'>
     <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
       <choice>
-	<xsl:for-each select="key('EDEF',1)">	  
-	  <ref name="{@name}"/>
-	</xsl:for-each>
+        <xsl:for-each select="key('EDEF',1)">     
+          <ref name="{@name}"/>
+        </xsl:for-each>
       </choice>
     </zeroOrMore>
   </xsl:template>
 
-  <xsl:template match="processing-instruction()" mode="pass2">
+  <xsl:template match="@*|text()|comment()|processing-instruction()" mode="pass2">
     <xsl:copy-of select="."/>
   </xsl:template>
-
-  <xsl:template match="@*|text()|comment()" mode="pass2">
-      <xsl:copy-of select="."/>
-  </xsl:template>
     
   <xsl:template match="*" mode="pass2">
-      <xsl:copy>
-         <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass2"/>
-      </xsl:copy>
+    <xsl:copy>
+      <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass2"/>
+    </xsl:copy>
   </xsl:template>
 
   <xsl:template match="rng:define" mode="pass2">
     <xsl:choose>
-      <xsl:when test="key('REFED',@name) or 
-        key('REFED',substring-after(@name,$generalPrefix))">
+      <xsl:when test="key('REFED',@name) or key('REFED',substring-after(@name,$generalPrefix))">
         <define xmlns="http://relaxng.org/ns/structure/1.0" >
           <xsl:apply-templates  select="@*"    mode="pass2"/>
-          <xsl:apply-templates  select="*|processing-instruction()|comment()|text()"
-            mode="pass2"/>
+          <xsl:apply-templates  select="*|processing-instruction()|comment()|text()" mode="pass2"/>
         </define>
       </xsl:when>
       <xsl:otherwise>
@@ -520,11 +541,28 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
   
   <xsl:template match="rng:ref" mode="pass2">
+    <xsl:if test="$verbose eq 'true'  and  contains(@name,'anyElement')">
+      <!-- This entire <if> (defined by line above) is DEBUGging for 631, should not be pushed -->
+      <xsl:if test="@n">
+        <xsl:message select="'DEBUG: pass2 is checking ref name='||@name||' n='||@n"/>
+      </xsl:if>
+      <xsl:if test="not(@n)">
+        <xsl:message select="'DEBUG: where did this ref name='||@name||' come from?'"/>
+        <xsl:message>
+          <xsl:copy-of select="../.."/>
+        </xsl:message>
+      </xsl:if>
+      <xsl:message>debug: pass2 has: </xsl:message>
+      <xsl:for-each select="//rng:define/@name">
+        <xsl:message select="'   '||.||' has '||count( key('DEFED',.))"/>
+      </xsl:for-each>
+    </xsl:if>
     <xsl:choose>
       <xsl:when test="parent::rng:choice/parent::rng:start">
         <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{@name}"/>
       </xsl:when>
       <xsl:when test="key('DEFED',@name)">
+        <!-- THIS ONE is the <ref> that is supposed to be working for anyElement #631 -->
         <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{@name}"/>
       </xsl:when>
       <xsl:when test="ancestor::tei:content[@autoPrefix='false']">
@@ -550,20 +588,20 @@ of this software, even if advised of the possibility of such damage.
     <xsl:element name="{name()}" namespace="http://relaxng.org/ns/structure/1.0">
       <xsl:apply-templates  select="@*"  mode="pass3"/>
       <xsl:variable name="Contents">
-	<xsl:apply-templates  select="*|processing-instruction()|comment()|text()"
-			      mode="pass3"/>
+        <xsl:apply-templates  select="*|processing-instruction()|comment()|text()"
+                              mode="pass3"/>
       </xsl:variable>
       <xsl:choose>
-	<xsl:when test="$Contents//rng:text or $Contents//rng:ref or
-			$Contents//rng:anyName or
-			$Contents//rng:attribute or
-			$Contents//rng:data or $Contents//rng:name or $Contents//rng:value">
-	  <xsl:copy-of select="$Contents"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:copy-of select="$Contents/a:*"/>
-	  <rng:empty/>
-	</xsl:otherwise>
+        <xsl:when test="$Contents//rng:text or $Contents//rng:ref or
+                        $Contents//rng:anyName or
+                        $Contents//rng:attribute or
+                        $Contents//rng:data or $Contents//rng:name or $Contents//rng:value">
+          <xsl:copy-of select="$Contents"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:copy-of select="$Contents/a:*"/>
+          <rng:empty/>
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:element>
   </xsl:template>
@@ -585,7 +623,7 @@ of this software, even if advised of the possibility of such damage.
         </xsl:if>
         <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
       </xsl:otherwise>
-    </xsl:choose>			   
+    </xsl:choose>                          
   </xsl:template>
 
   <xsl:template match="rng:optional|rng:zeroOrMore|rng:oneOrMore"
@@ -626,7 +664,7 @@ of this software, even if advised of the possibility of such damage.
             mode="pass3"/>
         </xsl:element>
       </xsl:otherwise>
-    </xsl:choose>			   
+    </xsl:choose>                          
   </xsl:template>
 
   <xsl:template match="processing-instruction()" mode="pass3">
@@ -650,13 +688,13 @@ of this software, even if advised of the possibility of such damage.
     prefix -->
     <choice xmlns="http://relaxng.org/ns/structure/1.0">
       <xsl:for-each select="rng:ref">
-	  <xsl:variable name="name" select="if (key('DEFED',@name))
-	    then @name
-	    else if (key('DEFED',concat($generalPrefix,@name))) then
-	    concat($generalPrefix,@name) else ''"/>
-	    <xsl:if test="not($name='')">
-	      <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$name}"/>
-	    </xsl:if>
+          <xsl:variable name="name" select="if (key('DEFED',@name))
+            then @name
+            else if (key('DEFED',concat($generalPrefix,@name))) then
+            concat($generalPrefix,@name) else ''"/>
+            <xsl:if test="not($name='')">
+              <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$name}"/>
+            </xsl:if>
       </xsl:for-each>
     </choice>
   </xsl:template>
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 6990b6ae7..38f5ee9d9 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -190,6 +190,13 @@ of this software, even if advised of the possibility of such damage.
     </xsl:choose>
   </xsl:variable>
 
+  <xsl:variable name="anyElement_disambiguator_format" as="xs:string">
+    <!-- A string used as the xsl:number/@format to append to pattern names for <anyElement>s (thus to disambiguate them) -->
+    <xsl:variable name="zeroes" as="xs:string+">
+      <xsl:for-each select="1 to ( count( //tei:anyElement ) => xs:string() => string-length() )">0</xsl:for-each>
+    </xsl:variable>
+    <xsl:value-of select="'_'||$zeroes"/>
+  </xsl:variable>
 
   <xsl:template match="processing-instruction()" mode="#default tangle">
     <xsl:choose>
@@ -328,15 +335,19 @@ of this software, even if advised of the possibility of such damage.
   
   <xsl:template match="tei:anyElement" mode="tangle">
     <xsl:variable name="spec" select="ancestor::tei:elementSpec|ancestor::tei:macroSpec"/>
+    <xsl:variable name="disambiguator" as="xs:string">
+      <xsl:number level="any" format="{$anyElement_disambiguator_format}"/>
+    </xsl:variable>
+    <xsl:variable name="id" select="concat('anyElement_', $spec/@ident, $disambiguator )"/>
     <!-- "owe" = occurence wrapper element -->
     <xsl:variable name="owe" select="tei:generateIndicators(@minOccurs,@maxOccurs)"/>
     <xsl:choose>
       <xsl:when test="string-length($owe) eq 0">
-        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{concat('anyElement-',$spec/@ident)}"/>
+        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$id}"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="{$owe}" namespace="http://relaxng.org/ns/structure/1.0">
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{concat('anyElement-',$spec/@ident)}"/>
+          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$id}"/>
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>

From e5caa3f89b3a34e606715ebf30b61ff035e2caa4 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Fri, 6 Oct 2023 21:58:45 -0400
Subject: [PATCH 2/5] remove some debugging code

---
 odds/odd2relax.xsl | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index bb23356d9..7233e1e30 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -541,22 +541,6 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
   
   <xsl:template match="rng:ref" mode="pass2">
-    <xsl:if test="$verbose eq 'true'  and  contains(@name,'anyElement')">
-      <!-- This entire <if> (defined by line above) is DEBUGging for 631, should not be pushed -->
-      <xsl:if test="@n">
-        <xsl:message select="'DEBUG: pass2 is checking ref name='||@name||' n='||@n"/>
-      </xsl:if>
-      <xsl:if test="not(@n)">
-        <xsl:message select="'DEBUG: where did this ref name='||@name||' come from?'"/>
-        <xsl:message>
-          <xsl:copy-of select="../.."/>
-        </xsl:message>
-      </xsl:if>
-      <xsl:message>debug: pass2 has: </xsl:message>
-      <xsl:for-each select="//rng:define/@name">
-        <xsl:message select="'   '||.||' has '||count( key('DEFED',.))"/>
-      </xsl:for-each>
-    </xsl:if>
     <xsl:choose>
       <xsl:when test="parent::rng:choice/parent::rng:start">
         <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{@name}"/>

From f8f0e4491d646339cc69b885cf890cf1776508d0 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sat, 7 Oct 2023 20:15:04 -0400
Subject: [PATCH 3/5] Add a test with 2 <anyElement> elements.

---
 Test2/expected-results/testPure1.rng |  63 +++-
 Test2/inputFiles/testPure1.odd       | 419 ++++++++++++++-------------
 2 files changed, 271 insertions(+), 211 deletions(-)

diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 59e5fb99a..34ad63e53 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -70,7 +70,7 @@
          </choice>
       </zeroOrMore>
    </define>
-   <define name="anyElement_xenoData_1">
+   <define name="anyElement_address_1">
       <element>
          <anyName>
             <except>
@@ -86,7 +86,56 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement_xenoData_1"/>
+               <ref name="anyElement_address_1"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e22519-constraint">
+         <rule context="tei:address">
+            <report test="descendant::*[not(namespace-uri(.) =               ('https://docbook.org/ns/docbook', 'http://www.tei-c.org/ns/1.0'))]">address descendants must be in the
+              namespaces
+              'https://docbook.org/ns/docbook', 'http://www.tei-c.org/ns/1.0'</report>
+         </rule>
+      </pattern>
+   </define>
+   <define name="anyElement_address_2">
+      <element>
+         <anyName>
+            <except>
+               <nsName ns="http://www.tei-c.org/ns/1.0"/>
+               <name ns="http://www.tei-c.org/ns/Examples">egXML</name>
+            </except>
+         </anyName>
+         <zeroOrMore>
+            <attribute>
+               <anyName/>
+            </attribute>
+         </zeroOrMore>
+         <zeroOrMore>
+            <choice>
+               <text/>
+               <ref name="anyElement_address_2"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement_xenoData_3">
+      <element>
+         <anyName>
+            <except>
+               <nsName ns="http://www.tei-c.org/ns/1.0"/>
+               <name ns="http://www.tei-c.org/ns/Examples">egXML</name>
+            </except>
+         </anyName>
+         <zeroOrMore>
+            <attribute>
+               <anyName/>
+            </attribute>
+         </zeroOrMore>
+         <zeroOrMore>
+            <choice>
+               <text/>
+               <ref name="anyElement_xenoData_3"/>
             </choice>
          </zeroOrMore>
       </element>
@@ -4506,15 +4555,11 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
       <element name="address">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(address) contains a postal address, for example of a publisher, an organization, or an individual. [3.6.2. Addresses 2.2.4. Publication, Distribution, Licensing, etc. 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
          <group>
-            <zeroOrMore>
-               <ref name="t_model.global"/>
-            </zeroOrMore>
+            <ref name="anyElement_address_1"/>
             <oneOrMore>
                <group>
                   <ref name="t_model.addrPart"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
+                  <ref name="anyElement_address_2"/>
                </group>
             </oneOrMore>
          </group>
@@ -7019,7 +7064,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_1"/>
+            <ref name="anyElement_xenoData_3"/>
          </choice>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declarable.attributes"/>
diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd
index e80d5ca43..36e135e89 100644
--- a/Test2/inputFiles/testPure1.odd
+++ b/Test2/inputFiles/testPure1.odd
@@ -1,33 +1,35 @@
-<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_customization.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?><?xml-model href="http://www.tei-c.org/release/xml/tei/Exemplars/tei_customization.isosch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?><TEI xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+<?xml-model href="http://www.tei-c.org/release/xml/tei/custom/schema/relaxng/tei_customization.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
+<?xml-model href="http://www.tei-c.org/release/xml/tei/Exemplars/tei_customization.isosch" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
+<TEI xmlns:sch="http://purl.oclc.org/dsdl/schematron"
      xmlns:rng="http://relaxng.org/ns/structure/1.0"
      xmlns="http://www.tei-c.org/ns/1.0"
      xml:lang="en"
      n="testPure1">
   <teiHeader>
-      <fileDesc>
-         <titleStmt>
-            <title>Test TEI Customization using Pure ODD</title>
-            <author>Martin Holmes</author>
-            <author>Syd Bauman</author>
-         </titleStmt>
-         <publicationStmt>
-            <p>Free for anyone for anything</p>
-         </publicationStmt>
-         <sourceDesc>
-            <p>Authored from scratch</p>
-         </sourceDesc>
-      </fileDesc>
+    <fileDesc>
+      <titleStmt>
+        <title>Test TEI Customization using Pure ODD</title>
+        <author>Martin Holmes</author>
+        <author>Syd Bauman</author>
+      </titleStmt>
+      <publicationStmt>
+        <p>Free for anyone for anything</p>
+      </publicationStmt>
+      <sourceDesc>
+        <p>Authored from scratch</p>
+      </sourceDesc>
+    </fileDesc>
   </teiHeader>
   <text>
-      <body>
-	<p>Here is the TEI badge:
-	<graphic url="http://www.tei-c.org/wp-content/uploads/2016/11/I-use-TEI.png">
-	  <desc>The TEI Badge</desc>
-	</graphic>. It is here to test <gi>desc</gi> in <gi>graphic</gi> in an ODD per
-	<ptr target="https://github.com/TEIC/Stylesheets/issues/444"/>.
-	</p>
-         <schemaSpec start="TEI div" ident="testPure1" prefix="t_">
-            <desc>This file is intended as input for a conversion to
+    <body>
+      <p>Here is the TEI badge:
+      <graphic url="http://www.tei-c.org/wp-content/uploads/2016/11/I-use-TEI.png">
+        <desc>The TEI Badge</desc>
+        </graphic>. It is here to test <gi>desc</gi> in <gi>graphic</gi> in an ODD per
+        <ptr target="https://github.com/TEIC/Stylesheets/issues/444"/>.
+      </p>
+      <schemaSpec start="TEI div" ident="testPure1" prefix="t_">
+        <desc>This file is intended as input for a conversion to
         RNG and Schematron (and possibly other outputs) as part 
         of the modular Stylesheets test process. No source is 
         specified here, because the source p5subset.xml is controlled
@@ -39,212 +41,225 @@
         compliant schemas (for the most severe definition of 
         <soCalled>TEI-compliant</soCalled>).</desc>
         
-            <moduleRef key="tei"/>        
-            <moduleRef key="header"/>
-            <moduleRef key="core"/>
-            <moduleRef key="analysis"/>
-            <moduleRef key="linking"/>
+        <moduleRef key="tei"/>        
+        <moduleRef key="header"/>
+        <moduleRef key="core"/>
+        <moduleRef key="analysis"/>
+        <moduleRef key="linking"/>
         
         
-            <moduleRef key="textstructure" except="div1 div2 div3 div4 div5 div6 div7"/>
+        <moduleRef key="textstructure" except="div1 div2 div3 div4 div5 div6 div7"/>
         
         
-            <moduleRef key="namesdates" include="persName placeName orgName"/>
+        <moduleRef key="namesdates" include="persName placeName orgName"/>
         
         
-	           <elementRef key="gi"/>
-	           <elementRef key="att"/>
-	           <elementRef key="val"/>
+        <elementRef key="gi"/>
+        <elementRef key="att"/>
+        <elementRef key="val"/>
 
-	
-	           <elementSpec module="linking" ident="join" mode="delete"/>
-	           <elementSpec module="linking" ident="joinGrp" mode="delete"/>
+        
+        <elementSpec module="linking" ident="join" mode="delete"/>
+        <elementSpec module="linking" ident="joinGrp" mode="delete"/>
 
         
-            <classSpec ident="att.lexicographic" mode="delete" type="atts"/>
+        <classSpec ident="att.lexicographic" mode="delete" type="atts"/>
 
         
-            <classSpec ident="att.datable.custom" mode="delete" type="atts"/>
-            <classSpec ident="att.datable.iso" mode="delete" type="atts"/>
+        <classSpec ident="att.datable.custom" mode="delete" type="atts"/>
+        <classSpec ident="att.datable.iso" mode="delete" type="atts"/>
 
         
-            <classSpec ident="att.typed" type="atts" mode="change">
-               <attList>
-                  <attDef ident="subtype" mode="delete"/>
-               </attList>
-            </classSpec>
+        <classSpec ident="att.typed" type="atts" mode="change">
+          <attList>
+            <attDef ident="subtype" mode="delete"/>
+          </attList>
+        </classSpec>
 
         
-            <classSpec ident="att.global.linking" type="atts" mode="change">
-               <attList>
-	                 <attDef ident="synch" mode="delete"/>
-               </attList>
-            </classSpec>
+        <classSpec ident="att.global.linking" type="atts" mode="change">
+          <attList>
+            <attDef ident="synch" mode="delete"/>
+          </attList>
+        </classSpec>
 
         
-            <elementSpec module="core" ident="list" mode="change">
-               <classes mode="change">
-                  <memberOf key="att.typed" mode="delete"/>
-               </classes>
-            </elementSpec>
- 
-        
-            <elementSpec module="core" ident="note" mode="change">
-               <attList>
-                  <attDef ident="anchored" mode="delete"/>
-               </attList>
-            </elementSpec>
+        <elementSpec module="core" ident="list" mode="change">
+          <classes mode="change">
+            <memberOf key="att.typed" mode="delete"/>
+          </classes>
+        </elementSpec>
+        
+        
+        <elementSpec module="core" ident="note" mode="change">
+          <attList>
+            <attDef ident="anchored" mode="delete"/>
+          </attList>
+        </elementSpec>
 
         
-            <elementSpec ident="title" mode="change" module="core">
-               <attList>
-                  <attDef ident="type" mode="replace">
-                     <datatype>
-                        <dataRef key="teidata.enumerated"/>
-                     </datatype>
-                     <valList type="closed">
-                        <valItem ident="LP">
-                           <gloss>long playing</gloss>
-                           <desc>12-inch vinyl</desc>
-                        </valItem>
-                        <valItem ident="single"/>
-                        <valItem ident="eightTrack"/>
-                        <valItem ident="cassette"/>
-                        <valItem ident="CD">
-                           <gloss>compact disc</gloss>
-                        </valItem>
-                        <valItem ident="VCRtape"/>
-                        <valItem ident="DVD"/>
-                        <valItem ident="blueRay"/>
-                     </valList>
-                  </attDef>
-               </attList>
-            </elementSpec>
+        <elementSpec ident="title" mode="change" module="core">
+          <attList>
+            <attDef ident="type" mode="replace">
+              <datatype>
+                <dataRef key="teidata.enumerated"/>
+              </datatype>
+              <valList type="closed">
+                <valItem ident="LP">
+                  <gloss>long playing</gloss>
+                  <desc>12-inch vinyl</desc>
+                </valItem>
+                <valItem ident="single"/>
+                <valItem ident="eightTrack"/>
+                <valItem ident="cassette"/>
+                <valItem ident="CD">
+                  <gloss>compact disc</gloss>
+                </valItem>
+                <valItem ident="VCRtape"/>
+                <valItem ident="DVD"/>
+                <valItem ident="blueRay"/>
+              </valList>
+            </attDef>
+          </attList>
+        </elementSpec>
 
-	
-	           <?TEI winita?>
+        
+        <?TEI winita?>
 
-	
-	           <elementSpec ident="measureGrp" mode="change" module="core">
-	              <attList>
-	                 <attDef mode="change" ident="corresp">
-	                    <datatype minOccurs="1" maxOccurs="1">
-		                      <dataRef key="teidata.count"/>
-	                    </datatype>
-	                 </attDef>
-	                 <attDef mode="change" ident="select">
-	                    <datatype minOccurs="1" maxOccurs="1">
-		                      <dataRef name="nonNegativeInteger"/>
-	                    </datatype>
-	                 </attDef>
-	                <!-- Council is currently divided on whether referencing a datatype using @key
-	                       should be allowed or not; it's currently not allowed. -->
-	                 <!--<attDef mode="change" ident="sameAs">
-	                    <datatype minOccurs="1" maxOccurs="1">
-		                      <dataRef key="teidata.count" restriction="[0-9][0-9]?"/>
-	                    </datatype>
-	                 </attDef>-->
-	                 <attDef mode="change" ident="copyOf">
-	                    <datatype minOccurs="1" maxOccurs="1">
-		                      <dataRef name="nonNegativeInteger" restriction="[0-9][0-9]?"/>
-	                    </datatype>
-	                 </attDef>
-	              </attList>
-	           </elementSpec>		
+        
+        <elementSpec ident="measureGrp" mode="change" module="core">
+          <attList>
+            <attDef mode="change" ident="corresp">
+              <datatype minOccurs="1" maxOccurs="1">
+                <dataRef key="teidata.count"/>
+              </datatype>
+            </attDef>
+            <attDef mode="change" ident="select">
+              <datatype minOccurs="1" maxOccurs="1">
+                <dataRef name="nonNegativeInteger"/>
+              </datatype>
+            </attDef>
+            <!-- Council is currently divided on whether referencing a datatype using @key
+                 should be allowed or not; it's currently not allowed. -->
+            <!--<attDef mode="change" ident="sameAs">
+                <datatype minOccurs="1" maxOccurs="1">
+                <dataRef key="teidata.count" restriction="[0-9][0-9]?"/>
+                </datatype>
+                </attDef>-->
+            <attDef mode="change" ident="copyOf">
+              <datatype minOccurs="1" maxOccurs="1">
+                <dataRef name="nonNegativeInteger" restriction="[0-9][0-9]?"/>
+              </datatype>
+            </attDef>
+          </attList>
+        </elementSpec>          
 
-	
-	           <elementSpec ident="bibl" mode="change" module="core">
-               <desc>A short bibliographic citation with nothing but author, title, and optional date</desc>
-               <content>
-                  <sequence>
-                     <elementRef key="author" minOccurs="2" maxOccurs="unbounded"/>
-                     <elementRef key="title" minOccurs="1" maxOccurs="8"/>
-	                    <elementRef key="publisher" minOccurs="0" maxOccurs="3"/>
-                     <elementRef key="date" minOccurs="0" maxOccurs="1"/>
-                  </sequence>
-               </content>
-            </elementSpec>
-        
-	
-            <elementSpec ident="biblStruct" module="core" mode="delete"/>
-        
-	
-            <elementSpec ident="w" module="linking" mode="change">
-               <attList>
-                  <attDef ident="ana" mode="change" usage="req"/>
-               </attList>
-            </elementSpec>
+        
+        <elementSpec ident="bibl" mode="change" module="core">
+          <desc>A short bibliographic citation with nothing but author, title, and optional date</desc>
+          <content>
+            <sequence>
+              <elementRef key="author" minOccurs="2" maxOccurs="unbounded"/>
+              <elementRef key="title" minOccurs="1" maxOccurs="8"/>
+              <elementRef key="publisher" minOccurs="0" maxOccurs="3"/>
+              <elementRef key="date" minOccurs="0" maxOccurs="1"/>
+            </sequence>
+          </content>
+        </elementSpec>
+        
+        
+        <elementSpec ident="biblStruct" module="core" mode="delete"/>
+        
+        
+        <elementSpec ident="w" module="linking" mode="change">
+          <attList>
+            <attDef ident="ana" mode="change" usage="req"/>
+          </attList>
+        </elementSpec>
 
-	
-            <elementSpec ident="email" module="core" mode="change">
-               <content>
-                  <valList type="closed">
-                     <valItem ident="amourdecosmos@gmail.com">
-                        <gloss>The email address of Amour de Cosmos.</gloss>
-                     </valItem>
-                     <valItem ident="thevenerablebede@gmail.com">
-                        <gloss>The email address of The Venerable Bede.</gloss>
-                     </valItem>
-                  </valList>
-               </content>
-	              <remarks>
-	                 <p>Our <gi>email</gi> element is only allowed to contain
-	    one of two email addresses, so we try to constrain its
-	    content model using a valList.</p>
-	              </remarks>
-            </elementSpec>
+        
+        <elementSpec ident="email" module="core" mode="change">
+          <content>
+            <valList type="closed">
+              <valItem ident="amourdecosmos@gmail.com">
+                <gloss>The email address of Amour de Cosmos.</gloss>
+              </valItem>
+              <valItem ident="thevenerablebede@gmail.com">
+                <gloss>The email address of The Venerable Bede.</gloss>
+              </valItem>
+            </valList>
+          </content>
+          <remarks>
+            <p>Our <gi>email</gi> element is only allowed to contain
+            one of two email addresses, so we try to constrain its
+            content model using a valList.</p>
+          </remarks>
+        </elementSpec>
 
-	
-	           <elementSpec ident="linkGrp" module="linking" mode="change">
-	              <constraintSpec scheme="schematron" ident="eight_is_enough">
-	                 <constraint>
-	                    <sch:report test="count(*)&gt;8">Too many links!</sch:report>
-	                 </constraint>
-	              </constraintSpec>
-	           </elementSpec>
+        
+        <elementSpec ident="linkGrp" module="linking" mode="change">
+          <constraintSpec scheme="schematron" ident="eight_is_enough">
+            <constraint>
+              <sch:report test="count(*)&gt;8">Too many links!</sch:report>
+            </constraint>
+          </constraintSpec>
+        </elementSpec>
+        
+        <!--elementSpec added by @joeytakeda for #241: Modify choice such that it can have:
             
-            <!--elementSpec added by @joeytakeda for #241: Modify choice such that it can have:
-               
-               * An abbr and expan (in any order, explicitly set by @preserveOrder="false")
-               * A corr and sic (in that specific order, explicitly set by @preserveOrder="true")
-               * An orig and reg (in that specific order, implicitly set by omitting @preserveOrder) 
-               
-               Inspired by the example in TD for sequence and alternate:
-               https://www.tei-c.org/Vault/P5/4.2.2/doc/tei-p5-doc/en/html/TD.html#index-egXML-d53e153603
-            -->
+            * An abbr and expan (in any order, explicitly set by @preserveOrder="false")
+            * A corr and sic (in that specific order, explicitly set by @preserveOrder="true")
+            * An orig and reg (in that specific order, implicitly set by omitting @preserveOrder) 
             
-            <elementSpec ident="choice" module="core" mode="change">
-               <content>
-                  <alternate>
-                     <sequence preserveOrder="false">
-                        <elementRef key="abbr"/>
-                        <elementRef key="expan"/>
-                     </sequence>
-                     <sequence preserveOrder="true">
-                        <elementRef key="corr"/>
-                        <elementRef key="sic"/>
-                     </sequence>
-                     <sequence>
-                        <elementRef key="orig"/>
-                        <elementRef key="reg"/>
-                     </sequence>
-                  </alternate>
-               </content>
-               <remarks>
-                  <p>Our <gi>choice</gi> element is allowed to contain one of the following combinations:
-                  <list>
-                     <item><gi>abbr</gi> and <gi>expan</gi></item>
-                     <item><gi>expan</gi> and <gi>abbr</gi></item>
-                     <item><gi>corr</gi> and <gi>sic</gi></item>
-                     <item><gi>orig</gi> and <gi>reg</gi></item>
-                  </list>
-                  </p>
-               </remarks>
-            </elementSpec>
+            Inspired by the example in TD for sequence and alternate:
+            https://www.tei-c.org/Vault/P5/4.2.2/doc/tei-p5-doc/en/html/TD.html#index-egXML-d53e153603
+        -->
+        
+        <elementSpec ident="choice" module="core" mode="change">
+          <content>
+            <alternate>
+              <sequence preserveOrder="false">
+                <elementRef key="abbr"/>
+                <elementRef key="expan"/>
+              </sequence>
+              <sequence preserveOrder="true">
+                <elementRef key="corr"/>
+                <elementRef key="sic"/>
+              </sequence>
+              <sequence>
+                <elementRef key="orig"/>
+                <elementRef key="reg"/>
+              </sequence>
+            </alternate>
+          </content>
+          <remarks>
+            <p>Our <gi>choice</gi> element is allowed to contain one of the following combinations:
+            <list>
+              <item><gi>abbr</gi> and <gi>expan</gi></item>
+              <item><gi>expan</gi> and <gi>abbr</gi></item>
+              <item><gi>corr</gi> and <gi>sic</gi></item>
+              <item><gi>orig</gi> and <gi>reg</gi></item>
+            </list>
+            </p>
+          </remarks>
+        </elementSpec>
 
-         </schemaSpec>
-      </body>
-      <back>
+        <!-- Change <address> just to test 2+ occurrences of <anyElement> -->
+        <elementSpec ident="address" module="core" mode="change">
+          <content>
+            <sequence>
+              <anyElement require="https://docbook.org/ns/docbook"/>
+              <sequence minOccurs="1" maxOccurs="unbounded">
+                <classRef key="model.addrPart"/>
+                <anyElement except="http://docs.oasis-open.org/legaldocml/ns/akn/3.0"/>
+              </sequence>
+            </sequence>
+          </content>
+        </elementSpec>
+        
+      </schemaSpec>
+    </body>
+    <back>
     </back>
   </text>
 </TEI>

From a7207929f6a62b9792a06b8fe14e5b60432b59c4 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Wed, 25 Oct 2023 20:47:46 -0400
Subject: [PATCH 4/5] Finally add comment to help future maintainers with
 debugging 3-pass RELAX NG pattern reduction code (which I wrote > 2 weeks
 ago).

---
 odds/odd2relax.xsl | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index 7233e1e30..aedd995da 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -225,21 +225,18 @@ of this software, even if advised of the possibility of such damage.
         <xsl:apply-templates mode="pass3"/>
       </xsl:for-each>
     </xsl:variable>
+    <!-- The variable $pass3 is not really needed, but is left here to
+         make it easier to write debugging code. Remember, though,
+         that if you want to see what the intermediate stages look
+         like you cannot use <result-document>, because this template
+         is called from within a variable defintion. You can get
+         around this by outputing each intermediate stage ($pass1 &
+         $pass2) into the output file in addition to the final stage
+         ($pass3). This makes for great debugging, but also for a
+         useless output RELAX NG schema, of course.  You can see a
+         version of this in commit 522e84e from 2023-10-06.
+            — Syd, 2023-10-09 -->
     <xsl:sequence select="$pass3"/>
-    <!--
-      <!-\- debugging output: -\->
-    <a:documentation> ========= above is pass3, next is pass2 ========= </a:documentation>
-    <rng:div xml:id="pass2">
-      <xsl:copy-of select="$pass2"/>
-    </rng:div>
-    <a:documentation> ========= above is pass2, next is pass1 ========= </a:documentation>
-    <rng:div xml:id="pass1">
-      <xsl:copy-of select="$pass1"/>
-    </rng:div>
-    <a:documentation> ========= above is pass1, next is input ========= </a:documentation>
-    <rng:div xml:id="pass0">
-      <xsl:copy-of select="/*"/>
-    </rng:div> -->
   </xsl:template>
 
   <xsl:template match="tei:moduleSpec">

From d0661941bbb4b0fb21d1f014170ee38201651e06 Mon Sep 17 00:00:00 2001
From: helenasabel <helena.b.sabel@gmail.com>
Date: Sat, 28 Oct 2023 10:28:27 +0200
Subject: [PATCH 5/5] updates id that causes tests to fail

---
 Test2/expected-results/testPure1.rng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 64fb32611..1934b7896 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -90,7 +90,7 @@
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e22519-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e22543-constraint">
          <rule context="tei:address">
             <report test="descendant::*[not(namespace-uri(.) =               ('https://docbook.org/ns/docbook', 'http://www.tei-c.org/ns/1.0'))]">address descendants must be in the
               namespaces