From b72a3f330d7c32623de98a2f891194650eeededf Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Tue, 22 Jul 2025 21:56:19 -0400
Subject: [PATCH 1/3] Use Pure ODD, rather than Schematron, to constrain
 content of content model elements

---
 P5/Source/Specs/alternate.xml  | 19 +++++++++----------
 P5/Source/Specs/interleave.xml |  9 +--------
 P5/Source/Specs/sequence.xml   | 12 ++----------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml
index 3ea1baf232..29f202d028 100644
--- a/P5/Source/Specs/alternate.xml
+++ b/P5/Source/Specs/alternate.xml
@@ -10,18 +10,17 @@
     <memberOf key="model.contentPart"/>
   </classes>
   <content>
-    <alternate minOccurs="1" maxOccurs="unbounded">
-      <elementRef key="valList"/>
-      <classRef key="model.contentPart"/>
+    <alternate minOccurs="1" maxOccurs="1">
+      <sequence minOccurs="1" maxOccurs="1">
+        <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
+        <elementRef key="valList" minOccurs="0" maxOccurs="1"/>
+      </sequence>
+      <sequence minOccurs="1" maxOccurs="1">
+        <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
+        <classRef key="model.contentPart" minOccurs="0" maxOccurs="unbounded"/>
+      </sequence>
     </alternate>
   </content>
-  <constraintSpec ident="alternatechilden" scheme="schematron" xml:lang="en">
-    <constraint>
-      <sch:rule context="tei:alternate">
-        <sch:assert test="count(*) gt 1">The alternate element must have at least two child elements</sch:assert>
-      </sch:rule>
-    </constraint>
-  </constraintSpec>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:id="gi-alternate-egXML-eg" xml:lang="en" source="#UND"><content>
       <alternate>
diff --git a/P5/Source/Specs/interleave.xml b/P5/Source/Specs/interleave.xml
index 9b4a19ebca..560e9d2eb4 100644
--- a/P5/Source/Specs/interleave.xml
+++ b/P5/Source/Specs/interleave.xml
@@ -9,15 +9,8 @@
     <memberOf key="model.contentPart"/>
   </classes>
   <content>
-    <classRef key="model.contentPart" maxOccurs="unbounded"/>
+    <classRef key="model.contentPart" minOccurs="2" maxOccurs="unbounded"/>
   </content>
-  <constraintSpec ident="interleavechilden" scheme="schematron" xml:lang="en">
-    <constraint>
-      <sch:rule context="tei:interleave">
-        <sch:assert test="count(*) gt 1">The interleave element must have at least two child elements</sch:assert>
-      </sch:rule>
-    </constraint>
-  </constraintSpec>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en" source="#UND">
       <content>
diff --git a/P5/Source/Specs/sequence.xml b/P5/Source/Specs/sequence.xml
index 3be9a76267..5942b4a08d 100644
--- a/P5/Source/Specs/sequence.xml
+++ b/P5/Source/Specs/sequence.xml
@@ -9,20 +9,12 @@
     <memberOf key="model.contentPart"/>
   </classes>
   <content>
-    <classRef key="model.contentPart" maxOccurs="unbounded"/>
+    <classRef key="model.contentPart" minOccurs="2" maxOccurs="unbounded"/>
   </content>
-  <constraintSpec ident="sequencechilden" scheme="schematron" xml:lang="en">
-    <constraint>
-      <sch:rule context="tei:sequence">
-        <sch:assert test="count(*) gt 1">The sequence element must have at least two child elements</sch:assert>
-      </sch:rule>
-    </constraint>
-  </constraintSpec>
   <attList>
     <attDef ident="preserveOrder" validUntil="2026-06-15">
       <desc type="deprecationInfo" versionDate="2024-03-15" xml:lang="en">The <att>preserveOrder</att> on <gi>sequence</gi> has been deprecated. The <gi>interleave</gi> element should be used to denote unordered constructs.</desc>
-      <desc xml:lang="en" versionDate="2023-03-21">if false, indicates that
-      component elements of a sequence may occur in any order.</desc>
+      <desc xml:lang="en" versionDate="2023-03-21">if false, indicates that component elements of a sequence may occur in any order.</desc>
       <datatype><dataRef key="teidata.truthValue"/></datatype>
     </attDef>
   </attList>

From 95045c22cbb7c8cdaea4fa2c80bb44d270398365 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Tue, 22 Jul 2025 23:05:57 -0400
Subject: [PATCH 2/3] =?UTF-8?q?Ooops=20=E2=80=94=20forgot=20that=20alterna?=
 =?UTF-8?q?te=20element=20must=20have=202+=20children?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 P5/Source/Specs/alternate.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml
index 29f202d028..bc96d69d33 100644
--- a/P5/Source/Specs/alternate.xml
+++ b/P5/Source/Specs/alternate.xml
@@ -12,12 +12,18 @@
   <content>
     <alternate minOccurs="1" maxOccurs="1">
       <sequence minOccurs="1" maxOccurs="1">
-        <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
-        <elementRef key="valList" minOccurs="0" maxOccurs="1"/>
+        <classRef key="model.contentPart" minOccurs="1" maxOccurs="1"/>
+	<alternate minOccurs="1" maxOccurs="1">
+	  <sequence minOccurs="1" maxOccurs="1">
+            <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>	  
+	    <elementRef key="valList" minOccurs="0" maxOccurs="1"/>
+	  </sequence>
+	  <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
+	</alternate>
       </sequence>
       <sequence minOccurs="1" maxOccurs="1">
-        <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
-        <classRef key="model.contentPart" minOccurs="0" maxOccurs="unbounded"/>
+	<elementRef key="valList" minOccurs="1" maxOccurs="1"/>
+        <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
       </sequence>
     </alternate>
   </content>

From c99135b4fa06e010d988224265f908ff90e6756f Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 10 Aug 2025 13:37:17 -0400
Subject: [PATCH 3/3] Minor changes that should not effect what is considered
 valid or invalid, but make the content model more readable by humans.

---
 P5/Source/Specs/alternate.xml | 70 ++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 10 deletions(-)

diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml
index bc96d69d33..86933fc913 100644
--- a/P5/Source/Specs/alternate.xml
+++ b/P5/Source/Specs/alternate.xml
@@ -10,20 +10,70 @@
     <memberOf key="model.contentPart"/>
   </classes>
   <content>
+    <!--
+        What we would like to have is
+          <interleave>
+            <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
+            <alternate>
+              <classRef key="model.contentPart" minOccurs="1" maxOccurs="1"/>
+              <elementRef key="valList" minOccurs="0" maxOccurs="1">
+            </alternate>
+          </interleave>
+        OR, equivalently,
+          ( model.contentPart+ & ( model.contentPart | valList? ) )
+        but
+        a) that is not valid in RELAX NG, anyway (because
+           model.contentPart is a member of an interleave
+           more than once); and
+        b) even if it were it probably could not be converted to DTD (or to XSD?)
+           due to ambiguity.   
+
+        So the following mildly complex content model does the same
+        thing without use of <interleave> and in an unambiguous way.
+        (Thus it can be converted to a valid DTD.)
+        Here is a briefly annotated version of the ODD content model
+        that follows, expressed using the RELAX NG compact syntax
+        instead:
+        (
+          ( valList, model.contentPart+ )        # starts with <valList>
+          |                                      # (and is followed by %contentPart;s)
+          (                                      # OR
+            model.contentPart,                   # starts with %contentPart;
+            (                                    #   which is followed by
+              valList                            #     <valList>
+              |                                  #     or
+              ( model.contentPart+, valList? )   #     more %contentPart;s and maybe a <valList>
+            )
+          )
+        )
+    -->
     <alternate minOccurs="1" maxOccurs="1">
+      <!--
+          Two possible sets of children: my content either starts with
+          <valList> or with a member of model.contentPart.
+      -->
       <sequence minOccurs="1" maxOccurs="1">
-        <classRef key="model.contentPart" minOccurs="1" maxOccurs="1"/>
-	<alternate minOccurs="1" maxOccurs="1">
-	  <sequence minOccurs="1" maxOccurs="1">
-            <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>	  
-	    <elementRef key="valList" minOccurs="0" maxOccurs="1"/>
-	  </sequence>
-	  <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
-	</alternate>
+        <!-- Content starts with <valList> is simple: a single
+             <valList> followed by one or more members of
+             model.contentPart: -->
+        <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
+        <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
       </sequence>
       <sequence minOccurs="1" maxOccurs="1">
-	<elementRef key="valList" minOccurs="1" maxOccurs="1"/>
-        <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
+        <!-- Content starts with a member of model.contentPart is not
+             as simple: after the single initial member of
+             model.contentPart we could either have just a <valList>
+             (for a total of 2 children) or we could have an
+             additional one or more members of model.contentPart,
+             optionally followed by a <valList>. -->
+        <classRef key="model.contentPart" minOccurs="1" maxOccurs="1"/>
+        <alternate minOccurs="1" maxOccurs="1">
+          <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
+          <sequence minOccurs="1" maxOccurs="1">
+            <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>       
+            <elementRef key="valList" minOccurs="0" maxOccurs="1"/>
+          </sequence>
+        </alternate>
       </sequence>
     </alternate>
   </content>