From d63ddcb15bdf74f41b9df4883f682c5687fb93e2 Mon Sep 17 00:00:00 2001
From: Hugh Cayless <hugh.cayless@duke.edu>
Date: Tue, 18 Oct 2022 14:20:52 -0400
Subject: [PATCH 01/50] Check if core props are available.

---
 xlsx/xlsxtotei.xsl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xlsx/xlsxtotei.xsl b/xlsx/xlsxtotei.xsl
index 3ab193cf3..812c701c9 100644
--- a/xlsx/xlsxtotei.xsl
+++ b/xlsx/xlsxtotei.xsl
@@ -101,8 +101,7 @@
     <xsl:variable name="doc"
       select="concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument']/@Target)"/>
     <xsl:variable name="office-document" select="document($doc)"/>
-    <xsl:variable name="core-properties"
-      select="document(concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties']/@Target))/cp:coreProperties"/>
+    <xsl:variable name="core-properties"><xsl:if test="fn:doc-available(concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties']/@Target))"><xsl:sequence select="document(concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties']/@Target))/cp:coreProperties"></xsl:sequence></xsl:if></xsl:variable>
     <!-- Let's make sure this looks like a spreadsheet -->
     <xsl:if test="not($office-document/sml:workbook)">
       <xsl:message terminate="yes">This does not look like an Office OpenXML workbook. The root

From 239a71ef2142beb85a4b1510cec9b5b93b5f63b5 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 1 Oct 2023 16:48:30 -0400
Subject: [PATCH 02/50] Replace tei:minOmaxO() and both
 tei:generateIndicators() functions (one for RELAXNG, one for DTD) with a new
 function, tei:norMinMax(); should be no change to output; passes both Test/
 and Test2/.

---
 odds/odd2dtd.xsl |  34 ++++----------
 odds/teiodds.xsl | 117 +++++++++++++++++++++++++++++------------------
 2 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/odds/odd2dtd.xsl b/odds/odd2dtd.xsl
index 36ab98211..62df4dc82 100644
--- a/odds/odd2dtd.xsl
+++ b/odds/odd2dtd.xsl
@@ -1519,9 +1519,9 @@ of this software, even if advised of the possibility of such damage.
       </xsl:when>
     </xsl:choose>
     <xsl:value-of select="tei:createSpecName(.)"/>
-    <xsl:variable name="datminOmaxO" select="tei:minOmaxO( tei:datatype/@minOccurs, tei:datatype/@maxOccurs )"/>
-    <xsl:variable name="datmin" select="$datminOmaxO[1]"/>
-    <xsl:variable name="datmax" select="$datminOmaxO[2]"/>
+    <xsl:variable name="datNorMinMax" select="tei:norMinMax( tei:datatype )"/>
+    <xsl:variable name="datmin" select="$datNorMinMax[1]"/>
+    <xsl:variable name="datmax" select="$datNorMinMax[2]"/>
     <xsl:choose>
       <xsl:when test="( $datmax gt 1  or  $datmax eq -1 )  and  (
         tei:datatype/rng:ref/@name = ('data.enumerated','data.name')
@@ -1685,9 +1685,9 @@ of this software, even if advised of the possibility of such damage.
   <xsl:template match="tei:elementRef|tei:classRef|tei:macroRef|tei:dataRef[@key]">
     <xsl:variable name="except" select="@except"/>
     <xsl:variable name="include" select="@include"/>
-    <xsl:variable name="minOmaxO" select="tei:minOmaxO( @minOccurs, @maxOccurs )"/>
-    <xsl:variable name="min" select="$minOmaxO[1]"/>
-    <xsl:variable name="max" select="$minOmaxO[2]"/>
+    <xsl:variable name="norMinMax" select="tei:norMinMax(.)"/>
+    <xsl:variable name="min" select="$norMinMax[1]"/>
+    <xsl:variable name="max" select="$norMinMax[2]"/>
     <xsl:variable name="exists">
       <xsl:call-template name="checkClass">
         <xsl:with-param name="id" select="@key"/>
@@ -1854,9 +1854,9 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
   
   <xsl:template match="tei:content/tei:classRef | tei:content//tei:sequence/tei:classRef" mode="preprocess">
-    <xsl:variable name="minOmaxO" select="tei:minOmaxO( @minOccurs, @maxOccurs )"/>
-    <xsl:variable name="min" select="$minOmaxO[1]"/>
-    <xsl:variable name="max" select="$minOmaxO[2]"/>
+    <xsl:variable name="norMinMax" select="tei:norMinMax(.)"/>
+    <xsl:variable name="min" select="$norMinMax[1]"/>
+    <xsl:variable name="max" select="$norMinMax[2]"/>
     <xsl:choose>
       <xsl:when test="$max eq -1">
         <xsl:copy-of select="."/>
@@ -1888,22 +1888,6 @@ of this software, even if advised of the possibility of such damage.
     <xsl:copy-of select="."/>
   </xsl:template>
 
-  <xsl:function name="tei:generateIndicators">
-    <xsl:param name="context"/>
-    <xsl:param name="minOccurs"/>
-    <xsl:param name="maxOccurs"/>
-    <xsl:variable name="minOmaxO" select="tei:minOmaxO( $minOccurs, $maxOccurs )"/>
-    <xsl:variable name="min" select="$minOmaxO[1]"/>
-    <xsl:variable name="max" select="$minOmaxO[2]"/>
-    <xsl:choose>
-      <xsl:when test="$context/tei:textNode">*</xsl:when>
-      <xsl:when test="$min eq 0  and  $max eq  1">?</xsl:when>
-      <xsl:when test="$min eq 0  and  $max eq -1">*</xsl:when>
-      <xsl:when test="$min ge 1  and  $max eq -1">+</xsl:when>
-      <xsl:otherwise></xsl:otherwise>
-    </xsl:choose>
-  </xsl:function>
-
   <xsl:function name="tei:dtdcomment">
     <xsl:param name="text"/>
     <xsl:value-of select="concat('&#10;&lt;!-- ',$text,' --&gt;&#10;')"/>
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 6990b6ae7..366507105 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -329,7 +329,8 @@ 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"/>
     <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:generateIndicators(@minOccurs,@maxOccurs)"/>
+    <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
+    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
     <xsl:choose>
       <xsl:when test="string-length($owe) eq 0">
         <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{concat('anyElement-',$spec/@ident)}"/>
@@ -1489,9 +1490,9 @@ select="$makeDecls"/></xsl:message>
           <xsl:sequence select="tei:makeDescription(., true(), true())"/>
         </a:documentation>
       </xsl:if>
-      <xsl:variable name="minmax" select="tei:minOmaxO( tei:datatype/@minOccurs, tei:datatype/@maxOccurs )"/>
-      <xsl:variable name="min" select="$minmax[1]"/>
-      <xsl:variable name="max" select="$minmax[2]"/>
+      <xsl:variable name="norMinMax" as="item()+" select="if (tei:datatype) then tei:norMinMax(tei:datatype) else ( 1, 1, '', '' )"/>
+      <xsl:variable name="min" select="$norMinMax[1]"/>
+      <xsl:variable name="max" select="$norMinMax[2]"/>
       <xsl:choose>
         <xsl:when test="$min eq 0 and $max eq 1">
           <optional xmlns="http://relaxng.org/ns/structure/1.0">
@@ -2067,7 +2068,8 @@ select="$makeDecls"/></xsl:message>
    <!-- for Pure ODD -->
   <xsl:template match="tei:sequence" mode="#default tangle">
     <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:generateIndicators(@minOccurs,@maxOccurs)"/>
+    <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
+    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
     <!-- sequences of <dataRef> need use <list>, not <group> -->
     <xsl:variable name="group_or_list" select="if ( *[ not( self::tei:dataRef ) ] ) then 'group' else 'list'"/>
     <xsl:choose>
@@ -2099,7 +2101,8 @@ select="$makeDecls"/></xsl:message>
 
   <xsl:template match="tei:alternate"  mode="#default tangle">
     <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:generateIndicators(@minOccurs,@maxOccurs)"/>
+    <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
+    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
     <xsl:choose>
       <xsl:when test="string-length($owe) eq 0">
         <choice xmlns="http://relaxng.org/ns/structure/1.0">
@@ -2122,8 +2125,12 @@ select="$makeDecls"/></xsl:message>
   
   <xsl:template match="tei:elementRef|tei:classRef|tei:macroRef"   mode="#default tangle">
     <xsl:variable name="prefixedName" select="tei:generateRefPrefix(.)"/>
+    <xsl:variable name="norMinMax" select="tei:norMinMax(.)"/>
+    <xsl:variable name="min" select="$norMinMax[1]"/>
+    <xsl:variable name="max" select="$norMinMax[2]"/>
     <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:generateIndicators(@minOccurs,@maxOccurs)"/>
+    <xsl:variable name="owe" select="$norMinMax[3]"/>
+    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
     <xsl:variable name="this" select="@key"/>
     <xsl:variable name="except" select="@except"/>
     <xsl:variable name="include" select="@include"/>
@@ -2203,9 +2210,6 @@ select="$makeDecls"/></xsl:message>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:variable name="minOmaxO" select="tei:minOmaxO( @minOccurs, @maxOccurs )"/>
-    <xsl:variable name="min" select="$minOmaxO[1]"/>
-    <xsl:variable name="max" select="$minOmaxO[2]"/>
     <xsl:choose>
       <xsl:when test="$min eq 1  and  $max eq 1">
         <xsl:copy-of select="$c"/>
@@ -2258,27 +2262,46 @@ select="$makeDecls"/></xsl:message>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:function name="tei:minOmaxO" as="xs:integer+">
-    <!-- Input: the string values of the attributes @minOccurs and -->
-    <!--        @maxOccurs  -->
-    <!-- Oputput: a sequence of 2 integers representing the integer -->
-    <!--          values thereof with -1 used to indicate "unbounded" -->
-    <xsl:param name="minOccurs"/>
-    <xsl:param name="maxOccurs"/>
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+    <desc>
+      <p>“normalized minimum and maximum occurences”, pronounced almost as “Norman Max”</p>
+      <p>Input: an element node, theoretically a member of att.repeatable</p>
+      <p>Output: a sequence of 4 items:
+        <ul>
+          <li>1) minOccurs as an integer</li>
+          <li>2) maxOccurs as an integer, with -1 for "unbounded"</li>
+          <li>3) a string that conforms to xs:NCName, the name of the RELAX NG element that
+          should be used to generate this number of occurences, if any; one of "optional",
+          "oneOrMore", "zeroOrMore", or '' (the empty string)</li>
+	  <li>4) a 0- or 1-character long string, the occurence
+	  indicator that should be used to generate this number of
+	  occurences in a DTD, if any; one of '?', '+', '*', or ''
+	  (the empty string)</li>
+        </ul>
+      </p>
+    </desc>
+  </doc>
+  <xsl:function name="tei:norMinMax" as="item()+">
+    <xsl:param name="me" as="element()"/>
     <!-- get the value of @minOccurs, defaulting to "1" -->
-    <xsl:variable name="minOccurs" select="( $minOccurs, '1')[1]"/>
+    <xsl:variable name="minOccurs" select="( $me/@minOccurs, '1')[1]"/>
     <!-- get the value of @maxOccurs, defaulting to "1" -->
-    <xsl:variable name="maxOccurs" select="( $maxOccurs, '1')[1]"/>
+    <xsl:variable name="maxOccurs" select="( $me/@maxOccurs, '1')[1]"/>
     <!-- We now have two _string_ representations of the attrs, but -->
     <!-- we need integers. So cast them, converting "unbounded" to  -->
     <!-- a special flag value (-1): -->
-    <xsl:variable name="min" select="xs:integer( $minOccurs )"/>
-    <xsl:variable name="max">
+    <xsl:variable name="min" select="xs:integer( $minOccurs )" as="xs:integer"/>
+    <xsl:variable name="max" as="xs:integer">
       <xsl:choose>
         <xsl:when test="$maxOccurs castable as xs:integer">
+          <!-- It's an integer, but abort if it cannot be used (i.e., min > max) -->
           <xsl:choose>
-            <xsl:when test="xs:integer( $maxOccurs ) lt $min"><xsl:message terminate="yes">The default value of @maxOccurs is 1. You cannot have a @minOccurs greater than the @maxOccurs.</xsl:message></xsl:when>
-            <xsl:otherwise><xsl:value-of select="xs:integer( $maxOccurs )"/></xsl:otherwise>
+            <xsl:when test="xs:integer( $maxOccurs ) lt $min">
+              <xsl:message terminate="yes">The default value of @maxOccurs is 1. You cannot have a @minOccurs greater than the @maxOccurs.</xsl:message>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="xs:integer( $maxOccurs )"/>
+            </xsl:otherwise>
           </xsl:choose>
         </xsl:when>
         <xsl:otherwise>
@@ -2287,27 +2310,33 @@ select="$makeDecls"/></xsl:message>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:sequence select="( $min, $max )"/>
-  </xsl:function>
-
-  <xsl:function name="tei:generateIndicators" as="xs:string">
-    <xsl:param name="minstr"/>
-    <xsl:param name="maxstr"/>
-    <!-- Discussion 2016-08-30 by Syd (modified 2016-11-25, 2016-12-01): -->
-    <!-- I found this stylesheet testing strings. That's not OK, as the attrs -->
-    <!-- @minOccurs and @maxOccurs are defined as counts: a user should be -->
-    <!-- able to enter minOccurs="02" and get the same result as if she had -->
-    <!-- entered minOccurs='2'. So I've changed this to test for integers -->
-    <!-- instead. -->
-    <xsl:variable name="minmax" select="tei:minOmaxO( $minstr, $maxstr )"/>
-    <xsl:variable name="min" select="$minmax[1]"/>
-    <xsl:variable name="max" select="$minmax[2]"/>
-    <xsl:choose>
-      <xsl:when test="$min eq 0  and  $max eq  1">optional</xsl:when>
-      <xsl:when test="$min ge 1  and  $max eq -1">oneOrMore</xsl:when>
-      <xsl:when test="$min eq 0  and  $max eq -1">zeroOrMore</xsl:when>
-      <xsl:otherwise><xsl:text/></xsl:otherwise>
-    </xsl:choose>
+    <!--
+      Generate the local name of the RELAX NG element used to create
+      the requested range of occurences, iff it is one of the
+      available possiblities. If not, use an empty text node (as a
+      flag).
+    -->
+    <xsl:variable name="RelaxOccurenceWrapperElementName" as="xs:string">
+      <xsl:choose>
+        <xsl:when test="$min eq 0  and  $max eq  1">optional</xsl:when>
+        <xsl:when test="$min ge 1  and  $max eq -1">oneOrMore</xsl:when>
+        <xsl:when test="$min eq 0  and  $max eq -1">zeroOrMore</xsl:when>
+        <xsl:otherwise><xsl:text/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <!--
+      Generate the occurence indicator for DTDs, too
+    -->
+    <xsl:variable name="DTD_occurence_indicator" as="xs:string?">
+      <xsl:choose>
+	<xsl:when test="$me/tei:textNode | $me/rng:text">*</xsl:when>
+	<xsl:when test="$min eq 0  and  $max eq  1">?</xsl:when>
+	<xsl:when test="$min eq 0  and  $max eq -1">*</xsl:when>
+	<xsl:when test="$min ge 1  and  $max eq -1">+</xsl:when>
+	<xsl:otherwise></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:sequence select="( $min, $max, $RelaxOccurenceWrapperElementName, $DTD_occurence_indicator )"/>
   </xsl:function>
 
   <xsl:function name="tei:generateAttRef" as="xs:string">

From 3ca367ea03e809f6307cd1768e8bc8dcf8af22c2 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 1 Oct 2023 16:57:19 -0400
Subject: [PATCH 03/50] Oops, spoke too soon: was not passing Test/, just
 Test2/. Now passing both sets of tests.

---
 odds/odd2dtd.xsl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/odds/odd2dtd.xsl b/odds/odd2dtd.xsl
index 62df4dc82..6f0f06039 100644
--- a/odds/odd2dtd.xsl
+++ b/odds/odd2dtd.xsl
@@ -1643,7 +1643,7 @@ of this software, even if advised of the possibility of such damage.
               <xsl:with-param name="sep">,</xsl:with-param>
             </xsl:call-template>
             <xsl:text>)</xsl:text>
-            <xsl:value-of select="tei:generateIndicators(., @minOccurs, @maxOccurs)"/>
+            <xsl:value-of select="tei:norMinMax(.)[4]"/>
           </xsl:otherwise>
         </xsl:choose>
       </token>
@@ -1654,7 +1654,7 @@ of this software, even if advised of the possibility of such damage.
         <xsl:text>(</xsl:text>
         <xsl:value-of select="$innards/*" separator=","/>
         <xsl:text>)</xsl:text>
-        <xsl:value-of select="tei:generateIndicators(., @minOccurs, @maxOccurs)"/>
+        <xsl:value-of select="tei:norMinMax(.)[4]"/>
       </xsl:when>
       <xsl:otherwise>
         <token>
@@ -1666,7 +1666,7 @@ of this software, even if advised of the possibility of such damage.
 
   <xsl:template match="tei:alternate">
     <token>
-      <xsl:variable name="suffix" select="tei:generateIndicators(.,@minOccurs,@maxOccurs)"/>
+      <xsl:variable name="suffix" select="tei:norMinMax(.)[4]"/>
       <xsl:text>(</xsl:text>
       <xsl:call-template name="innards"/>
       <xsl:text>)</xsl:text>
@@ -1693,8 +1693,7 @@ of this software, even if advised of the possibility of such damage.
         <xsl:with-param name="id" select="@key"/>
       </xsl:call-template>
     </xsl:variable>
-    <xsl:variable name="suffix"
-		  select="tei:generateIndicators(.,@minOccurs,@maxOccurs)"/>
+    <xsl:variable name="suffix" select="tei:norMinMax(.)[4]"/>
     <xsl:variable name="ename">
       <xsl:choose>
         <xsl:when test="self::tei:classRef and $exists=''">

From a5d1c3ca64450ca71aa61aafd8e1cddea52aa69d Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sat, 7 Oct 2023 09:55:31 -0400
Subject: [PATCH 04/50] Code for supporting minOccurs= and maxOccurs= on
 <anyElement>, mostly untested because of #631. This comit is *not* ready for
 prime time.

---
 Test2/build_odd.xml                           |   1 +
 Test2/expected-results/testAttValQuant.rng    | 188 +++++---
 Test2/expected-results/testNonTeiOdd1.rng     |   2 +
 Test2/expected-results/testPure1.rng          | 365 +++++++++++----
 Test2/inputFiles/testPure1.odd                | 432 +++++++++---------
 .../validInstances/testPure1ValidInstance.xml | 138 ++++++
 odds/odd2relax.xsl                            | 125 +++--
 odds/teiodds.xsl                              | 330 +++++++------
 8 files changed, 1007 insertions(+), 574 deletions(-)

diff --git a/Test2/build_odd.xml b/Test2/build_odd.xml
index 277f46543..6681ef10b 100644
--- a/Test2/build_odd.xml
+++ b/Test2/build_odd.xml
@@ -96,6 +96,7 @@
     
     <exec executable="${bin}/teitorelaxng" failonerror="true">
       <arg line="--localsource=${localsource}"/>
+      <arg line="--debug"/>
       <arg file="${inFile}"/>
       <arg file="${outFile}"/>
     </exec>
diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index eb6be5e95..b28ed4a77 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -229,7 +229,9 @@
    <define name="att.ranging.attribute.confidence">
       <optional>
          <attribute name="confidence">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
             <data type="double"/>
          </attribute>
       </optional>
@@ -321,7 +323,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="att.written.attribute.hand">
       <optional>
          <attribute name="hand">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml">&lt;handNote&gt;</code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -347,7 +350,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="att.cReferencing.attribute.cRef">
       <optional>
          <attribute name="cRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <code xmlns="http://www.w3.org/1999/xhtml">&lt;refsDecl&gt;</code> element in the TEI header</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;refsDecl&gt;</code> element in the TEI header</a:documentation>
             <data type="string"/>
          </attribute>
       </optional>
@@ -508,7 +512,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="att.datable.attribute.period">
       <optional>
          <attribute name="period">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml">&lt;category&gt;</code>s or <code xmlns="http://www.w3.org/1999/xhtml">&lt;calendar&gt;</code>s) within which the datable item is understood to have occurred.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;category&gt;</code>s or <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;calendar&gt;</code>s) within which the datable item is understood to have occurred.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -527,7 +533,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="att.datcat.attribute.datcat">
       <optional>
          <attribute name="datcat">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of, and/or general information about, (a) an information container (element or attribute) or (b) a value of an information container (element content or attribute value), by referencing an external taxonomy or ontology. If <code xmlns="http://www.w3.org/1999/xhtml">@valueDatcat</code> is present in the immediate context, this attribute takes on role (a), while <code xmlns="http://www.w3.org/1999/xhtml">@valueDatcat</code> performs role (b).</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of, and/or general information about, (a) an information container (element or attribute) or (b) a value of an information container (element content or attribute value), by referencing an external taxonomy or ontology. If <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@valueDatcat</code> is present in the immediate context, this attribute takes on role (a), while <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@valueDatcat</code> performs role (b).</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -541,7 +549,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="att.datcat.attribute.valueDatcat">
       <optional>
          <attribute name="valueDatcat">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about a value of an information container (element content or attribute value), by reference to an external taxonomy or ontology. Used especially where a contrast with <code xmlns="http://www.w3.org/1999/xhtml">@datcat</code> is needed.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about a value of an information container (element content or attribute value), by reference to an external taxonomy or ontology. Used especially where a contrast with <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@datcat</code> is needed.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -555,7 +564,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="att.datcat.attribute.targetDatcat">
       <optional>
          <attribute name="targetDatcat">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about, information structure of an object referenced or modeled by the containing element, by reference to an external taxonomy or ontology. This attribute has the characteristics of the <code xmlns="http://www.w3.org/1999/xhtml">@datcat</code> attribute, except that it addresses not its containing element, but an object that is being referenced or modeled by its containing element.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about, information structure of an object referenced or modeled by the containing element, by reference to an external taxonomy or ontology. This attribute has the characteristics of the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@datcat</code> attribute, except that it addresses not its containing element, but an object that is being referenced or modeled by its containing element.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -868,6 +878,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       <optional>
          <attribute name="xml:lang">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language) indicates the language of the element content using a tag generated according to <a xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
             <choice>
                <data type="language"/>
@@ -913,7 +924,8 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
    <define name="att.handFeatures.attribute.scribeRef">
       <optional>
          <attribute name="scribeRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;person&gt;</code> element elsewhere in the description.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;person&gt;</code> element elsewhere in the description.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -939,7 +951,8 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
    <define name="att.handFeatures.attribute.scriptRef">
       <optional>
          <attribute name="scriptRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;scriptNote&gt;</code> element elsewhere in the description.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;scriptNote&gt;</code> element elsewhere in the description.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -1107,7 +1120,9 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
    <define name="att.measurement.attribute.unitRef">
       <optional>
          <attribute name="unitRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml">&lt;unitDef&gt;</code> element that defines a unit of measure.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;unitDef&gt;</code> element that defines a unit of measure.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -1284,7 +1299,9 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
    <define name="att.pointing.attribute.targetLang">
       <optional>
          <attribute name="targetLang">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the language of the content to be found at the destination referenced by <code xmlns="http://www.w3.org/1999/xhtml">@target</code>, using a language tag generated according to <a xmlns="http://www.w3.org/1999/xhtml"
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the language of the content to be found at the destination referenced by <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code>, using a language tag generated according to <a xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
             <choice>
                <data type="language"/>
@@ -1429,7 +1446,8 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
    <define name="att.styleDef.attribute.schemeVersion">
       <optional>
          <attribute name="schemeVersion">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a version number for the style language provided in <code xmlns="http://www.w3.org/1999/xhtml">@scheme</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a version number for the style language provided in <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@scheme</code>.</a:documentation>
             <data type="token">
                <param name="pattern">[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}</param>
             </data>
@@ -1547,7 +1565,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="att.citing.attribute.from">
       <optional>
          <attribute name="from">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the starting point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@unit</code> attribute.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the starting point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@unit</code> attribute.</a:documentation>
             <data type="token">
                <param name="pattern">[^\p{C}\p{Z}]+</param>
             </data>
@@ -1557,7 +1576,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="att.citing.attribute.to">
       <optional>
          <attribute name="to">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the end-point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@unit</code> attribute.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the end-point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@unit</code> attribute.</a:documentation>
             <data type="token">
                <param name="pattern">[^\p{C}\p{Z}]+</param>
             </data>
@@ -3378,7 +3398,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="att.formula.attribute.formula">
       <optional>
          <attribute name="formula">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A <code xmlns="http://www.w3.org/1999/xhtml">@formula</code> is provided to describe a mathematical calculation such as a conversion between measurement systems.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@formula</code> is provided to describe a mathematical calculation such as a conversion between measurement systems.</a:documentation>
             <text/>
          </attribute>
       </optional>
@@ -3389,7 +3410,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="att.locatable.attribute.where">
       <optional>
          <attribute name="where">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml">&lt;place&gt;</code> element or other canonical description.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;place&gt;</code> element or other canonical description.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -3475,11 +3497,13 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
 Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] canto; 7] speaker; 8] stanza; 9] act; 10] scene; 11] section; 12] absent; 13] unnumbered</a:documentation>
          <choice>
             <value>page</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">physical page breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;pb&gt;</code> element).</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">physical page breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;pb&gt;</code> element).</a:documentation>
             <value>column</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">column breaks.</a:documentation>
             <value>line</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">line breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;lb&gt;</code> element).</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">line breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;lb&gt;</code> element).</a:documentation>
             <value>book</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">any units termed book, liber, etc.</a:documentation>
             <value>poem</value>
@@ -3511,10 +3535,10 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
             <rule context="tei:p">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
@@ -3522,10 +3546,10 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
             <rule context="tei:p">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
@@ -3727,9 +3751,9 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
          <ref name="macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
-                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:desc[ @type eq 'deprecationInfo']">
                <sch:assert test="../@validUntil">Information about a
@@ -3824,10 +3848,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-rt-target-rt-target-not-span-constraint-report-8">
             <rule context="tei:rt/@target">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="../@from | ../@to">When target= is
             present, neither from= nor to= should be.</sch:report>
@@ -3842,10 +3866,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-rt-from-rt-from-constraint-assert-7">
             <rule context="tei:rt/@from">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="../@to">When from= is present, the to=
             attribute of <sch:name/> is required.</sch:assert>
@@ -3860,10 +3884,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-rt-to-rt-to-constraint-assert-8">
             <rule context="tei:rt/@to">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="../@from">When to= is present, the from=
             attribute of <sch:name/> is required.</sch:assert>
@@ -3893,12 +3917,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
    <define name="choice">
       <element name="choice">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]</a:documentation>
-         <oneOrMore>
-            <choice>
-               <ref name="model.choicePart"/>
-               <ref name="choice"/>
-            </choice>
-         </oneOrMore>
+         <choice>
+            <ref name="model.choicePart"/>
+            <ref name="choice"/>
+         </choice>
          <ref name="att.global.attributes"/>
          <empty/>
       </element>
@@ -4301,9 +4323,10 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-ptr-ptrAtts-constraint-report-9">
             <rule context="tei:ptr">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0" test="@target and @cRef">Only one of the
+               <report test="@target and @cRef">Only one of the
 attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
@@ -4321,9 +4344,10 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-ref-refAtts-constraint-report-10">
             <rule context="tei:ref">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0" test="@target and @cRef">Only one of the
+               <report test="@target and @cRef">Only one of the
 	attributes @target' and @cRef' may be supplied on <name/>
                </report>
             </rule>
@@ -4390,9 +4414,9 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-list-gloss-list-must-have-labels-constraint-rule-12">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
-                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:list[@type='gloss']">
                <sch:assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</sch:assert>
@@ -4407,7 +4431,8 @@ attributes @target and @cRef may be supplied on <name/>.</report>
 Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)</a:documentation>
                <choice>
                   <value>gloss</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) each list item glosses some term or concept, which is given by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;label&gt;</code> element preceding the list item.</a:documentation>
+                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) each list item glosses some term or concept, which is given by a <code xmlns="http://www.w3.org/1999/xhtml"
+                           xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;label&gt;</code> element preceding the list item.</a:documentation>
                   <value>index</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.</a:documentation>
                   <value>instructions</value>
@@ -4592,6 +4617,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <optional>
             <attribute name="encoding">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0"
                      href="http://en.wikipedia.org/wiki/Base64">Base64</a>.</a:documentation>
                <list>
                   <oneOrMore>
@@ -5080,16 +5106,15 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-relatedItem-targetorcontent1-constraint-report-11">
             <rule context="tei:relatedItem">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <sch:name/> is used, the
 relatedItem element must be empty</sch:report>
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="@target or child::*">A relatedItem element should have either a 'target' attribute
         or a child element to indicate the related bibliographic item</sch:assert>
@@ -5121,10 +5146,10 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-l-abstractModel-structure-l-in-l-constraint-report-12">
             <rule context="tei:l">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
         Abstract model violation: Lines may not contain lines or lg elements.
@@ -5173,20 +5198,20 @@ relatedItem element must be empty</sch:report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-lg-atleast1oflggapl-constraint-assert-11">
             <rule context="tei:lg">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg, or gap element.</sch:assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-lg-abstractModel-structure-lg-in-l-constraint-report-13">
             <rule context="tei:lg">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
@@ -5293,7 +5318,8 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
    </define>
    <define name="teiCorpus">
       <element name="teiCorpus">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="teiHeader"/>
             <zeroOrMore>
@@ -5377,7 +5403,8 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="att.citeStructurePart.attribute.use">
       <attribute name="use">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml">@match</code>, which will either be a sibling attribute in the case of `&lt;citeStructure&gt;` or on the parent `&lt;citeStructure&gt;` in the case of `&lt;citeData&gt;`.</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code>, which will either be a sibling attribute in the case of `&lt;citeStructure&gt;` or on the parent `&lt;citeStructure&gt;` in the case of `&lt;citeData&gt;`.</a:documentation>
          <text/>
       </attribute>
    </define>
@@ -5393,7 +5420,8 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="att.patternReplacement.attribute.replacementPattern">
       <attribute name="replacementPattern">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the <code xmlns="http://www.w3.org/1999/xhtml">@matchPattern</code> which, once subpattern substitution has been performed, complete the URI.</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@matchPattern</code> which, once subpattern substitution has been performed, complete the URI.</a:documentation>
          <text/>
       </attribute>
    </define>
@@ -5579,6 +5607,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                <choice>
                   <value>ISBN</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
                         href="https://www.isbn-international.org"> International ISBN Agency.</a>
                   </a:documentation>
                   <value>ISSN</value>
@@ -5587,6 +5616,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.</a:documentation>
                   <value>URI</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
                         href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
                   <value>VIAF</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.</a:documentation>
@@ -5877,10 +5907,10 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-quotation-quotationContents-constraint-report-14">
             <rule context="tei:quotation">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:xi="http://www.w3.org/2001/XInclude"
                        test="not(@marks) and not (tei:p)">
 On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
@@ -6014,7 +6044,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <ref name="att.global.attributes"/>
          <optional>
             <attribute name="partial">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates whether the element types listed exhaustively include all those found within <code xmlns="http://www.w3.org/1999/xhtml">&lt;text&gt;</code>, or represent only a subset.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates whether the element types listed exhaustively include all those found within <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;text&gt;</code>, or represent only a subset.</a:documentation>
                <data type="boolean"/>
             </attribute>
          </optional>
@@ -6028,7 +6059,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <ref name="att.global.attributes"/>
          <ref name="att.datcat.attributes"/>
          <attribute name="gi">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;namespace&gt;</code> element.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;namespace&gt;</code> element.</a:documentation>
             <data type="Name"/>
          </attribute>
          <optional>
@@ -6039,7 +6071,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          </optional>
          <optional>
             <attribute name="withId">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> attribute.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:id</code> attribute.</a:documentation>
                <data type="nonNegativeInteger"/>
             </attribute>
          </optional>
@@ -6079,7 +6112,8 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </optional>
          <optional>
             <attribute name="selector">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the <code xmlns="http://www.w3.org/1999/xhtml">@scheme</code> attribute.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@scheme</code> attribute.</a:documentation>
                <data type="string"/>
             </attribute>
          </optional>
@@ -6145,28 +6179,34 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
             </attribute>
          </optional>
          <attribute name="match">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.</a:documentation>
             <text/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-citeStructure-match-citestructure-outer-match-constraint-rule-13">
-            <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  xmlns:xi="http://www.w3.org/2001/XInclude"
+            <rule xmlns:xi="http://www.w3.org/2001/XInclude"
                   context="tei:citeStructure[not(parent::tei:citeStructure)]">
                <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-citeStructure-match-citestructure-inner-match-constraint-rule-14">
-            <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  xmlns:xi="http://www.w3.org/2001/XInclude"
+            <rule xmlns:xi="http://www.w3.org/2001/XInclude"
                   context="tei:citeStructure[parent::tei:citeStructure]">
                <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
             </rule>
          </pattern>
          <optional>
             <attribute name="unit">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unit) describes the structural unit indicated by the <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code>.
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unit) describes the structural unit indicated by the <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.
 Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] line; 7] section; 8] verse; 9] volume</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
@@ -6334,7 +6374,8 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="catDesc">
       <element name="catDesc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <code xmlns="http://www.w3.org/1999/xhtml">&lt;textDesc&gt;</code>. [2.3.7. The Classification Declaration]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;textDesc&gt;</code>. [2.3.7. The Classification Declaration]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -6349,7 +6390,8 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="geoDecl">
       <element name="geoDecl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <code xmlns="http://www.w3.org/1999/xhtml">&lt;geo&gt;</code> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;geo&gt;</code> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.declarable.attributes"/>
@@ -6422,13 +6464,15 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="att.formula.attributes"/>
          <ref name="att.locatable.attributes"/>
          <attribute name="fromUnit">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml">@toUnit</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@toUnit</code>.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
          </attribute>
          <attribute name="toUnit">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml">@fromUnit</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@fromUnit</code>.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -6540,7 +6584,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="att.global.attributes"/>
          <attribute name="ident">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) Supplies a language code constructed as defined in <a xmlns="http://www.w3.org/1999/xhtml"
-                  href="https://tools.ietf.org/html/bcp47">BCP 47</a> which is used to identify the language documented by this element, and which is referenced by the global <code xmlns="http://www.w3.org/1999/xhtml">@xml:lang</code> attribute.</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                  href="https://tools.ietf.org/html/bcp47">BCP 47</a> which is used to identify the language documented by this element, and which is referenced by the global <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:lang</code> attribute.</a:documentation>
             <choice>
                <data type="language"/>
                <choice>
@@ -6585,7 +6631,8 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="att.global.attributes"/>
          <optional>
             <attribute name="scheme">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
                <data type="anyURI">
                   <param name="pattern">\S+</param>
                </data>
@@ -6600,7 +6647,8 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="macro.phraseSeq.limited"/>
          <ref name="att.global.attributes"/>
          <attribute name="scheme">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or some other resource.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or some other resource.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -6616,7 +6664,8 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="att.pointing.attributes"/>
          <optional>
             <attribute name="scheme">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
                <data type="anyURI">
                   <param name="pattern">\S+</param>
                </data>
@@ -6786,7 +6835,8 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                        name="ordered"
                        a:defaultValue="true">
-               <a:documentation>indicates whether the ordering of its child <code xmlns="http://www.w3.org/1999/xhtml">&lt;change&gt;</code> elements is to be considered significant or not</a:documentation>
+               <a:documentation>indicates whether the ordering of its child <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;change&gt;</code> elements is to be considered significant or not</a:documentation>
                <data type="boolean"/>
             </attribute>
          </optional>
@@ -6795,7 +6845,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="TEI">
       <element name="TEI">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="teiHeader"/>
             <choice>
@@ -7118,10 +7171,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15">
             <rule context="tei:div">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
@@ -7129,10 +7182,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="tavq-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16">
             <rule context="tei:div">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
         Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
@@ -7584,7 +7637,8 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
    </define>
    <define name="test">
       <element name="test" ns="http://www.wwp.neu.edu/temp/ns">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">global empty <code xmlns="http://www.w3.org/1999/xhtml">&lt;test&gt;</code> element for (you guessed it) testing</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">global empty <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;test&gt;</code> element for (you guessed it) testing</a:documentation>
          <text/>
          <ref name="att.global.attributes"/>
          <attribute name="req_01">
diff --git a/Test2/expected-results/testNonTeiOdd1.rng b/Test2/expected-results/testNonTeiOdd1.rng
index c9c4b2a27..c0ae33e2e 100644
--- a/Test2/expected-results/testNonTeiOdd1.rng
+++ b/Test2/expected-results/testNonTeiOdd1.rng
@@ -30,6 +30,7 @@
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Division of a document; used as the root for content blocks.) The core container element for a content block. This may also nest, to provide subsections.</a:documentation>
          <ref name="macro.divContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="nonTeiOdd-div-headingLevelMustMatchNesting-constraint-assert-1">
             <rule context="xh:div">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
@@ -166,6 +167,7 @@
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Image element. May be rendered inline or as a block, depending on where it appears in the document structure.</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="nonTeiOdd-img-imgWithoutCaptionNeedsAltAndTitle-constraint-assert-2">
             <rule context="xh:img">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 97bb0a7ec..fb7e65c7b 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -4,15 +4,6 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0">
-   <define name="t_macro.abContent">
-      <zeroOrMore>
-         <choice>
-            <text/>
-            <ref name="t_model.paraPart"/>
-            <ref name="t_ab"/>
-         </choice>
-      </zeroOrMore>
-   </define>
    <define name="t_macro.paraContent">
       <zeroOrMore>
          <choice>
@@ -246,7 +237,9 @@
    <define name="t_att.ranging.attribute.confidence">
       <optional>
          <attribute name="confidence">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
             <data type="double"/>
          </attribute>
       </optional>
@@ -338,7 +331,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.written.attribute.hand">
       <optional>
          <attribute name="hand">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml">&lt;handNote&gt;</code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -364,7 +358,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.cReferencing.attribute.cRef">
       <optional>
          <attribute name="cRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <code xmlns="http://www.w3.org/1999/xhtml">&lt;refsDecl&gt;</code> element in the TEI header</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;refsDecl&gt;</code> element in the TEI header</a:documentation>
             <data type="string"/>
          </attribute>
       </optional>
@@ -525,7 +520,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.datable.attribute.period">
       <optional>
          <attribute name="period">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml">&lt;category&gt;</code>s or <code xmlns="http://www.w3.org/1999/xhtml">&lt;calendar&gt;</code>s) within which the datable item is understood to have occurred.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;category&gt;</code>s or <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;calendar&gt;</code>s) within which the datable item is understood to have occurred.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -544,7 +541,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.datcat.attribute.datcat">
       <optional>
          <attribute name="datcat">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of, and/or general information about, (a) an information container (element or attribute) or (b) a value of an information container (element content or attribute value), by referencing an external taxonomy or ontology. If <code xmlns="http://www.w3.org/1999/xhtml">@valueDatcat</code> is present in the immediate context, this attribute takes on role (a), while <code xmlns="http://www.w3.org/1999/xhtml">@valueDatcat</code> performs role (b).</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of, and/or general information about, (a) an information container (element or attribute) or (b) a value of an information container (element content or attribute value), by referencing an external taxonomy or ontology. If <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@valueDatcat</code> is present in the immediate context, this attribute takes on role (a), while <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@valueDatcat</code> performs role (b).</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -558,7 +557,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.datcat.attribute.valueDatcat">
       <optional>
          <attribute name="valueDatcat">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about a value of an information container (element content or attribute value), by reference to an external taxonomy or ontology. Used especially where a contrast with <code xmlns="http://www.w3.org/1999/xhtml">@datcat</code> is needed.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about a value of an information container (element content or attribute value), by reference to an external taxonomy or ontology. Used especially where a contrast with <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@datcat</code> is needed.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -572,7 +572,8 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.datcat.attribute.targetDatcat">
       <optional>
          <attribute name="targetDatcat">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about, information structure of an object referenced or modeled by the containing element, by reference to an external taxonomy or ontology. This attribute has the characteristics of the <code xmlns="http://www.w3.org/1999/xhtml">@datcat</code> attribute, except that it addresses not its containing element, but an object that is being referenced or modeled by its containing element.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about, information structure of an object referenced or modeled by the containing element, by reference to an external taxonomy or ontology. This attribute has the characteristics of the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@datcat</code> attribute, except that it addresses not its containing element, but an object that is being referenced or modeled by its containing element.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -887,6 +888,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       <optional>
          <attribute name="xml:lang">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language) indicates the language of the element content using a tag generated according to <a xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
             <choice>
                <data type="language"/>
@@ -932,7 +934,8 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
    <define name="t_att.handFeatures.attribute.scribeRef">
       <optional>
          <attribute name="scribeRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;person&gt;</code> element elsewhere in the description.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;person&gt;</code> element elsewhere in the description.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -958,7 +961,8 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
    <define name="t_att.handFeatures.attribute.scriptRef">
       <optional>
          <attribute name="scriptRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;scriptNote&gt;</code> element elsewhere in the description.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;scriptNote&gt;</code> element elsewhere in the description.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -1166,7 +1170,9 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
    <define name="t_att.measurement.attribute.unitRef">
       <optional>
          <attribute name="unitRef">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml">&lt;unitDef&gt;</code> element that defines a unit of measure.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;unitDef&gt;</code> element that defines a unit of measure.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -1332,7 +1338,9 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
    <define name="t_att.pointing.attribute.targetLang">
       <optional>
          <attribute name="targetLang">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the language of the content to be found at the destination referenced by <code xmlns="http://www.w3.org/1999/xhtml">@target</code>, using a language tag generated according to <a xmlns="http://www.w3.org/1999/xhtml"
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the language of the content to be found at the destination referenced by <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code>, using a language tag generated according to <a xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
             <choice>
                <data type="language"/>
@@ -1412,7 +1420,11 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
    <define name="t_att.pointing.group.attribute.targFunc">
       <optional>
          <attribute name="targFunc">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(target function) describes the function of each of the values of the <code xmlns="http://www.w3.org/1999/xhtml">@target</code> attribute of the enclosed <code xmlns="http://www.w3.org/1999/xhtml">&lt;link&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;join&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml">&lt;alt&gt;</code> tags.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(target function) describes the function of each of the values of the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code> attribute of the enclosed <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;link&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> tags.</a:documentation>
             <list>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
@@ -1538,7 +1550,8 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
    <define name="t_att.styleDef.attribute.schemeVersion">
       <optional>
          <attribute name="schemeVersion">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a version number for the style language provided in <code xmlns="http://www.w3.org/1999/xhtml">@scheme</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a version number for the style language provided in <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@scheme</code>.</a:documentation>
             <data type="token">
                <param name="pattern">[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}</param>
             </data>
@@ -1656,7 +1669,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="t_att.citing.attribute.from">
       <optional>
          <attribute name="from">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the starting point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@unit</code> attribute.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the starting point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@unit</code> attribute.</a:documentation>
             <data type="token">
                <param name="pattern">[^\p{C}\p{Z}]+</param>
             </data>
@@ -1666,7 +1680,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="t_att.citing.attribute.to">
       <optional>
          <attribute name="to">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the end-point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@unit</code> attribute.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the end-point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@unit</code> attribute.</a:documentation>
             <data type="token">
                <param name="pattern">[^\p{C}\p{Z}]+</param>
             </data>
@@ -3779,7 +3794,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="t_att.formula.attribute.formula">
       <optional>
          <attribute name="formula">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A <code xmlns="http://www.w3.org/1999/xhtml">@formula</code> is provided to describe a mathematical calculation such as a conversion between measurement systems.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@formula</code> is provided to describe a mathematical calculation such as a conversion between measurement systems.</a:documentation>
             <text/>
          </attribute>
       </optional>
@@ -3790,7 +3806,8 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="t_att.locatable.attribute.where">
       <optional>
          <attribute name="where">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml">&lt;place&gt;</code> element or other canonical description.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;place&gt;</code> element or other canonical description.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -3877,11 +3894,13 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
 Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] canto; 7] speaker; 8] stanza; 9] act; 10] scene; 11] section; 12] absent; 13] unnumbered</a:documentation>
          <choice>
             <value>page</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">physical page breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;pb&gt;</code> element).</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">physical page breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;pb&gt;</code> element).</a:documentation>
             <value>column</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">column breaks.</a:documentation>
             <value>line</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">line breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;lb&gt;</code> element).</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">line breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;lb&gt;</code> element).</a:documentation>
             <value>book</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">any units termed book, liber, etc.</a:documentation>
             <value>poem</value>
@@ -3913,10 +3932,10 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
             <rule context="tei:p">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
@@ -3924,10 +3943,10 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
             <rule context="tei:p">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
@@ -4129,9 +4148,9 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
          <ref name="t_macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
-                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:desc[ @type eq 'deprecationInfo']">
                <sch:assert test="../@validUntil">Information about a
@@ -4225,10 +4244,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-rt-target-rt-target-not-span-constraint-report-8">
             <rule context="tei:rt/@target">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="../@from | ../@to">When target= is
             present, neither from= nor to= should be.</sch:report>
@@ -4243,10 +4262,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-rt-from-rt-from-constraint-assert-7">
             <rule context="tei:rt/@from">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="../@to">When from= is present, the to=
             attribute of <sch:name/> is required.</sch:assert>
@@ -4261,10 +4280,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-rt-to-rt-to-constraint-assert-8">
             <rule context="tei:rt/@to">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="../@from">When to= is present, the from=
             attribute of <sch:name/> is required.</sch:assert>
@@ -4747,11 +4766,10 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-ptr-ptrAtts-constraint-report-9">
             <rule context="tei:ptr">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       test="@target and @cRef">Only one of the
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
 attributes @target and @cRef may be supplied on <name/>.</report>
             </rule>
          </pattern>
@@ -4769,11 +4787,10 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-ref-refAtts-constraint-report-10">
             <rule context="tei:ref">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       test="@target and @cRef">Only one of the
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
 	attributes @target' and @cRef' may be supplied on <name/>
                </report>
             </rule>
@@ -4840,9 +4857,9 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-list-gloss-list-must-have-labels-constraint-rule-12">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
-                      xmlns:rng="http://relaxng.org/ns/structure/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:list[@type='gloss']">
                <sch:assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</sch:assert>
@@ -5020,6 +5037,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <optional>
             <attribute name="encoding">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0"
                      href="http://en.wikipedia.org/wiki/Base64">Base64</a>.</a:documentation>
                <list>
                   <oneOrMore>
@@ -5382,16 +5400,15 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-relatedItem-targetorcontent1-constraint-report-11">
             <rule context="tei:relatedItem">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <sch:name/> is used, the
 relatedItem element must be empty</sch:report>
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="@target or child::*">A relatedItem element should have either a 'target' attribute
         or a child element to indicate the related bibliographic item</sch:assert>
@@ -5423,10 +5440,10 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-l-abstractModel-structure-l-in-l-constraint-report-12">
             <rule context="tei:l">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
         Abstract model violation: Lines may not contain lines or lg elements.
@@ -5475,20 +5492,20 @@ relatedItem element must be empty</sch:report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-lg-atleast1oflggapl-constraint-assert-11">
             <rule context="tei:lg">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg, or gap element.</sch:assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-report-13">
             <rule context="tei:lg">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
@@ -5595,7 +5612,8 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
    </define>
    <define name="t_teiCorpus">
       <element name="teiCorpus">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="t_teiHeader"/>
             <zeroOrMore>
@@ -5678,7 +5696,8 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="t_att.citeStructurePart.attribute.use">
       <attribute name="use">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml">@match</code>, which will either be a sibling attribute in the case of `&lt;citeStructure&gt;` or on the parent `&lt;citeStructure&gt;` in the case of `&lt;citeData&gt;`.</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code>, which will either be a sibling attribute in the case of `&lt;citeStructure&gt;` or on the parent `&lt;citeStructure&gt;` in the case of `&lt;citeData&gt;`.</a:documentation>
          <text/>
       </attribute>
    </define>
@@ -5694,7 +5713,8 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="t_att.patternReplacement.attribute.replacementPattern">
       <attribute name="replacementPattern">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the <code xmlns="http://www.w3.org/1999/xhtml">@matchPattern</code> which, once subpattern substitution has been performed, complete the URI.</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@matchPattern</code> which, once subpattern substitution has been performed, complete the URI.</a:documentation>
          <text/>
       </attribute>
    </define>
@@ -5879,6 +5899,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                <choice>
                   <value>ISBN</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
                         href="https://www.isbn-international.org"> International ISBN Agency.</a>
                   </a:documentation>
                   <value>ISSN</value>
@@ -5887,6 +5908,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.</a:documentation>
                   <value>URI</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
                         href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
                   <value>VIAF</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.</a:documentation>
@@ -6177,10 +6199,10 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="t_model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-quotation-quotationContents-constraint-report-14">
             <rule context="tei:quotation">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:xi="http://www.w3.org/2001/XInclude"
                        test="not(@marks) and not (tei:p)">
 On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
@@ -6314,7 +6336,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <ref name="t_att.global.attributes"/>
          <optional>
             <attribute name="partial">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates whether the element types listed exhaustively include all those found within <code xmlns="http://www.w3.org/1999/xhtml">&lt;text&gt;</code>, or represent only a subset.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates whether the element types listed exhaustively include all those found within <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;text&gt;</code>, or represent only a subset.</a:documentation>
                <data type="boolean"/>
             </attribute>
          </optional>
@@ -6328,7 +6351,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.datcat.attributes"/>
          <attribute name="gi">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;namespace&gt;</code> element.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;namespace&gt;</code> element.</a:documentation>
             <data type="Name"/>
          </attribute>
          <optional>
@@ -6339,7 +6363,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          </optional>
          <optional>
             <attribute name="withId">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> attribute.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:id</code> attribute.</a:documentation>
                <data type="nonNegativeInteger"/>
             </attribute>
          </optional>
@@ -6379,7 +6404,8 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </optional>
          <optional>
             <attribute name="selector">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the <code xmlns="http://www.w3.org/1999/xhtml">@scheme</code> attribute.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@scheme</code> attribute.</a:documentation>
                <data type="string"/>
             </attribute>
          </optional>
@@ -6445,22 +6471,27 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
             </attribute>
          </optional>
          <attribute name="match">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.</a:documentation>
             <text/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-13">
-            <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+            <rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                   xmlns:xi="http://www.w3.org/2001/XInclude"
                   context="tei:citeStructure[not(parent::tei:citeStructure)]">
                <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-14">
-            <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+            <rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                   xmlns:xi="http://www.w3.org/2001/XInclude"
                   context="tei:citeStructure[parent::tei:citeStructure]">
                <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
@@ -6468,7 +6499,8 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </pattern>
          <optional>
             <attribute name="unit">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unit) describes the structural unit indicated by the <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code>.
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unit) describes the structural unit indicated by the <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.
 Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] line; 7] section; 8] verse; 9] volume</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
@@ -6636,7 +6668,8 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="t_catDesc">
       <element name="catDesc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <code xmlns="http://www.w3.org/1999/xhtml">&lt;textDesc&gt;</code>. [2.3.7. The Classification Declaration]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;textDesc&gt;</code>. [2.3.7. The Classification Declaration]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -6651,7 +6684,8 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="t_geoDecl">
       <element name="geoDecl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <code xmlns="http://www.w3.org/1999/xhtml">&lt;geo&gt;</code> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;geo&gt;</code> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declarable.attributes"/>
@@ -6724,13 +6758,15 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.formula.attributes"/>
          <ref name="t_att.locatable.attributes"/>
          <attribute name="fromUnit">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml">@toUnit</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@toUnit</code>.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
          </attribute>
          <attribute name="toUnit">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml">@fromUnit</code>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@fromUnit</code>.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -6842,7 +6878,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.global.attributes"/>
          <attribute name="ident">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) Supplies a language code constructed as defined in <a xmlns="http://www.w3.org/1999/xhtml"
-                  href="https://tools.ietf.org/html/bcp47">BCP 47</a> which is used to identify the language documented by this element, and which is referenced by the global <code xmlns="http://www.w3.org/1999/xhtml">@xml:lang</code> attribute.</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                  href="https://tools.ietf.org/html/bcp47">BCP 47</a> which is used to identify the language documented by this element, and which is referenced by the global <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:lang</code> attribute.</a:documentation>
             <choice>
                <data type="language"/>
                <choice>
@@ -6887,7 +6925,8 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.global.attributes"/>
          <optional>
             <attribute name="scheme">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
                <data type="anyURI">
                   <param name="pattern">\S+</param>
                </data>
@@ -6902,7 +6941,8 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_macro.phraseSeq.limited"/>
          <ref name="t_att.global.attributes"/>
          <attribute name="scheme">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or some other resource.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or some other resource.</a:documentation>
             <data type="anyURI">
                <param name="pattern">\S+</param>
             </data>
@@ -6918,7 +6958,8 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.pointing.attributes"/>
          <optional>
             <attribute name="scheme">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
                <data type="anyURI">
                   <param name="pattern">\S+</param>
                </data>
@@ -7087,7 +7128,8 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                        name="ordered"
                        a:defaultValue="true">
-               <a:documentation>indicates whether the ordering of its child <code xmlns="http://www.w3.org/1999/xhtml">&lt;change&gt;</code> elements is to be considered significant or not</a:documentation>
+               <a:documentation>indicates whether the ordering of its child <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;change&gt;</code> elements is to be considered significant or not</a:documentation>
                <data type="boolean"/>
             </attribute>
          </optional>
@@ -7152,7 +7194,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       <optional>
          <attribute name="msd">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(morphosyntactic description) supplies morphosyntactic information for a token, usually according to some official reference vocabulary (e.g. for German: <a xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   href="http://www.ims.uni-stuttgart.de/forschung/ressourcen/lexika/TagSets/stts-1999.pdf">STTS-large tagset</a>; for a feature description system designed as (pragmatically) universal, see <a xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   href="http://universaldependencies.org/u/feat/index.html">Universal Features</a>).</a:documentation>
             <data type="string"/>
          </attribute>
@@ -7183,7 +7227,8 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    <define name="t_att.global.analytic.attribute.ana">
       <optional>
          <attribute name="ana">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml">@ana</code> attribute appears.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@ana</code> attribute appears.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -7199,11 +7244,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(s-unit) contains a sentence-like division of a text. [17.1. Linguistic Segment Categories 8.4.1. Segmentation]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-s-noNestedS-constraint-report-15">
             <rule context="tei:s">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       test="tei:s">You may not nest one s element within
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="tei:s">You may not nest one s element within
       another: use seg instead</report>
             </rule>
          </pattern>
@@ -7277,7 +7321,8 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.linguistic.attributes"/>
          <ref name="t_att.notated.attributes"/>
          <attribute name="ana">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml">@ana</code> attribute appears.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml"
+                     xmlns:rng="http://relaxng.org/ns/structure/1.0">@ana</code> attribute appears.</a:documentation>
             <list>
                <oneOrMore>
                   <data type="anyURI">
@@ -7379,10 +7424,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">associates an interpretative annotation directly with a span of text. [17.3. Spans and Interpretations]</a:documentation>
          <ref name="t_macro.phraseSeq.limited"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-span-targetfrom-constraint-report-16">
             <rule context="tei:span">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:xi="http://www.w3.org/2001/XInclude"
                        test="@from and @target">
 Only one of the attributes @target and @from may be supplied on <name/>
@@ -7390,10 +7435,10 @@ Only one of the attributes @target and @from may be supplied on <name/>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-span-targetto-constraint-report-17">
             <rule context="tei:span">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:xi="http://www.w3.org/2001/XInclude"
                        test="@to and @target">
 Only one of the attributes @target and @to may be supplied on <name/>
@@ -7401,20 +7446,20 @@ Only one of the attributes @target and @to may be supplied on <name/>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-span-tonotfrom-constraint-report-18">
             <rule context="tei:span">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:xi="http://www.w3.org/2001/XInclude"
                        test="@to and not(@from)">
 If @to is supplied on <name/>, @from must be supplied as well</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-span-tofrom-constraint-report-19">
             <rule context="tei:span">
-               <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                        xmlns:xi="http://www.w3.org/2001/XInclude"
                        test="contains(normalize-space(@to),' ') or contains(normalize-space(@from),' ')">
 The attributes @to and @from on <name/> may each contain only a single value</report>
@@ -7425,7 +7470,8 @@ The attributes @to and @from on <name/> may each contain only a single value</re
          <ref name="t_att.pointing.attributes"/>
          <optional>
             <attribute name="from">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a <code xmlns="http://www.w3.org/1999/xhtml">@to</code> attribute, gives the identifier of the node of the entire span of text being annotated.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@to</code> attribute, gives the identifier of the node of the entire span of text being annotated.</a:documentation>
                <data type="anyURI">
                   <param name="pattern">\S+</param>
                </data>
@@ -7586,10 +7632,10 @@ The attributes @to and @from on <name/> may each contain only a single value</re
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-link-linkTargets3-constraint-assert-14">
             <rule context="tei:link">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns:xi="http://www.w3.org/2001/XInclude"
                            test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
@@ -7617,10 +7663,10 @@ The attributes @to and @from on <name/> may each contain only a single value</re
             </oneOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-linkGrp-eight_is_enough-constraint-report-20">
             <rule context="tei:linkGrp">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns:xi="http://www.w3.org/2001/XInclude"
                            test="count(*)&gt;8">Too many links!</sch:report>
@@ -7634,12 +7680,117 @@ The attributes @to and @from on <name/> may each contain only a single value</re
    <define name="t_ab">
       <element name="ab">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
-         <ref name="t_macro.abContent"/>
+         <ref name="anyElement-ab"/>
+         <ref name="t_gb"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <zeroOrMore>
+            <ref name="anyElement-ab"/>
+         </zeroOrMore>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <oneOrMore>
+            <ref name="anyElement-ab"/>
+         </oneOrMore>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <zeroOrMore>
+            <ref name="anyElement-ab"/>
+         </zeroOrMore>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-ab"/>
+         </optional>
+         <ref name="t_gb"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <ref name="anyElement-ab"/>
+         <zeroOrMore>
+            <ref name="anyElement-ab"/>
+         </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-21">
             <rule context="tei:ab">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns:xi="http://www.w3.org/2001/XInclude"
                            test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
@@ -7698,7 +7849,9 @@ The attributes @to and @from on <name/> may each contain only a single value</re
          </optional>
          <optional>
             <attribute name="unit">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time in which the <code xmlns="http://www.w3.org/1999/xhtml">@interval</code> value is expressed, if this is not inherited from the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;timeline&gt;</code>.
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time in which the <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@interval</code> value is expressed, if this is not inherited from the parent <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;timeline&gt;</code>.
 Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (seconds); 5] ms (milliseconds)</a:documentation>
                <choice>
                   <value>d</value>
@@ -7735,7 +7888,8 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </optional>
          <optional>
             <attribute name="since">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the reference point for determining the time of the current <code xmlns="http://www.w3.org/1999/xhtml">&lt;when&gt;</code> element, which is obtained by adding the interval to the time of the reference point.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the reference point for determining the time of the current <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;when&gt;</code> element, which is obtained by adding the interval to the time of the reference point.</a:documentation>
                <data type="anyURI">
                   <param name="pattern">\S+</param>
                </data>
@@ -7761,7 +7915,8 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </optional>
          <optional>
             <attribute name="unit">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time corresponding to the <code xmlns="http://www.w3.org/1999/xhtml">@interval</code> value of the timeline or of its constituent points in time.
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time corresponding to the <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@interval</code> value of the timeline or of its constituent points in time.
 Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (seconds); 5] ms (milliseconds)</a:documentation>
                <choice>
                   <value>d</value>
@@ -7838,7 +7993,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </optional>
          <optional>
             <attribute name="weights">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">If <code xmlns="http://www.w3.org/1999/xhtml">@mode</code> is excl, each weight states the probability that the corresponding alternative occurs. If <code xmlns="http://www.w3.org/1999/xhtml">@mode</code> is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs.</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">If <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is excl, each weight states the probability that the corresponding alternative occurs. If <code xmlns="http://www.w3.org/1999/xhtml"
+                        xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs.</a:documentation>
                <list>
                   <data type="double"/>
                   <data type="double"/>
@@ -7853,7 +8010,8 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_altGrp">
       <element name="altGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml">&lt;alt&gt;</code> elements and possibly pointers. [16.8. Alternation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> elements and possibly pointers. [16.8. Alternation]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.descLike"/>
@@ -7890,10 +8048,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <ref name="t_model.standOffPart"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-standOff-nested_standOff_should_be_typed-constraint-assert-15">
             <rule context="tei:standOff">
                <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            xmlns:xi="http://www.w3.org/2001/XInclude"
                            test="@type or not(ancestor::tei:standOff)">This
@@ -7910,7 +8068,11 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_listAnnotation">
       <element name="listAnnotation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a list of annotations, typically encoded as <code xmlns="http://www.w3.org/1999/xhtml">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml">&lt;listAnnotation&gt;</code> elements. [16.10. The standOff Container]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a list of annotations, typically encoded as <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;listAnnotation&gt;</code> elements. [16.10. The standOff Container]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.headLike"/>
@@ -7934,7 +8096,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_annotation">
       <element name="annotation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents an annotation following the <a xmlns="http://www.w3.org/1999/xhtml" href="#WADM">Web
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents an annotation following the <a xmlns="http://www.w3.org/1999/xhtml"
+               xmlns:rng="http://relaxng.org/ns/structure/1.0"
+               href="#WADM">Web
       Annotation Data Model</a>. [16.10. The standOff Container]</a:documentation>
          <group>
             <zeroOrMore>
@@ -8026,7 +8190,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_TEI">
       <element name="TEI">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="t_teiHeader"/>
             <choice>
@@ -8349,10 +8516,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-report-22">
             <rule context="tei:div">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
@@ -8360,10 +8527,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-report-23">
             <rule context="tei:div">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0"
                            xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                            test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
         Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd
index e80d5ca43..93e9788c1 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,220 @@
         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="namesdates" include="persName placeName orgName"/>
+
+        <elementRef key="gi"/>
+        <elementRef key="att"/>
+        <elementRef key="val"/>
+
+        <elementSpec module="linking" ident="join" mode="delete"/>
+        <elementSpec module="linking" ident="joinGrp" mode="delete"/>
         
+        <classSpec ident="att.lexicographic" mode="delete" type="atts"/>
         
-            <moduleRef key="textstructure" except="div1 div2 div3 div4 div5 div6 div7"/>
+        <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>
         
-            <moduleRef key="namesdates" include="persName placeName orgName"/>
+        <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>
         
-	           <elementRef key="gi"/>
-	           <elementRef key="att"/>
-	           <elementRef key="val"/>
+        <elementSpec module="core" ident="note" mode="change">
+          <attList>
+            <attDef ident="anchored" mode="delete"/>
+          </attList>
+        </elementSpec>
 
-	
-	           <elementSpec module="linking" ident="join" mode="delete"/>
-	           <elementSpec module="linking" ident="joinGrp" mode="delete"/>
+        <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>
 
-        
-            <classSpec ident="att.lexicographic" mode="delete" type="atts"/>
+        <?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>          
         
-            <classSpec ident="att.datable.custom" mode="delete" type="atts"/>
-            <classSpec ident="att.datable.iso" mode="delete" type="atts"/>
-
+        <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>
         
-            <classSpec ident="att.typed" type="atts" mode="change">
-               <attList>
-                  <attDef ident="subtype" mode="delete"/>
-               </attList>
-            </classSpec>
-
+        <elementSpec ident="biblStruct" module="core" mode="delete"/>
         
-            <classSpec ident="att.global.linking" type="atts" mode="change">
-               <attList>
-	                 <attDef ident="synch" mode="delete"/>
-               </attList>
-            </classSpec>
-
+        <elementSpec ident="w" module="linking" mode="change">
+          <attList>
+            <attDef ident="ana" mode="change" usage="req"/>
+          </attList>
+        </elementSpec>
         
-            <elementSpec module="core" ident="list" mode="change">
-               <classes mode="change">
-                  <memberOf key="att.typed" mode="delete"/>
-               </classes>
-            </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 module="core" ident="note" mode="change">
-               <attList>
-                  <attDef ident="anchored" mode="delete"/>
-               </attList>
-            </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="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?>
-
-	
-	           <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="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 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>
+
+        <!--
+            Change the content of <ab> just to test <anyElement> with
+            @minOccurs and @maxOccurs. The <gb> elements are there to
+            “gather” the <anyElement>s into groups. — Syd, 2023-10-02
+        -->
+        <elementSpec ident="ab" module="linking" mode="change">
+          <content>
+	    <!-- plain, just for reference -->
+            <anyElement                            />         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+	    <!-- min=0, max=various -->
+            <anyElement minOccurs="0" maxOccurs="1"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="0" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="0" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="0" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+	    <!-- min=1, max=various -->
+            <anyElement minOccurs="1" maxOccurs="1"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="1" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="1" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="1" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+	    <!-- min=2, max=various -->
+            <anyElement minOccurs="2" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="2" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="2" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+	    <!-- min=4, max=various -->
+            <anyElement minOccurs="4" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
+            <anyElement minOccurs="4" maxOccurs="unbounded"/>
+          </content>
+        </elementSpec>
 
-         </schemaSpec>
-      </body>
-      <back>
+      </schemaSpec>
+    </body>
+    <back>
     </back>
   </text>
 </TEI>
diff --git a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
index 88bb2c197..578e13203 100644
--- a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
+++ b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
@@ -111,6 +111,144 @@
           that <choice><orig>especial</orig><reg>special</reg></choice>
           <choice><corr>order</corr><sic>oder</sic></choice>.</p>
       </div>
+
+      <div>
+	<head>Testing <att>minOccurs</att> and <att>maxOccurs</att> on <gi>anyElement</gi></head>
+	<ab xmlns:tst1="http://www.tei-c.org/ns/testMin" xmlns:tst2="http://www.tei-c.org/ns/test_min" n="mins">
+	  <!-- plain, just for reference -->
+	  <tst1:plain/>
+	  <gb n="above matches 1 to 1"/>
+	  <!-- min=0, max=various -->
+	  <gb n="above matches 0 to 1"/>
+	  <gb n="above matches 0 to 2"/>
+	  <gb n="above matches 0 to 6"/>
+	  <gb n="above matches 0 to ∞"/>
+	  <!-- min=1, max=various -->
+	  <tst2:one_to_one/>
+	  <gb n="above matches 1 to 1"/>
+	  <tst1:one_to_two/>
+	  <gb n="above matches 1 to 2"/>
+	  <tst2:one_to_six/>
+	  <gb n="above matches 1 to 6"/>
+	  <tst1:one_to_inf/>
+	  <gb n="above matches 1 to ∞"/>
+	  <!-- min=2, max=various -->
+	  <tst2:two_to_two/> <tst1:two_to_two/>
+	  <gb n="above matches 2 to 2"/>
+	  <tst2:two_to_six/> <tst1:two_to_six/>
+	  <gb n="above matches 2 to 6"/>
+	  <tst2:two_to_inf/> <tst1:two_to_inf/>
+	  <gb n="above matches 2 to ∞"/>
+	  <!-- min=4, max=various -->
+	  <tst2:four_to_six/> <tst1:four_to_six/>
+	  <tst2:four_to_six/> <tst1:four_to_six/>
+	  <gb n="above matches 4 to 6"/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <gb n="above matches 4 to ∞"/>
+	</ab>
+
+	<ab xmlns:tst1="http://www.tei-c.org/ns/test_mid" xmlns:tst2="http://www.tei-c.org/ns/testMid" n="mids">
+	  <!-- plain, just for reference -->
+	  <tst2:plain/>
+	  <gb n="above matches 1 to 1"/>
+	  <!-- min=0, max=various -->
+	  <tst1:zero_to_one/>
+	  <gb n="above matches 0 to 1"/>
+	  <tst2:zero_to_two/>
+	  <gb n="above matches 0 to 2"/>
+	  <tst1:zero_to_six/>
+	  <tst2:zero_to_six/>
+	  <tst1:zero_to_six/>
+	  <gb n="above matches 0 to 6"/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <gb n="above matches 0 to ∞"/>
+	  <!-- min=1, max=various -->
+	  <tst2:one_to_one/>
+	  <gb n="above matches 1 to 1"/>
+	  <tst1:one_to_two/>
+	  <gb n="above matches 1 to 2"/>
+	  <tst2:one_to_six/>
+	  <tst1:one_to_six/>
+	  <tst2:one_to_six/>
+	  <gb n="above matches 1 to 6"/>
+	  <tst1:one_to_inf/> <tst2:one_to_inf/>
+	  <tst1:one_to_inf/> <tst2:one_to_inf/>
+	  <gb n="above matches 1 to ∞"/>
+	  <!-- min=2, max=various -->
+	  <tst1:two_to_two/> <tst2:two_to_two/>
+	  <gb n="above matches 2 to 2"/>
+	  <tst1:two_to_six/> <tst2:two_to_six/>
+	  <tst1:two_to_six/> <tst2:two_to_six/>
+	  <gb n="above matches 2 to 6"/>
+	  <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/>
+	  <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/>
+	  <gb n="above matches 2 to ∞"/>
+	  <!-- min=4, max=various -->
+	  <tst1:four_to_six/> <tst2:four_to_six/> <tst1:four_to_six/>
+	  <tst2:four_to_six/> <tst1:four_to_six/>
+	  <gb n="above matches 4 to 6"/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <gb n="above matches 4 to ∞"/>
+	</ab>
+
+	<ab xmlns:tst1="http://www.tei-c.org/ns/test_max" xmlns:tst2="http://www.tei-c.org/ns/testMax" n="maxs">
+	  <!-- plain, just for reference -->
+	  <tst2:plain/>
+	  <gb n="above matches 1 to 1"/>
+	  <!-- min=0, max=various -->
+	  <tst1:zero_to_one/>
+	  <gb n="above matches 0 to 1"/>
+	  <tst2:zero_to_two/> <tst1:zero_to_two/>
+	  <gb n="above matches 0 to 2"/>
+	  <tst2:zero_to_six/> <tst1:zero_to_six/> <tst2:zero_to_six/>
+	  <tst1:zero_to_six/> <tst2:zero_to_six/> <tst1:zero_to_six/>
+	  <gb n="above matches 0 to 6"/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
+	  <gb n="above matches 0 to ∞"/>
+	  <!-- min=1, max=various -->
+	  <tst2:one_to_one/>
+	  <gb n="above matches 1 to 1"/>
+	  <tst1:one_to_two/> <tst2:one_to_two/>
+	  <gb n="above matches 1 to 2"/>
+	  <tst1:one_to_six/> <tst2:one_to_six/> <tst1:one_to_six/>
+	  <tst2:one_to_six/> <tst1:one_to_six/> <tst2:one_to_six/>
+	  <gb n="above matches 1 to 6"/>
+	  <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/>
+	  <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/>
+	  <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/>
+	  <gb n="above matches 1 to ∞"/>
+	  <!-- min=2, max=various -->
+	  <tst2:two_to_two/> <tst1:two_to_two/>
+	  <gb n="above matches 2 to 2"/>
+	  <tst2:two_to_six/> <tst1:two_to_six/> <tst2:two_to_six/>
+	  <tst1:two_to_six/> <tst2:two_to_six/> <tst1:two_to_six/>
+	  <gb n="above matches 2 to 6"/>
+	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
+	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
+	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
+	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
+	  <gb n="above matches 2 to ∞"/>
+	  <!-- min=4, max=various -->
+	  <tst2:four_to_six/> <tst1:four_to_six/> <tst2:four_to_six/>
+	  <tst1:four_to_six/> <tst2:four_to_six/> <tst1:four_to_six/>
+	  <gb n="above matches 4 to 6"/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
+	  <gb n="above matches 4 to ∞"/>
+	</ab>
+
+      </div>
+
     </body>
   </text>
 </TEI>
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index fc425c21a..2689513cb 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
@@ -58,7 +58,7 @@ of this software, even if advised of the possibility of such damage.
          <p>Copyright: 2013, TEI Consortium</p>
       </desc>
    </doc>
-  <xsl:output encoding="utf-8" indent="yes" method="xml"/>
+  <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
   <xsl:key name="PATTERNS" match="rng:define[rng:element/@name]" use="'true'"/>
   <xsl:key name="XPATTERNS" match="rng:define[rng:element/@name]" use="@name"/>
   <xsl:key name="REFED" match="rng:ref" use="@name"/>
@@ -158,8 +158,7 @@ of this software, even if advised of the possibility of such damage.
             <xsl:call-template name="copyright"/>
           </xsl:comment>
           <xsl:if test="not($rng//sch:ns[@prefix='tei'])">
-            <sch:ns prefix="tei"
-              uri="http://www.tei-c.org/ns/1.0"/>
+            <sch:ns prefix="tei" uri="http://www.tei-c.org/ns/1.0"/>
           </xsl:if>
           <xsl:copy-of select="$rng"/>
         </grammar>
@@ -179,6 +178,9 @@ of this software, even if advised of the possibility of such damage.
           <xsl:apply-templates mode="tangle" select="."/>
         </xsl:for-each>
         <xsl:for-each select=".//tei:anyElement">
+          <xsl:if test="$verbose eq 'true'">
+            <xsl:message select="'DEBUG: calling anyElement template for #'||position()||' from schemaSpecBody template'"/>
+          </xsl:if>
           <xsl:call-template name="anyElement"/>
         </xsl:for-each>
         <xsl:apply-templates mode="tangle" select="tei:elementSpec|tei:classSpec"/>
@@ -213,6 +215,9 @@ of this software, even if advised of the possibility of such damage.
     <!-- in 2nd and 3rd  passes, throw away any RNG <define> elements
       which do not have a <ref>, any <ref> which has no <define>
       to point to, and any empty <choice> -->
+    <xsl:if test="$verbose eq 'true'">
+      <xsl:message select="'DEBUG: multi-pass time from schemaSpecBody template!'"/>
+    </xsl:if>
     <xsl:variable name="pass2">
       <xsl:for-each select="$pass1/root">
         <root>
@@ -220,10 +225,25 @@ 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:template>
+    <xsl:variable name="pass3">
+      <xsl:for-each select="$pass2/root">
+        <xsl:apply-templates mode="pass3"/>
+      </xsl:for-each>
+    </xsl:variable>
+    <xsl:if test="$verbose eq 'true'">
+      <xsl:message select="'DEBUG: div it up from within schemaSpecBody template'"/>
+      <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass1">
+        <xsl:copy-of select="$pass1"/>
+      </rng:div>      
+      <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass2">
+        <xsl:copy-of select="$pass2"/>
+      </rng:div>      
+      <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass3">
+        <xsl:copy-of select="$pass3"/>
+      </rng:div>
+    </xsl:if>
+    <xsl:sequence select="$pass3"/>
+</xsl:template>
 
   <xsl:template match="tei:moduleSpec">
       <xsl:if test="@ident and not(@mode='change' or @mode='replace' or   @mode='delete')">
@@ -242,7 +262,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"/>
@@ -275,6 +295,9 @@ of this software, even if advised of the possibility of such damage.
     <xsl:if test="@type='core'">
       <xsl:call-template name="predeclare-classes"/>
       <xsl:for-each select="//tei:anyElement">
+        <xsl:if test="$verbose eq 'true'">
+          <xsl:message select="'DEBUG: calling anyElement template for #'||position()||' from moduleSpec-body template'"/>
+        </xsl:if>
         <xsl:call-template name="anyElement"/>
       </xsl:for-each>
     </xsl:if>
@@ -299,7 +322,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 +332,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>
@@ -367,6 +390,9 @@ of this software, even if advised of the possibility of such damage.
         <xsl:otherwise>http://www.tei-c.org/ns/1.0 teix:egXML</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
+    <xsl:if test="$verbose eq 'true'">
+      <xsl:message select="'DEBUG: in anyElement template, set id='||$id"/>
+    </xsl:if>
     <define name="{$id}" xmlns="http://relaxng.org/ns/structure/1.0">
       <element>
         <anyName>
@@ -477,12 +503,12 @@ 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>
@@ -550,20 +576,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 +611,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 +652,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,28 +676,31 @@ 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>
 
   <xsl:template match="rng:define" mode="pass3">
+    <xsl:if test="$verbose eq 'true'">
+      <xsl:message select="'DEBUG: defining ---------'||@name||' with combine='||@combine"/>
+      <xsl:message select="'DEBUG: REFED('||@name||')='||exists(key('REFED',@name))"/>
+      <xsl:message select="'DEBUG: XPAT…('||@name||')='||exists(key('XPATTERNS',@name))"/>
+      <xsl:message select="'DEBUG: '||count(key('DEFED',@name))"></xsl:message>
+    </xsl:if>
     <xsl:choose>
-      <xsl:when test="key('REFED',@name) or
-        key('XPATTERNS',@name)">
+      <xsl:when test="key('REFED',@name) or key('XPATTERNS',@name)">
         <xsl:choose>
           <xsl:when test="count(key('DEFED',@name))=1 or @combine='choice'">
-            <define xmlns="http://relaxng.org/ns/structure/1.0" >
-              <xsl:apply-templates  select="@*"    mode="pass3"/>
-              <xsl:apply-templates  select="*|processing-instruction()|comment()|text()"
-                mode="pass3"/>
-            </define>
+            <xsl:copy>
+              <xsl:apply-templates select="@*|node()" mode="pass3"/>
+            </xsl:copy>
           </xsl:when>
           <xsl:otherwise>
             <xsl:variable name="others">
@@ -680,11 +709,9 @@ of this software, even if advised of the possibility of such damage.
               </xsl:for-each>
             </xsl:variable>
             <xsl:if test="count(ancestor::rng:div)     &lt; max($others/*)">
-              <define xmlns="http://relaxng.org/ns/structure/1.0" >
-                <xsl:apply-templates  select="@*"    mode="pass3"/>
-                <xsl:apply-templates  select="*|processing-instruction()|comment()|text()"
-                  mode="pass3"/>
-              </define>
+              <xsl:copy>
+                <xsl:apply-templates select="@*|node()" mode="pass3"/>
+              </xsl:copy>
             </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 366507105..1a54c58b6 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -239,7 +239,7 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
 
   <xsl:template match="rng:ref" mode="#default tangle">
-    <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{tei:generateRefPrefix(.)}"/>
+    <rng:ref name="{tei:generateRefPrefix(.)}"/>
   </xsl:template>
   
   <xsl:template match="rng:*"  mode="#default tangle">
@@ -257,10 +257,10 @@ of this software, even if advised of the possibility of such damage.
         <xsl:apply-templates select="rng:*|tei:*|text()|comment()"/>
       </xsl:when>
       <xsl:otherwise>
-        <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0" >
+        <rng:zeroOrMore>
           <xsl:copy-of select="@*"/>
           <xsl:apply-templates select="rng:*|tei:*|text()|comment()"/>
-        </zeroOrMore>
+        </rng:zeroOrMore>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -272,10 +272,10 @@ of this software, even if advised of the possibility of such damage.
         <xsl:apply-templates select="a:*|rng:*|tei:*|text()|comment()"/>
       </xsl:when>
       <xsl:otherwise>
-        <choice xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:choice>
           <xsl:copy-of select="@*"/>
           <xsl:apply-templates select="a:*|rng:*|tei:*|text()|comment()"/>
-        </choice>
+        </rng:choice>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -297,10 +297,10 @@ of this software, even if advised of the possibility of such damage.
         <xsl:choose>
           <xsl:when test="$that=$this"/>
           <xsl:otherwise>
-            <group xmlns="http://relaxng.org/ns/structure/1.0">
+            <rng:group>
               <xsl:copy-of select="@*"/>
               <xsl:apply-templates select="rng:*|tei:*|text()|comment()"/>
-            </group>
+            </rng:group>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
@@ -330,15 +330,49 @@ of this software, even if advised of the possibility of such damage.
     <xsl:variable name="spec" select="ancestor::tei:elementSpec|ancestor::tei:macroSpec"/>
     <!-- "owe" = occurence wrapper element -->
     <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
-    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
+    <?tei winita UPDATING for #627 here — Syd, 2023-10-01 ?>
+    <xsl:variable name="repeatMe" as="element()+">
+      <rng:ref name="{concat('anyElement-',$spec/@ident)}"/>
+    </xsl:variable>
+    <xsl:call-template name="repeat_as_needed">
+      <xsl:with-param name="repeatMe" select="$repeatMe" as="element()+"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="repeat_as_needed">
+    <xsl:param name="repeatMe" as="element()+"/>
+    <xsl:variable name="norMinMax" select="tei:norMinMax(.)" as="item()+"/>
+    <xsl:variable name="min" select="$norMinMax[1]"/>
+    <xsl:variable name="max" select="$norMinMax[2]"/>
+    <xsl:variable name="owe" select="$norMinMax[3]"/>
     <xsl:choose>
-      <xsl:when test="string-length($owe) eq 0">
-        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{concat('anyElement-',$spec/@ident)}"/>
-      </xsl:when>
-      <xsl:otherwise>
+      <!-- Handle min=0 max=1, min=0 max=unbounded, and min=1 max=unbounded all in one feel swoop: -->
+      <xsl:when test="string-length($owe) ne 0">
         <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)}"/>
+          <xsl:copy-of select="$repeatMe"/>
         </xsl:element>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- a more complex case -->
+        <xsl:if test="$min gt 0">
+          <xsl:for-each select="1 to $min">
+            <xsl:copy-of select="$repeatMe"/>
+          </xsl:for-each>
+        </xsl:if>
+        <xsl:choose>
+          <xsl:when test="$max eq -1"><!-- i.e., unbounded -->
+            <rng:zeroOrMore>
+              <xsl:copy-of select="$repeatMe"/>
+            </rng:zeroOrMore>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:for-each select="$min+1 to $max">
+              <rng:optional>
+                <xsl:copy-of select="$repeatMe"/>
+              </rng:optional>
+            </xsl:for-each>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -346,11 +380,11 @@ of this software, even if advised of the possibility of such damage.
   <xsl:template match="tei:attRef" mode="tangle">  
     <xsl:choose>
       <xsl:when test="key('IDENTS',@class)">
-        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{tei:generateAttRef(.,$generalPrefix)}"/>
+        <rng:ref name="{tei:generateAttRef(.,$generalPrefix)}"/>
       </xsl:when>
       <xsl:when test="@class"/>
       <xsl:otherwise>
-        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{@name}"/>
+        <rng:ref name="{@name}"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -371,10 +405,10 @@ of this software, even if advised of the possibility of such damage.
           <xsl:call-template name="makeAnAttribute"/>
         </xsl:when>
         <xsl:when test="ancestor::tei:classSpec">
-          <define xmlns="http://relaxng.org/ns/structure/1.0"
+          <rng:define
             name="{$element}.attribute.{translate(@ident,':','')}">
             <xsl:call-template name="makeAnAttribute"/>
-          </define>
+          </rng:define>
         </xsl:when>
       </xsl:choose>
     </xsl:if>
@@ -388,19 +422,19 @@ of this software, even if advised of the possibility of such damage.
     <xsl:choose>
       <xsl:when test="count(*)=0"/>
       <xsl:when test="@org='group' and         parent::tei:attList[@org='choice']">
-        <group xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:group>
           <xsl:apply-templates mode="tangle" select="tei:*">
             <xsl:with-param name="element" select="$element"/>
           </xsl:apply-templates>
-        </group>
+        </rng:group>
       </xsl:when>
 
       <xsl:when test="@org='choice'">
-        <choice xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:choice>
           <xsl:apply-templates mode="tangle" select="tei:*">
             <xsl:with-param name="element" select="$element"/>
           </xsl:apply-templates>
-        </choice>
+        </rng:choice>
       </xsl:when>
 
       <xsl:otherwise>
@@ -471,32 +505,32 @@ of this software, even if advised of the possibility of such damage.
                   </xsl:for-each>
                   <xsl:for-each select="tei:attList//tei:attDef[not(@mode='delete')]">
                     <xsl:if test="not(starts-with(@ident,'xmlns'))">
-                      <ref xmlns="http://relaxng.org/ns/structure/1.0"
+                      <rng:ref
                         name="{$c}.attribute.{translate(@ident,':','')}"/>
                     </xsl:if>
                   </xsl:for-each>
                   <xsl:for-each select="tei:attList//tei:attRef">
                     <xsl:choose>
                       <xsl:when test="key('LOCALIDENTS',@class)">
-                        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{tei:generateAttRef(.,$generalPrefix)}"/>
+                        <rng:ref name="{tei:generateAttRef(.,$generalPrefix)}"/>
                       </xsl:when>
                       <xsl:when test="@class"/>
                       <xsl:otherwise>
-                        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{@name}"/>
+                        <rng:ref name="{@name}"/>
                       </xsl:otherwise>
                     </xsl:choose>
                   </xsl:for-each>
                 </ROOT>
               </xsl:variable>
-              <define xmlns="http://relaxng.org/ns/structure/1.0"
+              <rng:define
                 name="{$c}.attributes">
                 <xsl:for-each select="$contents/ROOT">
                   <xsl:apply-templates mode="justcopy"/>
                   <xsl:if test="not($contents/ROOT/*)">
-                    <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
+                    <rng:empty/>
                   </xsl:if>
                 </xsl:for-each>
-              </define>
+              </rng:define>
               <xsl:apply-templates mode="tangle" select="tei:attList//tei:attDef">
                 <xsl:with-param name="element" select="$c"/>
               </xsl:apply-templates>
@@ -616,13 +650,13 @@ of this software, even if advised of the possibility of such damage.
     <xsl:choose>
       <xsl:when test="$declare='true'">
         <xsl:apply-templates mode="tangleModel" select="tei:classes/tei:memberOf"/>
-        <define xmlns="http://relaxng.org/ns/structure/1.0"
+        <rng:define
           name="{$localprefix}{$thisClass}{$suffix}">
           <xsl:if test="@predeclare='true'">
             <xsl:attribute name="combine">choice</xsl:attribute>
           </xsl:if>
-          <notAllowed xmlns="http://relaxng.org/ns/structure/1.0"/>
-        </define>
+          <rng:notAllowed/>
+        </rng:define>
       </xsl:when>
       <xsl:otherwise>
         <xsl:variable name="makeDecls">
@@ -652,7 +686,7 @@ select="$makeDecls"/></xsl:message>
               <xsl:message> .... ... generate model <xsl:value-of select="$thisClass"/>
                 <xsl:value-of select="$suffix"/> (<xsl:value-of select="$type"/>) </xsl:message>
             </xsl:if>
-            <define xmlns="http://relaxng.org/ns/structure/1.0"
+            <rng:define
               name="{$localprefix}{$thisClass}{$suffix}">
               <xsl:choose>
                 <xsl:when test="$type='sequence'">
@@ -666,63 +700,63 @@ select="$makeDecls"/></xsl:message>
                 </xsl:when>
                 <xsl:when test="$type='sequenceOptional'">
                   <xsl:for-each select="key('CLASSMEMBERS',$thisClass)">
-                    <optional xmlns="http://relaxng.org/ns/structure/1.0">
+                    <rng:optional>
                       <xsl:apply-templates select="."  mode="classmember">
                         <xsl:with-param name="theClass" select="$thisClass"/>
                         <xsl:with-param name="suffix" select="$type"/>
                       </xsl:apply-templates>
-                    </optional>
+                    </rng:optional>
                   </xsl:for-each>
                 </xsl:when>
 
                 <xsl:when test="$type='sequenceRepeatable'">
                   <xsl:for-each select="key('CLASSMEMBERS',$thisClass)">
-                    <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+                    <rng:oneOrMore>
                       <xsl:apply-templates select="."  mode="classmember">
                         <xsl:with-param name="theClass" select="$thisClass"/>              
                         <xsl:with-param name="suffix" select="$type"/>
                       </xsl:apply-templates>
-                    </oneOrMore>
+                    </rng:oneOrMore>
                   </xsl:for-each>
                 </xsl:when>
 
                 <xsl:when test="$type='sequenceOptionalRepeatable'">
                   <xsl:for-each select="key('CLASSMEMBERS',$thisClass)">
-                    <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+                    <rng:zeroOrMore>
                       <xsl:apply-templates select="." mode="classmember">
                         <xsl:with-param name="suffix" select="$type"/>
                         <xsl:with-param name="theClass" select="$thisClass"/>
                       </xsl:apply-templates>
-                    </zeroOrMore>
+                    </rng:zeroOrMore>
                   </xsl:for-each>
                 </xsl:when>
 
                 <xsl:otherwise>
-                  <choice xmlns="http://relaxng.org/ns/structure/1.0">
+                  <rng:choice>
                     <xsl:for-each select="key('CLASSMEMBERS',$thisClass)">
                       <xsl:apply-templates select="." mode="classmember">
                         <xsl:with-param name="suffix" select="$type"/>
                         <xsl:with-param name="theClass" select="$thisClass"/>
                       </xsl:apply-templates>
                     </xsl:for-each>
-                  </choice>
+                  </rng:choice>
                 </xsl:otherwise>
               </xsl:choose>
-            </define>
+            </rng:define>
           </xsl:when>
           <xsl:otherwise>
-            <define xmlns="http://relaxng.org/ns/structure/1.0"
+            <rng:define
               name="{$localprefix}{$thisClass}{$suffix}">
               <xsl:choose>
                 <xsl:when
                   test="$type='sequence' or     $type='sequenceOptional' or      $type='sequenceOptionalRepeatable'">
-                  <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
+                  <rng:empty/>
                 </xsl:when>
                 <xsl:otherwise>
-                  <notAllowed xmlns="http://relaxng.org/ns/structure/1.0"/>
+                  <rng:notAllowed/>
                 </xsl:otherwise>
               </xsl:choose>
-            </define>
+            </rng:define>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:otherwise>
@@ -800,10 +834,10 @@ select="$makeDecls"/></xsl:message>
 
     <xsl:choose>
       <xsl:when test="$suffix='' or $suffix='NULL'">
-        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$localprefix}{@ident}"/>
+        <rng:ref name="{$localprefix}{@ident}"/>
       </xsl:when>
       <xsl:otherwise>
-        <ref xmlns="http://relaxng.org/ns/structure/1.0"
+        <rng:ref
              name="{$localprefix}{@ident}_{$suffix}"/>
       </xsl:otherwise>
     </xsl:choose>
@@ -834,13 +868,13 @@ select="$makeDecls"/></xsl:message>
     <xsl:variable name="ident" select="@ident"/>
     
     <xsl:for-each select="for $i in 1 to $mini return $i">
-      <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$elementPrefix}{$ident}"/>
+      <rng:ref name="{$elementPrefix}{$ident}"/>
     </xsl:for-each> 
     <xsl:choose>
       <xsl:when test="$max='unbounded'">
-        <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$elementPrefix}{$ident}"/>
-        </zeroOrMore>
+        <rng:zeroOrMore>
+          <rng:ref name="{$elementPrefix}{$ident}"/>
+        </rng:zeroOrMore>
       </xsl:when>
       <xsl:otherwise>
         <xsl:variable name="maxi" as="xs:integer">
@@ -850,9 +884,9 @@ select="$makeDecls"/></xsl:message>
           </xsl:choose>
         </xsl:variable>
         <xsl:for-each select="for $i in ($mini+1) to $maxi return $i">
-          <optional xmlns="http://relaxng.org/ns/structure/1.0">
-            <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$elementPrefix}{$ident}"/>
-          </optional>
+          <rng:optional>
+            <rng:ref name="{$elementPrefix}{$ident}"/>
+          </rng:optional>
         </xsl:for-each>
       </xsl:otherwise>
     </xsl:choose> 
@@ -882,15 +916,15 @@ select="$makeDecls"/></xsl:message>
           <xsl:variable name="name" select="tei:createSpecName(.)"/>
           <xsl:choose>
             <xsl:when test="tei:content/rng:notAllowed">
-              <define xmlns="http://relaxng.org/ns/structure/1.0" name="{$elementPrefix}{@ident}">
-                <notAllowed xmlns="http://relaxng.org/ns/structure/1.0"/>
-              </define>
+              <rng:define name="{$elementPrefix}{@ident}">
+                <rng:notAllowed/>
+              </rng:define>
             </xsl:when>
             <xsl:otherwise>
               <xsl:variable name="Attributes">
                 <xsl:call-template name="summarizeAttributes"/>
               </xsl:variable>
-              <define xmlns="http://relaxng.org/ns/structure/1.0" name="{$elementPrefix}{@ident}">
+              <rng:define name="{$elementPrefix}{@ident}">
                 <element name="{$name}" xmlns="http://relaxng.org/ns/structure/1.0">
                   <xsl:if test="@ns">
                     <xsl:attribute name="ns">
@@ -920,17 +954,17 @@ select="$makeDecls"/></xsl:message>
                     </xsl:otherwise>
                   </xsl:choose>
                 </element>
-              </define>
+              </rng:define>
               <xsl:if test="$parameterize = 'true'">
-                <define xmlns="http://relaxng.org/ns/structure/1.0"
+                <rng:define
                   name="{$elementPrefix}{@ident}.content">
                   <xsl:call-template name="defineContent"/>
-                </define>
+                </rng:define>
                 <xsl:if test="not($Attributes = '')">
-                  <define xmlns="http://relaxng.org/ns/structure/1.0"
+                  <rng:define
                     name="{$elementPrefix}{@ident}.localattributes">
                     <xsl:call-template name="defineAttributes"/>
-                  </define>
+                  </rng:define>
                 </xsl:if>
                 <xsl:apply-templates mode="tangleModel" select="tei:classes/tei:memberOf"/>
               </xsl:if>
@@ -970,12 +1004,12 @@ select="$makeDecls"/></xsl:message>
     </xsl:if>
     <xsl:if test="$parameterize='true'">
       <xsl:if test="$autoGlobal='true'">
-        <ref xmlns="http://relaxng.org/ns/structure/1.0" name="att.global.attributes"/>
+        <rng:ref name="att.global.attributes"/>
       </xsl:if>
       <xsl:for-each select="tei:classes/tei:memberOf">
         <xsl:for-each select="key('CLASSES',@key)">
           <xsl:if test="@type='atts'">
-            <ref xmlns="http://relaxng.org/ns/structure/1.0">
+            <rng:ref>
               <xsl:attribute name="name">
                 <xsl:choose>
                   <xsl:when test="@prefix">
@@ -988,7 +1022,7 @@ select="$makeDecls"/></xsl:message>
                 <xsl:value-of select="@ident"/>
                 <xsl:text>.attributes</xsl:text>
               </xsl:attribute>
-            </ref>
+            </rng:ref>
           </xsl:if>
         </xsl:for-each>
       </xsl:for-each>
@@ -1000,7 +1034,7 @@ select="$makeDecls"/></xsl:message>
     </xsl:apply-templates>
     <!-- place holder to make sure something gets into the
       pattern -->
-    <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
+    <rng:empty/>
   </xsl:template>
 
   <xsl:template name="defineContent">
@@ -1024,7 +1058,7 @@ select="$makeDecls"/></xsl:message>
     </xsl:variable>
     <xsl:choose>
       <xsl:when test="count($Contents/TEMPTREE/*)=0">
-        <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
+        <rng:empty/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:for-each select="$Contents/TEMPTREE">
@@ -1037,18 +1071,18 @@ select="$makeDecls"/></xsl:message>
 
 
   <xsl:template name="valListChildren">
-    <choice xmlns="http://relaxng.org/ns/structure/1.0">
+    <rng:choice>
       <xsl:for-each select="tei:valList/tei:valItem">
-        <value xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:value>
           <xsl:value-of select="tei:createSpecName(.)"/>
-        </value>
+        </rng:value>
         <xsl:if test="not($oddmode='tei')">
           <a:documentation>
             <xsl:sequence select="tei:makeDescription(., true(), true())"/>
           </a:documentation>
         </xsl:if>
       </xsl:for-each>
-    </choice>
+    </rng:choice>
   </xsl:template>
 
 
@@ -1097,9 +1131,9 @@ select="$makeDecls"/></xsl:message>
             <xsl:apply-templates select="tei:content/* | tei:content/processing-instruction()"/>
           </xsl:when>
           <xsl:when test="tei:content/rng:group">
-            <choice xmlns="http://relaxng.org/ns/structure/1.0">
+            <rng:choice>
               <xsl:apply-templates select="tei:content/rng:group/*"/>
-            </choice>
+            </rng:choice>
           </xsl:when>
           <xsl:when test="tei:content/tei:*">
             <xsl:apply-templates select="tei:content/tei:*" mode="tangle"/>
@@ -1142,7 +1176,7 @@ select="$makeDecls"/></xsl:message>
           <xsl:with-param name="grammar">true</xsl:with-param>
           <xsl:with-param name="content">
             <Wrapper>
-              <define xmlns="http://relaxng.org/ns/structure/1.0" name="{$macroPrefix}{@ident}">
+              <rng:define name="{$macroPrefix}{@ident}">
                 <xsl:if test="$parameterize = 'true'">
                   <xsl:if test="starts-with(@ident, 'macro.component') or @predeclare = 'true'">
                     <xsl:attribute name="combine">choice</xsl:attribute>
@@ -1153,23 +1187,23 @@ select="$makeDecls"/></xsl:message>
                     <xsl:apply-templates mode="justcopy" select="$entityContent/TEMPTREE/node()"/>
                   </xsl:when>
                   <xsl:when test="$entityCount = 0">
-                    <choice xmlns="http://relaxng.org/ns/structure/1.0">
-                      <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
-                    </choice>
+                    <rng:choice>
+                      <rng:empty/>
+                    </rng:choice>
                   </xsl:when>
                   <xsl:when test="$entityCount = 1">
                     <xsl:apply-templates mode="justcopy" select="$entityContent/TEMPTREE/node()"/>
                   </xsl:when>
                   <xsl:when test="tei:content/rng:text | tei:content/rng:ref">
-                    <choice xmlns="http://relaxng.org/ns/structure/1.0">
+                    <rng:choice>
                       <xsl:apply-templates mode="justcopy" select="$entityContent/TEMPTREE/node()"/>
-                    </choice>
+                    </rng:choice>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:apply-templates mode="justcopy" select="$entityContent/TEMPTREE/node()"/>
                   </xsl:otherwise>
                 </xsl:choose>
-              </define>
+              </rng:define>
             </Wrapper>
           </xsl:with-param>
         </xsl:call-template>
@@ -1231,14 +1265,14 @@ select="$makeDecls"/></xsl:message>
         <Wrapper>
           <xsl:choose>
             <xsl:when test="@url and $parameterize='true'">
-              <include xmlns="http://relaxng.org/ns/structure/1.0" href="{@url}">
+              <rng:include href="{@url}">
                 <xsl:apply-templates mode="justcopy"  select="tei:content/*"/>
-              </include>
+              </rng:include>
             </xsl:when>
             <xsl:when test="@url and $parameterize='false'">
               <xsl:comment>Start of import of <xsl:value-of select="@url"/>
               </xsl:comment>
-              <div xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:div>
                 <xsl:choose>
                   <xsl:when test="doc-available(resolve-uri(@url,$BASE))">
                     <xsl:for-each select="doc(resolve-uri(@url,$BASE))/rng:grammar">
@@ -1263,12 +1297,12 @@ select="$makeDecls"/></xsl:message>
                   </xsl:otherwise>
                 </xsl:choose>
                 <xsl:apply-templates mode="justcopy"  select="tei:content/*"/>
-              </div>
+              </rng:div>
               <xsl:comment>End of import of <xsl:value-of select="@url"/>
               </xsl:comment>
             </xsl:when>
             <xsl:otherwise>
-              <include xmlns="http://relaxng.org/ns/structure/1.0"
+              <rng:include
                 href="{$schemaBaseURL}{$This}.rng">
                 <xsl:attribute name="ns">
                   <xsl:choose>
@@ -1281,7 +1315,7 @@ select="$makeDecls"/></xsl:message>
                 <xsl:for-each select="../tei:*[@module=$This and not(@mode='add')]">
                   <xsl:apply-templates mode="tangle" select="."/>
                 </xsl:for-each>
-              </include>
+              </rng:include>
             </xsl:otherwise>
           </xsl:choose>
         </Wrapper>
@@ -1303,14 +1337,14 @@ select="$makeDecls"/></xsl:message>
       <xsl:message> .... import <xsl:value-of select="@href"/></xsl:message>
     </xsl:if>
     <xsl:comment>Start of import of <xsl:value-of select="@href"/></xsl:comment>
-    <div xmlns="http://relaxng.org/ns/structure/1.0">
+    <rng:div>
     <xsl:for-each
           select="doc(resolve-uri(@href,base-uri(/)))/rng:grammar">
         <xsl:apply-templates mode="expandRNG" select="@*|node()">
           <xsl:with-param name="prefix" select="$prefix"/>
         </xsl:apply-templates>
       </xsl:for-each>
-    </div>
+    </rng:div>
     <xsl:apply-templates mode="expandRNG" select="node()"/>
     <xsl:comment>End of import of <xsl:value-of select="@href"/>
     </xsl:comment>
@@ -1418,9 +1452,9 @@ select="$makeDecls"/></xsl:message>
         <xsl:call-template name="valListChildren"/>
       </xsl:when>
       <xsl:when test="tei:valList[@type='semi']">
-        <choice xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:choice>
           <xsl:for-each select="tei:valList/tei:valItem">
-            <value xmlns="http://relaxng.org/ns/structure/1.0">
+            <rng:value>
               <xsl:choose>
                 <xsl:when test="tei:altIdent=@ident">
                   <xsl:value-of select="@ident"/>
@@ -1432,7 +1466,7 @@ select="$makeDecls"/></xsl:message>
                   <xsl:value-of select="@ident"/>
                 </xsl:otherwise>
               </xsl:choose>
-            </value>
+            </rng:value>
             <xsl:if test="not($oddmode='tei')">
               <a:documentation>
                 <xsl:sequence select="tei:makeDescription(., true(), true())"/>
@@ -1441,22 +1475,22 @@ select="$makeDecls"/></xsl:message>
           </xsl:for-each>
           <xsl:choose>
             <xsl:when test="tei:datatype/rng:ref[@name='data.enumerated']">
-              <data xmlns="http://relaxng.org/ns/structure/1.0" type="Name"/>
+              <rng:data type="Name"/>
             </xsl:when>
             <xsl:when test="not(tei:datatype)">
-              <data xmlns="http://relaxng.org/ns/structure/1.0" type="Name"/>
+              <rng:data type="Name"/>
             </xsl:when>
             <xsl:otherwise>
               <xsl:apply-templates select="tei:datatype/*"/>
             </xsl:otherwise>
           </xsl:choose>
-        </choice>
+        </rng:choice>
       </xsl:when>
       <xsl:when test="tei:datatype/*">
         <xsl:apply-templates select="tei:datatype/*"/>
       </xsl:when>
       <xsl:otherwise>
-        <text xmlns="http://relaxng.org/ns/structure/1.0"/>
+        <rng:text/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -1476,7 +1510,7 @@ select="$makeDecls"/></xsl:message>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <attribute xmlns="http://relaxng.org/ns/structure/1.0" name="{$name}">
+    <rng:attribute name="{$name}">
       <xsl:if test="@ns">
         <xsl:copy-of select="@ns"/>
       </xsl:if>
@@ -1495,9 +1529,9 @@ select="$makeDecls"/></xsl:message>
       <xsl:variable name="max" select="$norMinMax[2]"/>
       <xsl:choose>
         <xsl:when test="$min eq 0 and $max eq 1">
-          <optional xmlns="http://relaxng.org/ns/structure/1.0">
+          <rng:optional>
             <xsl:call-template name="attributeData"/>
-          </optional>
+          </rng:optional>
         </xsl:when>
         <xsl:when test="tei:datatype/rng:text  or  not( tei:datatype ) or $max eq 1">
           
@@ -1535,14 +1569,14 @@ select="$makeDecls"/></xsl:message>
           <!-- current node, but since I didn't write 'attributeData', I've -->
           <!-- chosen this method so I don't have to muck with it. —Syd -->
           <xsl:variable name="thisNode" select="."/>
-          <list xmlns="http://relaxng.org/ns/structure/1.0">
+          <rng:list>
             <xsl:choose>
               <xsl:when test="$max eq -1 (: i.e., unbounded :)  and  $min eq 1">
-                <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+                <rng:oneOrMore>
                   <xsl:for-each select="$thisNode">
                     <xsl:call-template name="attributeData"/>
                   </xsl:for-each>
-                </oneOrMore>
+                </rng:oneOrMore>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:if test="$min gt 0">
@@ -1554,28 +1588,28 @@ select="$makeDecls"/></xsl:message>
                 </xsl:if>
                 <xsl:choose>
                   <xsl:when test="$max eq -1"><!-- i.e., unbounded -->
-                    <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+                    <rng:zeroOrMore>
                       <xsl:for-each select="$thisNode">
                         <xsl:call-template name="attributeData"/>
                       </xsl:for-each>
-                    </zeroOrMore>
+                    </rng:zeroOrMore>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:for-each select="$min+1 to $max">
-                      <optional xmlns="http://relaxng.org/ns/structure/1.0">
+                      <rng:optional>
                         <xsl:for-each select="$thisNode">
                           <xsl:call-template name="attributeData"/>
                         </xsl:for-each>
-                      </optional>
+                      </rng:optional>
                     </xsl:for-each>
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:otherwise>
             </xsl:choose>
-          </list>
+          </rng:list>
         </xsl:otherwise>
       </xsl:choose>
-    </attribute>
+    </rng:attribute>
   </xsl:template>
 
   <xsl:template name="makeAnAttribute">
@@ -1589,9 +1623,9 @@ select="$makeDecls"/></xsl:message>
       </xsl:when>
 -->
       <xsl:otherwise>
-        <optional xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:optional>
           <xsl:call-template name="makeSimpleAttribute"/>
-        </optional>
+        </rng:optional>
       </xsl:otherwise>
     </xsl:choose>
     
@@ -1789,10 +1823,10 @@ select="$makeDecls"/></xsl:message>
             </xsl:choose>
             <xsl:value-of select="@ident"/>
           </xsl:variable>
-          <define xmlns="http://relaxng.org/ns/structure/1.0" combine="choice"
+          <rng:define combine="choice"
             name="{$c}.attributes">
-            <empty xmlns="http://relaxng.org/ns/structure/1.0"/>
-          </define>
+            <rng:empty/>
+          </rng:define>
         </Wrapper>
       </xsl:with-param>
     </xsl:call-template>
@@ -2096,7 +2130,7 @@ select="$makeDecls"/></xsl:message>
   </xsl:template>
 
   <xsl:template match="tei:textNode"   mode="#default tangle">
-    <text xmlns="http://relaxng.org/ns/structure/1.0"/>
+    <rng:text/>
   </xsl:template>
 
   <xsl:template match="tei:alternate"  mode="#default tangle">
@@ -2105,15 +2139,15 @@ select="$makeDecls"/></xsl:message>
     <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
     <xsl:choose>
       <xsl:when test="string-length($owe) eq 0">
-        <choice xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:choice>
           <xsl:apply-templates mode="tangle"/>
-        </choice>
+        </rng:choice>
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="{$owe}" namespace="http://relaxng.org/ns/structure/1.0">
-          <choice xmlns="http://relaxng.org/ns/structure/1.0">
+          <rng:choice>
             <xsl:apply-templates mode="tangle"/>
-          </choice>
+          </rng:choice>
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>
@@ -2148,7 +2182,7 @@ select="$makeDecls"/></xsl:message>
           </xsl:for-each>
         </xsl:when>
         <xsl:when test="not(@expand)">
-          <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{$prefixedName}"/>
+          <rng:ref name="{$prefixedName}"/>
         </xsl:when>
         <xsl:when test="@expand='sequence'">
           <xsl:for-each select="key('CLASSMEMBERS',$this)">
@@ -2163,41 +2197,41 @@ select="$makeDecls"/></xsl:message>
         <xsl:when test="@expand='sequenceOptional'">
           <xsl:for-each select="key('CLASSMEMBERS',$this)">
             <xsl:if test="tei:includeMember(@ident,$except,$include)">
-              <optional xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:optional>
                 <xsl:apply-templates select="." mode="classmember">
                   <xsl:with-param name="theClass" select="$this"/>
                   <xsl:with-param name="suffix" select="@expand"/>
                 </xsl:apply-templates>
-              </optional>
+              </rng:optional>
             </xsl:if>
           </xsl:for-each>
         </xsl:when>
         <xsl:when test="@expand='sequenceRepeatable'">
           <xsl:for-each select="key('CLASSMEMBERS',$this)">
             <xsl:if test="tei:includeMember(@ident,$except,$include)">        
-              <oneOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:oneOrMore>
                 <xsl:apply-templates select="." mode="classmember">
                   <xsl:with-param name="theClass" select="$this"/>
                   <xsl:with-param name="suffix" select="@expand"/>
                 </xsl:apply-templates>
-              </oneOrMore>
+              </rng:oneOrMore>
             </xsl:if>
           </xsl:for-each>
         </xsl:when>
         <xsl:when test="@expand='sequenceOptionalRepeatable'">
           <xsl:for-each select="key('CLASSMEMBERS',$this)">
             <xsl:if test="tei:includeMember(@ident,$except,$include)">        
-              <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:zeroOrMore>
                 <xsl:apply-templates select="." mode="classmember">
                   <xsl:with-param name="suffix" select="@expand"/>
                   <xsl:with-param name="theClass" select="$this"/>
                 </xsl:apply-templates>
-              </zeroOrMore>
+              </rng:zeroOrMore>
             </xsl:if>
           </xsl:for-each>
         </xsl:when>
         <xsl:otherwise>
-          <choice xmlns="http://relaxng.org/ns/structure/1.0">
+          <rng:choice>
             <xsl:for-each select="key('CLASSMEMBERS',$this)">
               <xsl:if test="tei:includeMember(@ident,$except,$include)">
                 <xsl:apply-templates select="." mode="classmember">
@@ -2206,7 +2240,7 @@ select="$makeDecls"/></xsl:message>
                 </xsl:apply-templates>
               </xsl:if>
             </xsl:for-each>
-          </choice>
+          </rng:choice>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
@@ -2221,12 +2255,12 @@ select="$makeDecls"/></xsl:message>
       </xsl:when>
       <xsl:otherwise>
         <xsl:variable name="count" select="$max - $min"/>
-        <group xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:group>
           <xsl:choose>
             <xsl:when test="$min eq 0">
-              <optional xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:optional>
                 <xsl:copy-of select="$c"/>
-              </optional>
+              </rng:optional>
             </xsl:when>
             <xsl:otherwise>
               <xsl:for-each select="1 to min( ( $min, $maxint ) )">
@@ -2236,19 +2270,19 @@ select="$makeDecls"/></xsl:message>
           </xsl:choose>
           <xsl:choose>
             <xsl:when test="$max eq -1">
-              <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:zeroOrMore>
                 <xsl:if test="$min gt $maxint">
                   <a:documentation> ODD calls for a minimum of <xsl:value-of select="$min"/> occurrences </a:documentation>
                 </xsl:if>
                 <xsl:copy-of select="$c"/>
-              </zeroOrMore>
+              </rng:zeroOrMore>
             </xsl:when>
             <xsl:when test="$count ge $maxint">
-              <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
+              <rng:zeroOrMore>
                 <a:documentation> ODD calls for <xsl:value-of
                   select="concat( $min, ' required followed by ',$count)"/> optional occurrences </a:documentation>
                 <xsl:copy-of select="$c"/>
-              </zeroOrMore>
+              </rng:zeroOrMore>
             </xsl:when>
             <xsl:otherwise>
               <xsl:call-template name="generateDeterministicOptionals">
@@ -2257,7 +2291,7 @@ select="$makeDecls"/></xsl:message>
               </xsl:call-template>
             </xsl:otherwise>
           </xsl:choose>
-        </group>
+        </rng:group>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -2273,10 +2307,10 @@ select="$makeDecls"/></xsl:message>
           <li>3) a string that conforms to xs:NCName, the name of the RELAX NG element that
           should be used to generate this number of occurences, if any; one of "optional",
           "oneOrMore", "zeroOrMore", or '' (the empty string)</li>
-	  <li>4) a 0- or 1-character long string, the occurence
-	  indicator that should be used to generate this number of
-	  occurences in a DTD, if any; one of '?', '+', '*', or ''
-	  (the empty string)</li>
+          <li>4) a 0- or 1-character long string, the occurence
+          indicator that should be used to generate this number of
+          occurences in a DTD, if any; one of '?', '+', '*', or ''
+          (the empty string)</li>
         </ul>
       </p>
     </desc>
@@ -2284,9 +2318,9 @@ select="$makeDecls"/></xsl:message>
   <xsl:function name="tei:norMinMax" as="item()+">
     <xsl:param name="me" as="element()"/>
     <!-- get the value of @minOccurs, defaulting to "1" -->
-    <xsl:variable name="minOccurs" select="( $me/@minOccurs, '1')[1]"/>
+    <xsl:variable name="minOccurs" select="if ( $me/@minOccurs!normalize-space() ne '') then $me/@minOccurs!normalize-space() else '1'"/>
     <!-- get the value of @maxOccurs, defaulting to "1" -->
-    <xsl:variable name="maxOccurs" select="( $me/@maxOccurs, '1')[1]"/>
+    <xsl:variable name="maxOccurs" select="if ( $me/@maxOccurs!normalize-space() ne '') then $me/@maxOccurs!normalize-space() else '1'"/>
     <!-- We now have two _string_ representations of the attrs, but -->
     <!-- we need integers. So cast them, converting "unbounded" to  -->
     <!-- a special flag value (-1): -->
@@ -2319,8 +2353,8 @@ select="$makeDecls"/></xsl:message>
     <xsl:variable name="RelaxOccurenceWrapperElementName" as="xs:string">
       <xsl:choose>
         <xsl:when test="$min eq 0  and  $max eq  1">optional</xsl:when>
-        <xsl:when test="$min ge 1  and  $max eq -1">oneOrMore</xsl:when>
         <xsl:when test="$min eq 0  and  $max eq -1">zeroOrMore</xsl:when>
+        <xsl:when test="$min eq 1  and  $max eq -1">oneOrMore</xsl:when>
         <xsl:otherwise><xsl:text/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
@@ -2329,11 +2363,11 @@ select="$makeDecls"/></xsl:message>
     -->
     <xsl:variable name="DTD_occurence_indicator" as="xs:string?">
       <xsl:choose>
-	<xsl:when test="$me/tei:textNode | $me/rng:text">*</xsl:when>
-	<xsl:when test="$min eq 0  and  $max eq  1">?</xsl:when>
-	<xsl:when test="$min eq 0  and  $max eq -1">*</xsl:when>
-	<xsl:when test="$min ge 1  and  $max eq -1">+</xsl:when>
-	<xsl:otherwise></xsl:otherwise>
+        <xsl:when test="$me/tei:textNode | $me/rng:text">*</xsl:when>
+        <xsl:when test="$min eq 0  and  $max eq  1">?</xsl:when>
+        <xsl:when test="$min eq 0  and  $max eq -1">*</xsl:when>
+        <xsl:when test="$min eq 1  and  $max eq -1">+</xsl:when>
+        <xsl:otherwise></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:sequence select="( $min, $max, $RelaxOccurenceWrapperElementName, $DTD_occurence_indicator )"/>
@@ -2373,13 +2407,13 @@ select="$makeDecls"/></xsl:message>
     <xsl:choose>
       <xsl:when test="$count le 0"/>
       <xsl:otherwise>
-        <optional xmlns="http://relaxng.org/ns/structure/1.0">
+        <rng:optional>
           <xsl:copy-of select="$c"/>
           <xsl:call-template name="generateDeterministicOptionals">
             <xsl:with-param name="count" select="$count - 1"/>
             <xsl:with-param name="c" select="$c"/>
           </xsl:call-template>
-        </optional>
+        </rng:optional>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

From f2805640db88011c8fc1623a8f1d0831bbacfd5e Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 8 Oct 2023 08:13:21 -0400
Subject: [PATCH 05/50] Still NOT ready to be merged into dev: In this commit I
 intended to comment out some debugging code (which renders output kinda
 useless, is it sticks the results of each pass into the output as RELAXNG
 <div> elements, rather than as comments) and update some tests. But I found
 to my horror that (despite message of previous 3 commits) tests were not
 passing. So lots of test updates, too. NB: One of the things that makes this
 ineligible for merging into dev is that the constraint for the <choice>
 element has changed from the incorrect, but workable '( model.choicePart |
 choice )+' to the incorrect and *not* workable '( model.choicePart | choice
 )+'. At the moment I have no idea why, but it does not really matter, as
 attacking minOccurs= and maxOccurs= on <alternate> and <sequence> is next.

---
 Test/expected-results/test.rng                | 274 +++---
 Test/expected-results/test15.odd.rnc          |   2 +-
 Test/expected-results/test21.odd.rnc          |   2 +-
 Test/expected-results/test30.dtd              |   2 +-
 Test/expected-results/test30.rnc              |   2 +-
 Test/expected-results/test33.rnc              |   2 +-
 Test/expected-results/test34.rnc              |   2 +-
 Test/expected-results/test35.rnc              |   2 +-
 Test2/expected-results/testPure1.rng          | 783 +++++++++++++++---
 .../testPure1InvalidInstanceRngMessages.txt   |   2 +-
 Test2/inputFiles/testPure1.odd                | 199 ++++-
 .../validInstances/testPure1ValidInstance.xml | 508 ++++++++----
 odds/odd2relax.xsl                            |  24 +-
 13 files changed, 1340 insertions(+), 464 deletions(-)

diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index e2a2bd35c..4ac339802 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xlink="http://www.w3.org/1999/xlink" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://www.tei-c.org/ns/1.0">
   
   <!---->
@@ -242,7 +242,7 @@
   <define name="att.ranging.attribute.confidence">
     <optional>
       <attribute name="confidence">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
         <data type="double"/>
       </attribute>
     </optional>
@@ -334,7 +334,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
   <define name="att.written.attribute.hand">
     <optional>
       <attribute name="hand">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml">&lt;handNote&gt;</code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
         <data type="anyURI">
           <param name="pattern">\S+</param>
         </data>
@@ -362,7 +362,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   <define name="att.damaged.attribute.degree">
     <optional>
       <attribute name="degree">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a coded representation of the degree of damage, either as a number between 0 (undamaged) and 1 (very extensively damaged), or as one of the codes high, medium, low, or unknown. The <code xmlns="http://www.w3.org/1999/xhtml">&lt;damage&gt;</code> element with the <code xmlns="http://www.w3.org/1999/xhtml">@degree</code> attribute should only be used where the text may be read with some confidence; text supplied from other sources should be tagged as <code xmlns="http://www.w3.org/1999/xhtml">&lt;supplied&gt;</code>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a coded representation of the degree of damage, either as a number between 0 (undamaged) and 1 (very extensively damaged), or as one of the codes high, medium, low, or unknown. The <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;damage&gt;</code> element with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@degree</code> attribute should only be used where the text may be read with some confidence; text supplied from other sources should be tagged as <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;supplied&gt;</code>.</a:documentation>
         <choice>
           <data type="double"/>
           <choice>
@@ -406,7 +406,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   <define name="att.cReferencing.attribute.cRef">
     <optional>
       <attribute name="cRef">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <code xmlns="http://www.w3.org/1999/xhtml">&lt;refsDecl&gt;</code> element in the TEI header</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;refsDecl&gt;</code> element in the TEI header</a:documentation>
         <data type="string"/>
       </attribute>
     </optional>
@@ -547,7 +547,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   <define name="att.datable.attribute.period">
     <optional>
       <attribute name="period">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml">&lt;category&gt;</code>s or <code xmlns="http://www.w3.org/1999/xhtml">&lt;calendar&gt;</code>s) within which the datable item is understood to have occurred.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;category&gt;</code>s or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;calendar&gt;</code>s) within which the datable item is understood to have occurred.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -566,7 +566,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   <define name="att.datcat.attribute.datcat">
     <optional>
       <attribute name="datcat">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of, and/or general information about, (a) an information container (element or attribute) or (b) a value of an information container (element content or attribute value), by referencing an external taxonomy or ontology. If <code xmlns="http://www.w3.org/1999/xhtml">@valueDatcat</code> is present in the immediate context, this attribute takes on role (a), while <code xmlns="http://www.w3.org/1999/xhtml">@valueDatcat</code> performs role (b).</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of, and/or general information about, (a) an information container (element or attribute) or (b) a value of an information container (element content or attribute value), by referencing an external taxonomy or ontology. If <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@valueDatcat</code> is present in the immediate context, this attribute takes on role (a), while <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@valueDatcat</code> performs role (b).</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -580,7 +580,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   <define name="att.datcat.attribute.valueDatcat">
     <optional>
       <attribute name="valueDatcat">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about a value of an information container (element content or attribute value), by reference to an external taxonomy or ontology. Used especially where a contrast with <code xmlns="http://www.w3.org/1999/xhtml">@datcat</code> is needed.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about a value of an information container (element content or attribute value), by reference to an external taxonomy or ontology. Used especially where a contrast with <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@datcat</code> is needed.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -594,7 +594,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   <define name="att.datcat.attribute.targetDatcat">
     <optional>
       <attribute name="targetDatcat">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about, information structure of an object referenced or modeled by the containing element, by reference to an external taxonomy or ontology. This attribute has the characteristics of the <code xmlns="http://www.w3.org/1999/xhtml">@datcat</code> attribute, except that it addresses not its containing element, but an object that is being referenced or modeled by its containing element.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a definition of, and/or general information about, information structure of an object referenced or modeled by the containing element, by reference to an external taxonomy or ontology. This attribute has the characteristics of the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@datcat</code> attribute, except that it addresses not its containing element, but an object that is being referenced or modeled by its containing element.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -892,7 +892,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
   <define name="att.global.attribute.xmllang">
     <optional>
       <attribute name="xml:lang">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language) indicates the language of the element content using a tag generated according to <a xmlns="http://www.w3.org/1999/xhtml" href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language) indicates the language of the element content using a tag generated according to <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
         <choice>
           <data type="language"/>
           <choice>
@@ -945,7 +945,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
   <define name="att.handFeatures.attribute.scribeRef">
     <optional>
       <attribute name="scribeRef">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;person&gt;</code> element elsewhere in the description.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;person&gt;</code> element elsewhere in the description.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -971,7 +971,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
   <define name="att.handFeatures.attribute.scriptRef">
     <optional>
       <attribute name="scriptRef">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;scriptNote&gt;</code> element elsewhere in the description.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;scriptNote&gt;</code> element elsewhere in the description.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -1139,7 +1139,7 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
   <define name="att.measurement.attribute.unitRef">
     <optional>
       <attribute name="unitRef">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml">&lt;unitDef&gt;</code> element that defines a unit of measure.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;unitDef&gt;</code> element that defines a unit of measure.</a:documentation>
         <data type="anyURI">
           <param name="pattern">\S+</param>
         </data>
@@ -1306,7 +1306,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
   <define name="att.pointing.attribute.targetLang">
     <optional>
       <attribute name="targetLang">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the language of the content to be found at the destination referenced by <code xmlns="http://www.w3.org/1999/xhtml">@target</code>, using a language tag generated according to <a xmlns="http://www.w3.org/1999/xhtml" href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the language of the content to be found at the destination referenced by <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code>, using a language tag generated according to <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</a>.</a:documentation>
         <choice>
           <data type="language"/>
           <choice>
@@ -1380,7 +1380,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
   <define name="att.pointing.group.attribute.targFunc">
     <optional>
       <attribute name="targFunc">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(target function) describes the function of each of the values of the <code xmlns="http://www.w3.org/1999/xhtml">@target</code> attribute of the enclosed <code xmlns="http://www.w3.org/1999/xhtml">&lt;link&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;join&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml">&lt;alt&gt;</code> tags.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(target function) describes the function of each of the values of the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code> attribute of the enclosed <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;link&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> tags.</a:documentation>
         <list>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
@@ -1501,7 +1501,7 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
   <define name="att.styleDef.attribute.schemeVersion">
     <optional>
       <attribute name="schemeVersion">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a version number for the style language provided in <code xmlns="http://www.w3.org/1999/xhtml">@scheme</code>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a version number for the style language provided in <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@scheme</code>.</a:documentation>
         <data type="token">
           <param name="pattern">[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}</param>
         </data>
@@ -1612,7 +1612,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
   <define name="att.citing.attribute.from">
     <optional>
       <attribute name="from">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the starting point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@unit</code> attribute.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the starting point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@unit</code> attribute.</a:documentation>
         <data type="token">
           <param name="pattern">[^\p{C}\p{Z}]+</param>
         </data>
@@ -1622,7 +1622,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
   <define name="att.citing.attribute.to">
     <optional>
       <attribute name="to">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the end-point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@unit</code> attribute.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the end-point of the range of units indicated by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@unit</code> attribute.</a:documentation>
         <data type="token">
           <param name="pattern">[^\p{C}\p{Z}]+</param>
         </data>
@@ -3970,7 +3970,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
   <define name="att.formula.attribute.formula">
     <optional>
       <attribute name="formula">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A <code xmlns="http://www.w3.org/1999/xhtml">@formula</code> is provided to describe a mathematical calculation such as a conversion between measurement systems.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@formula</code> is provided to describe a mathematical calculation such as a conversion between measurement systems.</a:documentation>
         <text/>
       </attribute>
     </optional>
@@ -3981,7 +3981,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
   <define name="att.locatable.attribute.where">
     <optional>
       <attribute name="where">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml">&lt;place&gt;</code> element or other canonical description.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;place&gt;</code> element or other canonical description.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -4094,11 +4094,11 @@ Suggested values include: 1] full (full form); 2] pref (prefix); 3] suff (suffix
 Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] canto; 7] speaker; 8] stanza; 9] act; 10] scene; 11] section; 12] absent; 13] unnumbered</a:documentation>
       <choice>
         <value>page</value>
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">physical page breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;pb&gt;</code> element).</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">physical page breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;pb&gt;</code> element).</a:documentation>
         <value>column</value>
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">column breaks.</a:documentation>
         <value>line</value>
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">line breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;lb&gt;</code> element).</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">line breaks (synonymous with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;lb&gt;</code> element).</a:documentation>
         <value>book</value>
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">any units termed book, liber, etc.</a:documentation>
         <value>poem</value>
@@ -4129,16 +4129,16 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
     <element name="p">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]</a:documentation>
       <ref name="macro.paraContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
         <rule context="tei:p">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
       </sch:report>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
         <rule context="tei:p">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
       </sch:report>
         </rule>
@@ -4335,8 +4335,8 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
     <element name="desc">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
       <ref name="macro.limitedContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
-        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:desc[ @type eq 'deprecationInfo']">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:desc[ @type eq 'deprecationInfo']">
           <sch:assert test="../@validUntil">Information about a
         deprecation should only be present in a specification element
         that is being deprecated: that is, only an element that has a
@@ -4428,9 +4428,9 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-rt-target-rt-target-not-span-constraint-report-8">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-target-rt-target-not-span-constraint-report-8">
         <rule context="tei:rt/@target">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@from | ../@to">When target= is
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@from | ../@to">When target= is
             present, neither from= nor to= should be.</sch:report>
         </rule>
       </pattern>
@@ -4442,9 +4442,9 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-rt-from-rt-from-constraint-assert-7">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-from-rt-from-constraint-assert-7">
         <rule context="tei:rt/@from">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@to">When from= is present, the to=
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@to">When from= is present, the to=
             attribute of <sch:name/> is required.</sch:assert>
         </rule>
       </pattern>
@@ -4456,9 +4456,9 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-rt-to-rt-to-constraint-assert-8">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-to-rt-to-constraint-assert-8">
         <rule context="tei:rt/@to">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@from">When to= is present, the from=
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@from">When to= is present, the from=
             attribute of <sch:name/> is required.</sch:assert>
         </rule>
       </pattern>
@@ -4486,12 +4486,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
   <define name="choice">
     <element name="choice">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]</a:documentation>
-      <oneOrMore>
-        <choice>
-          <ref name="model.choicePart"/>
-          <ref name="choice"/>
-        </choice>
-      </oneOrMore>
+      <choice>
+        <ref name="model.choicePart"/>
+        <ref name="choice"/>
+      </choice>
       <ref name="att.global.attributes"/>
       <empty/>
     </element>
@@ -4897,9 +4895,9 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
     <element name="ptr">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-ptr-ptrAtts-constraint-report-9">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ptr-ptrAtts-constraint-report-9">
         <rule context="tei:ptr">
-          <report xmlns:rng="http://relaxng.org/ns/structure/1.0" test="@target and @cRef">Only one of the
+          <report test="@target and @cRef">Only one of the
 attributes @target and @cRef may be supplied on <name/>.</report>
         </rule>
       </pattern>
@@ -4916,9 +4914,9 @@ attributes @target and @cRef may be supplied on <name/>.</report>
     <element name="ref">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
       <ref name="macro.paraContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-ref-refAtts-constraint-report-10">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ref-refAtts-constraint-report-10">
         <rule context="tei:ref">
-          <report xmlns:rng="http://relaxng.org/ns/structure/1.0" test="@target and @cRef">Only one of the
+          <report test="@target and @cRef">Only one of the
 	attributes @target' and @cRef' may be supplied on <name/>
                </report>
         </rule>
@@ -4984,8 +4982,8 @@ attributes @target and @cRef may be supplied on <name/>.</report>
           </group>
         </zeroOrMore>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-list-gloss-list-must-have-labels-constraint-rule-12">
-        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:list[@type='gloss']">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-list-gloss-list-must-have-labels-constraint-rule-12">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:list[@type='gloss']">
           <sch:assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</sch:assert>
         </sch:rule>
       </pattern>
@@ -4998,7 +4996,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
 Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)</a:documentation>
           <choice>
             <value>gloss</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) each list item glosses some term or concept, which is given by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;label&gt;</code> element preceding the list item.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) each list item glosses some term or concept, which is given by a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;label&gt;</code> element preceding the list item.</a:documentation>
             <value>index</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.</a:documentation>
             <value>instructions</value>
@@ -5182,7 +5180,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.typed.attributes"/>
       <optional>
         <attribute name="encoding">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml" href="http://en.wikipedia.org/wiki/Base64">Base64</a>.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="http://en.wikipedia.org/wiki/Base64">Base64</a>.</a:documentation>
           <list>
             <oneOrMore>
               <data type="token">
@@ -5669,12 +5667,12 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           <ref name="model.ptrLike"/>
         </choice>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-relatedItem-targetorcontent1-constraint-report-11">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-relatedItem-targetorcontent1-constraint-report-11">
         <rule context="tei:relatedItem">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and count( child::* ) &gt; 0">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and count( child::* ) &gt; 0">
 If the @target attribute on <sch:name/> is used, the
 relatedItem element must be empty</sch:report>
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target or child::*">A relatedItem element should have either a 'target' attribute
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target or child::*">A relatedItem element should have either a 'target' attribute
         or a child element to indicate the related bibliographic item</sch:assert>
         </rule>
       </pattern>
@@ -5703,9 +5701,9 @@ relatedItem element must be empty</sch:report>
           <ref name="model.global"/>
         </choice>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-l-abstractModel-structure-l-in-l-constraint-report-12">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-l-abstractModel-structure-l-in-l-constraint-report-12">
         <rule context="tei:l">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
         Abstract model violation: Lines may not contain lines or lg elements.
       </sch:report>
         </rule>
@@ -5751,15 +5749,15 @@ relatedItem element must be empty</sch:report>
           </group>
         </zeroOrMore>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-lg-atleast1oflggapl-constraint-assert-11">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-atleast1oflggapl-constraint-assert-11">
         <rule context="tei:lg">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
         must contain at least one child l, lg, or gap element.</sch:assert>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-lg-abstractModel-structure-lg-in-l-constraint-report-13">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-abstractModel-structure-lg-in-l-constraint-report-13">
         <rule context="tei:lg">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
         Abstract model violation: Lines may not contain line groups.
       </sch:report>
         </rule>
@@ -5864,7 +5862,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
   </define>
   <define name="teiCorpus">
     <element name="teiCorpus">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
       <group>
         <ref name="teiHeader"/>
         <zeroOrMore>
@@ -5948,7 +5946,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
   </define>
   <define name="att.citeStructurePart.attribute.use">
     <attribute name="use">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml">@match</code>, which will either be a sibling attribute in the case of `&lt;citeStructure&gt;` or on the parent `&lt;citeStructure&gt;` in the case of `&lt;citeData&gt;`.</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code>, which will either be a sibling attribute in the case of `&lt;citeStructure&gt;` or on the parent `&lt;citeStructure&gt;` in the case of `&lt;citeData&gt;`.</a:documentation>
       <text/>
     </attribute>
   </define>
@@ -5964,7 +5962,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
   </define>
   <define name="att.patternReplacement.attribute.replacementPattern">
     <attribute name="replacementPattern">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the <code xmlns="http://www.w3.org/1999/xhtml">@matchPattern</code> which, once subpattern substitution has been performed, complete the URI.</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@matchPattern</code> which, once subpattern substitution has been performed, complete the URI.</a:documentation>
       <text/>
     </attribute>
   </define>
@@ -6149,14 +6147,14 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
 Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC</a:documentation>
           <choice>
             <value>ISBN</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml" href="https://www.isbn-international.org"> International ISBN Agency.</a>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://www.isbn-international.org"> International ISBN Agency.</a>
                   </a:documentation>
             <value>ISSN</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.</a:documentation>
             <value>DOI</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.</a:documentation>
             <value>URI</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml" href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
             <value>VIAF</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.</a:documentation>
             <value>ESTC</value>
@@ -6441,9 +6439,9 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       <zeroOrMore>
         <ref name="model.pLike"/>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-quotation-quotationContents-constraint-report-14">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-quotation-quotationContents-constraint-report-14">
         <rule context="tei:quotation">
-          <report xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="not(@marks) and not (tei:p)">
+          <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="not(@marks) and not (tei:p)">
 On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
         </rule>
       </pattern>
@@ -6573,7 +6571,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       <ref name="att.global.attributes"/>
       <optional>
         <attribute name="partial">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates whether the element types listed exhaustively include all those found within <code xmlns="http://www.w3.org/1999/xhtml">&lt;text&gt;</code>, or represent only a subset.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates whether the element types listed exhaustively include all those found within <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;text&gt;</code>, or represent only a subset.</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
@@ -6587,7 +6585,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       <ref name="att.global.attributes"/>
       <ref name="att.datcat.attributes"/>
       <attribute name="gi">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;namespace&gt;</code> element.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;namespace&gt;</code> element.</a:documentation>
         <data type="Name"/>
       </attribute>
       <optional>
@@ -6598,7 +6596,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
       </optional>
       <optional>
         <attribute name="withId">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> attribute.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:id</code> attribute.</a:documentation>
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
@@ -6638,7 +6636,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
       </optional>
       <optional>
         <attribute name="selector">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the <code xmlns="http://www.w3.org/1999/xhtml">@scheme</code> attribute.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@scheme</code> attribute.</a:documentation>
           <data type="string"/>
         </attribute>
       </optional>
@@ -6704,22 +6702,22 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
         </attribute>
       </optional>
       <attribute name="match">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.</a:documentation>
         <text/>
       </attribute>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-citeStructure-match-citestructure-outer-match-constraint-rule-13">
-        <rule xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[not(parent::tei:citeStructure)]">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-outer-match-constraint-rule-13">
+        <rule xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[not(parent::tei:citeStructure)]">
           <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-citeStructure-match-citestructure-inner-match-constraint-rule-14">
-        <rule xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[parent::tei:citeStructure]">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-inner-match-constraint-rule-14">
+        <rule xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[parent::tei:citeStructure]">
           <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
         </rule>
       </pattern>
       <optional>
         <attribute name="unit">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unit) describes the structural unit indicated by the <code xmlns="http://www.w3.org/1999/xhtml">&lt;citeStructure&gt;</code>.
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unit) describes the structural unit indicated by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.
 Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] line; 7] section; 8] verse; 9] volume</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
@@ -6887,7 +6885,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
   </define>
   <define name="catDesc">
     <element name="catDesc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <code xmlns="http://www.w3.org/1999/xhtml">&lt;textDesc&gt;</code>. [2.3.7. The Classification Declaration]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;textDesc&gt;</code>. [2.3.7. The Classification Declaration]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -6902,7 +6900,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
   </define>
   <define name="geoDecl">
     <element name="geoDecl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <code xmlns="http://www.w3.org/1999/xhtml">&lt;geo&gt;</code> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;geo&gt;</code> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.declarable.attributes"/>
@@ -6973,13 +6971,13 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
       <ref name="att.formula.attributes"/>
       <ref name="att.locatable.attributes"/>
       <attribute name="fromUnit">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml">@toUnit</code>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@toUnit</code>.</a:documentation>
         <data type="anyURI">
           <param name="pattern">\S+</param>
         </data>
       </attribute>
       <attribute name="toUnit">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml">@fromUnit</code>.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@fromUnit</code>.</a:documentation>
         <data type="anyURI">
           <param name="pattern">\S+</param>
         </data>
@@ -7099,7 +7097,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
       <ref name="macro.phraseSeq.limited"/>
       <ref name="att.global.attributes"/>
       <attribute name="ident">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) Supplies a language code constructed as defined in <a xmlns="http://www.w3.org/1999/xhtml" href="https://tools.ietf.org/html/bcp47">BCP 47</a> which is used to identify the language documented by this element, and which is referenced by the global <code xmlns="http://www.w3.org/1999/xhtml">@xml:lang</code> attribute.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) Supplies a language code constructed as defined in <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://tools.ietf.org/html/bcp47">BCP 47</a> which is used to identify the language documented by this element, and which is referenced by the global <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@xml:lang</code> attribute.</a:documentation>
         <choice>
           <data type="language"/>
           <choice>
@@ -7144,7 +7142,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
       <ref name="att.global.attributes"/>
       <optional>
         <attribute name="scheme">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
           <data type="anyURI">
             <param name="pattern">\S+</param>
           </data>
@@ -7159,7 +7157,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
       <ref name="macro.phraseSeq.limited"/>
       <ref name="att.global.attributes"/>
       <attribute name="scheme">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or some other resource.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or some other resource.</a:documentation>
         <data type="anyURI">
           <param name="pattern">\S+</param>
         </data>
@@ -7175,7 +7173,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
       <ref name="att.pointing.attributes"/>
       <optional>
         <attribute name="scheme">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;taxonomy&gt;</code> element, or by some other resource.</a:documentation>
           <data type="anyURI">
             <param name="pattern">\S+</param>
           </data>
@@ -7343,7 +7341,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       <ref name="att.typed.attributes"/>
       <optional>
         <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" name="ordered" a:defaultValue="true">
-          <a:documentation>indicates whether the ordering of its child <code xmlns="http://www.w3.org/1999/xhtml">&lt;change&gt;</code> elements is to be considered significant or not</a:documentation>
+          <a:documentation>indicates whether the ordering of its child <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;change&gt;</code> elements is to be considered significant or not</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
@@ -7373,7 +7371,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   <define name="att.global.change.attribute.change">
     <optional>
       <attribute name="change">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to one or more <code xmlns="http://www.w3.org/1999/xhtml">&lt;change&gt;</code> elements documenting a state or revision campaign to which the element bearing this attribute and its children have been assigned by the encoder.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;change&gt;</code> elements documenting a state or revision campaign to which the element bearing this attribute and its children have been assigned by the encoder.</a:documentation>
         <list>
           <oneOrMore>
             <data type="anyURI">
@@ -7499,8 +7497,8 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
           <ref name="back"/>
         </optional>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-facsimile-no_facsimile_text_nodes-constraint-rule-15">
-        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:facsimile//tei:line | tei:facsimile//tei:zone">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-facsimile-no_facsimile_text_nodes-constraint-rule-15">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:facsimile//tei:line | tei:facsimile//tei:zone">
           <sch:report test="child::text()[ normalize-space(.) ne '']">
           A facsimile element represents a text with images, thus
           transcribed text should not be present within it.
@@ -7594,7 +7592,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="zone">
     <element name="zone">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines any two-dimensional area within a <code xmlns="http://www.w3.org/1999/xhtml">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines any two-dimensional area within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -7611,7 +7609,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
       <ref name="att.written.attributes"/>
       <optional>
         <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" name="rotate" a:defaultValue="0">
-          <a:documentation>indicates the amount by which this zone has been rotated clockwise, with respect to the normal orientation of the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;surface&gt;</code> element as implied by the dimensions given in the <code xmlns="http://www.w3.org/1999/xhtml">&lt;msDesc&gt;</code> element or by the coordinates of the <code xmlns="http://www.w3.org/1999/xhtml">&lt;surface&gt;</code> itself. The orientation is expressed in arc degrees.</a:documentation>
+          <a:documentation>indicates the amount by which this zone has been rotated clockwise, with respect to the normal orientation of the parent <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element as implied by the dimensions given in the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;msDesc&gt;</code> element or by the coordinates of the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> itself. The orientation is expressed in arc degrees.</a:documentation>
           <data type="nonNegativeInteger"/>
         </attribute>
       </optional>
@@ -7620,10 +7618,10 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="path">
     <element name="path">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path) defines any line passing through two or more points within a <code xmlns="http://www.w3.org/1999/xhtml">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path) defines any line passing through two or more points within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-path-pathmustnotbeclosed-constraint-rule-16">
-        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:path[@points]">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-path-pathmustnotbeclosed-constraint-rule-16">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:path[@points]">
           <sch:let name="firstPair" value="tokenize( normalize-space( @points ), ' ')[1]"/>
           <sch:let name="lastPair" value="tokenize( normalize-space( @points ), ' ')[last()]"/>
           <sch:let name="firstX" value="xs:float( substring-before( $firstPair, ',') )"/>
@@ -7666,16 +7664,16 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="addSpan">
     <element name="addSpan">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <code xmlns="http://www.w3.org/1999/xhtml">&lt;add&gt;</code>). [11.3.1.4. Additions and Deletions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;add&gt;</code>). [11.3.1.4. Additions and Deletions]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-addSpan-addSpan-requires-spanTo-constraint-assert-14">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-constraint-assert-14">
         <rule context="tei:addSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-addSpan-addSpan-requires-spanTo-fr-constraint-assert-15">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-fr-constraint-assert-15">
         <rule context="tei:addSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
         </rule>
       </pattern>
       <ref name="att.global.attributes"/>
@@ -7701,14 +7699,14 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
     <element name="damageSpan">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-damageSpan-damageSpan-requires-spanTo-constraint-assert-16">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-constraint-assert-16">
         <rule context="tei:damageSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-17">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-17">
         <rule context="tei:damageSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
         </rule>
       </pattern>
       <ref name="att.global.attributes"/>
@@ -7722,14 +7720,14 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
     <element name="delSpan">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [11.3.1.4. Additions and Deletions]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-delSpan-delSpan-requires-spanTo-constraint-assert-18">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-constraint-assert-18">
         <rule context="tei:delSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-delSpan-delSpan-requires-spanTo-fr-constraint-assert-19">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-fr-constraint-assert-19">
         <rule context="tei:delSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
         </rule>
       </pattern>
       <ref name="att.global.attributes"/>
@@ -7772,7 +7770,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="handNotes">
     <element name="handNotes">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one or more <code xmlns="http://www.w3.org/1999/xhtml">&lt;handNote&gt;</code> elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands]</a:documentation>
       <oneOrMore>
         <ref name="handNote"/>
       </oneOrMore>
@@ -7788,7 +7786,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
       <ref name="att.handFeatures.attributes"/>
       <optional>
         <attribute name="new">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a <code xmlns="http://www.w3.org/1999/xhtml">&lt;handNote&gt;</code> element describing the hand concerned.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> element describing the hand concerned.</a:documentation>
           <data type="anyURI">
             <param name="pattern">\S+</param>
           </data>
@@ -7892,9 +7890,9 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
           <ref name="model.milestoneLike"/>
         </choice>
       </oneOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-subst-substContents1-constraint-assert-20">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-subst-substContents1-constraint-assert-20">
         <rule context="tei:subst">
-          <assert xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" test="child::tei:add and (child::tei:del or child::tei:surplus)"><name/> must have at least one child add and at least one child del or surplus</assert>
+          <assert xmlns:xi="http://www.w3.org/2001/XInclude" test="child::tei:add and (child::tei:del or child::tei:surplus)"><name/> must have at least one child add and at least one child del or surplus</assert>
         </rule>
       </pattern>
       <ref name="att.global.attributes"/>
@@ -8536,7 +8534,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="eTree">
     <element name="eTree">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(embedding tree) provides an alternative to the <code xmlns="http://www.w3.org/1999/xhtml">&lt;tree&gt;</code> element for representing ordered rooted tree structures. [19.3. Another Tree Notation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(embedding tree) provides an alternative to the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;tree&gt;</code> element for representing ordered rooted tree structures. [19.3. Another Tree Notation]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8566,7 +8564,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   <define name="triangle">
     <element name="triangle">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(underspecified embedding tree, so called because of its
-  characteristic shape when drawn) provides for an underspecified <code xmlns="http://www.w3.org/1999/xhtml">&lt;eTree&gt;</code>, that is, an <code xmlns="http://www.w3.org/1999/xhtml">&lt;eTree&gt;</code> with information left out. [19.3. Another Tree Notation]</a:documentation>
+  characteristic shape when drawn) provides for an underspecified <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code>, that is, an <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> with information left out. [19.3. Another Tree Notation]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8593,7 +8591,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="eLeaf">
     <element name="eLeaf">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(leaf or terminal node of an embedding tree) provides explicitly for a leaf of an embedding tree, which may also be encoded with the <code xmlns="http://www.w3.org/1999/xhtml">&lt;eTree&gt;</code> element. [19.3. Another Tree Notation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(leaf or terminal node of an embedding tree) provides explicitly for a leaf of an embedding tree, which may also be encoded with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> element. [19.3. Another Tree Notation]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8656,7 +8654,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="TEI">
     <element name="TEI">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
       <group>
         <ref name="teiHeader"/>
         <choice>
@@ -8962,16 +8960,16 @@ Suggested values include: 1] initial; 2] final</a:documentation>
           </group>
         </optional>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-report-17">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-report-17">
         <rule context="tei:div">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
       </sch:report>
         </rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-div-abstractModel-structure-div-in-ab-or-p-constraint-report-18">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-ab-or-p-constraint-report-18">
         <rule context="tei:div">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
         Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
       </sch:report>
         </rule>
@@ -9963,9 +9961,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
     <element name="link">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-link-linkTargets3-constraint-assert-21">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-link-linkTargets3-constraint-assert-21">
         <rule context="tei:link">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
                </sch:assert>
         </rule>
       </pattern>
@@ -9998,9 +9996,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
     <element name="ab">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
       <ref name="macro.abContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-19">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-19">
         <rule context="tei:ab">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
       </sch:report>
         </rule>
@@ -10056,7 +10054,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       </optional>
       <optional>
         <attribute name="unit">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time in which the <code xmlns="http://www.w3.org/1999/xhtml">@interval</code> value is expressed, if this is not inherited from the parent <code xmlns="http://www.w3.org/1999/xhtml">&lt;timeline&gt;</code>.
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time in which the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@interval</code> value is expressed, if this is not inherited from the parent <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;timeline&gt;</code>.
 Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (seconds); 5] ms (milliseconds)</a:documentation>
           <choice>
             <value>d</value>
@@ -10093,7 +10091,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
       </optional>
       <optional>
         <attribute name="since">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the reference point for determining the time of the current <code xmlns="http://www.w3.org/1999/xhtml">&lt;when&gt;</code> element, which is obtained by adding the interval to the time of the reference point.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the reference point for determining the time of the current <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;when&gt;</code> element, which is obtained by adding the interval to the time of the reference point.</a:documentation>
           <data type="anyURI">
             <param name="pattern">\S+</param>
           </data>
@@ -10119,7 +10117,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
       </optional>
       <optional>
         <attribute name="unit">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time corresponding to the <code xmlns="http://www.w3.org/1999/xhtml">@interval</code> value of the timeline or of its constituent points in time.
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the unit of time corresponding to the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@interval</code> value of the timeline or of its constituent points in time.
 Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (seconds); 5] ms (milliseconds)</a:documentation>
           <choice>
             <value>d</value>
@@ -10166,9 +10164,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
           <ref name="model.certLike"/>
         </choice>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-join-joinTargets3-constraint-assert-22">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-join-joinTargets3-constraint-assert-22">
         <rule context="tei:join">
-          <assert xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" test="contains(@target,' ')">
+          <assert xmlns:xi="http://www.w3.org/2001/XInclude" test="contains(@target,' ')">
 You must supply at least two values for @target on <name/>
                </assert>
         </rule>
@@ -10187,9 +10185,9 @@ You must supply at least two values for @target on <name/>
           <a:documentation>indicates whether the targets to be joined include the entire element indicated (the entire subtree including its root), or just the children of the target (the branches of the subtree).</a:documentation>
           <choice>
             <value>root</value>
-            <a:documentation>the rooted subtrees indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@target</code> attribute are joined, each subtree become a child of the virtual element created by the join</a:documentation>
+            <a:documentation>the rooted subtrees indicated by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code> attribute are joined, each subtree become a child of the virtual element created by the join</a:documentation>
             <value>branches</value>
-            <a:documentation>the children of the subtrees indicated by the <code xmlns="http://www.w3.org/1999/xhtml">@target</code> attribute become the children of the virtual element (i.e. the roots of the subtrees are discarded)</a:documentation>
+            <a:documentation>the children of the subtrees indicated by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@target</code> attribute become the children of the virtual element (i.e. the roots of the subtrees are discarded)</a:documentation>
           </choice>
         </attribute>
       </optional>
@@ -10198,7 +10196,7 @@ You must supply at least two values for @target on <name/>
   </define>
   <define name="joinGrp">
     <element name="joinGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(join group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml">&lt;join&gt;</code> elements and possibly pointers. [16.7. Aggregation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(join group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code> elements and possibly pointers. [16.7. Aggregation]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>
@@ -10217,7 +10215,7 @@ You must supply at least two values for @target on <name/>
       <ref name="att.pointing.group.attributes"/>
       <optional>
         <attribute name="result">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies the default value for the <code xmlns="http://www.w3.org/1999/xhtml">@result</code> on each <code xmlns="http://www.w3.org/1999/xhtml">&lt;join&gt;</code> included within the group.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies the default value for the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@result</code> on each <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code> included within the group.</a:documentation>
           <data type="Name"/>
         </attribute>
       </optional>
@@ -10263,7 +10261,7 @@ You must supply at least two values for @target on <name/>
       </optional>
       <optional>
         <attribute name="weights">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">If <code xmlns="http://www.w3.org/1999/xhtml">@mode</code> is excl, each weight states the probability that the corresponding alternative occurs. If <code xmlns="http://www.w3.org/1999/xhtml">@mode</code> is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs.</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">If <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is excl, each weight states the probability that the corresponding alternative occurs. If <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs.</a:documentation>
           <list>
             <data type="double"/>
             <data type="double"/>
@@ -10278,7 +10276,7 @@ You must supply at least two values for @target on <name/>
   </define>
   <define name="altGrp">
     <element name="altGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml">&lt;alt&gt;</code> elements and possibly pointers. [16.8. Alternation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> elements and possibly pointers. [16.8. Alternation]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.descLike"/>
@@ -10312,9 +10310,9 @@ You must supply at least two values for @target on <name/>
       <oneOrMore>
         <ref name="model.standOffPart"/>
       </oneOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-standOff-nested_standOff_should_be_typed-constraint-assert-23">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-standOff-nested_standOff_should_be_typed-constraint-assert-23">
         <rule context="tei:standOff">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@type or not(ancestor::tei:standOff)">This
+          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@type or not(ancestor::tei:standOff)">This
       <sch:name/> element must have a @type attribute, since it is
       nested inside a <sch:name/>
                </sch:assert>
@@ -10328,7 +10326,7 @@ You must supply at least two values for @target on <name/>
   </define>
   <define name="listAnnotation">
     <element name="listAnnotation">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a list of annotations, typically encoded as <code xmlns="http://www.w3.org/1999/xhtml">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml">&lt;listAnnotation&gt;</code> elements. [16.10. The standOff Container]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a list of annotations, typically encoded as <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;listAnnotation&gt;</code> elements. [16.10. The standOff Container]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.headLike"/>
@@ -10352,7 +10350,7 @@ You must supply at least two values for @target on <name/>
   </define>
   <define name="annotation">
     <element name="annotation">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents an annotation following the <a xmlns="http://www.w3.org/1999/xhtml" href="#WADM">Web
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents an annotation following the <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="#WADM">Web
       Annotation Data Model</a>. [16.10. The standOff Container]</a:documentation>
       <group>
         <zeroOrMore>
@@ -10518,7 +10516,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   <define name="att.lexicographic.attribute.location">
     <optional>
       <attribute name="location">
-        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(location) indicates an <code xmlns="http://www.w3.org/1999/xhtml">&lt;anchor&gt;</code> element typically elsewhere in the document, but possibly in another document, which is the original location of this component.</a:documentation>
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(location) indicates an <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;anchor&gt;</code> element typically elsewhere in the document, but possibly in another document, which is the original location of this component.</a:documentation>
         <data type="anyURI">
           <param name="pattern">\S+</param>
         </data>
@@ -11030,7 +11028,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
       <ref name="att.lexicographic.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies grammatical information provided by <code xmlns="http://www.w3.org/1999/xhtml">&lt;gram&gt;</code> according to some convenient and shared typology, ideally one defined in an external reference taxonomy, such as the <a xmlns="http://www.w3.org/1999/xhtml" href="https://www.clarin.eu/content/clarin-concept-registry">CLARIN Concept
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies grammatical information provided by <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;gram&gt;</code> according to some convenient and shared typology, ideally one defined in an external reference taxonomy, such as the <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://www.clarin.eu/content/clarin-concept-registry">CLARIN Concept
           Registry</a>.
 Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number); 4] animate; 5] proper</a:documentation>
           <data type="token">
@@ -11116,7 +11114,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="gramGrp">
     <element name="gramGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information group) groups morpho-syntactic information about a lexical item, e.g. <code xmlns="http://www.w3.org/1999/xhtml">&lt;pos&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;gen&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;number&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml">&lt;case&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml">&lt;iType&gt;</code> (inflectional class). [9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information group) groups morpho-syntactic information about a lexical item, e.g. <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;pos&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;gen&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;number&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;case&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;iType&gt;</code> (inflectional class). [9.3.2. Grammatical Information]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index 5d8dbe21e..a61ac6df6 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -2380,7 +2380,7 @@ choice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element choice {
-    (model.choicePart | choice)+, att.global.attributes, empty
+    (model.choicePart | choice), att.global.attributes, empty
   }
 reg =
   
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index 33cd31fbd..5d80076fa 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -2916,7 +2916,7 @@ choice =
   
   ## (choix) regroupe un certain nombre de balisages alternatifs possibles pour un même endroit dans un texte. [3.5. Simple Editorial Changes]
   element choice {
-    (model.choicePart | choice)+, att.global.attributes, empty
+    (model.choicePart | choice), att.global.attributes, empty
   }
 reg =
   
diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd
index 69eb5b67b..a4b2281c0 100644
--- a/Test/expected-results/test30.dtd
+++ b/Test/expected-results/test30.dtd
@@ -1543,7 +1543,7 @@ Elements] -->
  %Tatt.typed.attributes;
 target CDATA  #IMPLIED >
 <!--doc:(choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes] -->
-<!ELEMENT choice (%model.choicePart;|choice)+>
+<!ELEMENT choice (%model.choicePart;|choice)>
 <!ATTLIST choice xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST choice
  %Tatt.global.attributes; >
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index 0af31fc7c..62d9b8bd3 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -2810,7 +2810,7 @@ Tchoice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element choice {
-    (Tmodel.choicePart | Tchoice)+, Tatt.global.attributes, empty
+    (Tmodel.choicePart | Tchoice), Tatt.global.attributes, empty
   }
 Treg =
   
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index e7a452db1..70eabd463 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -2542,7 +2542,7 @@ tei_choice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element tei:choice {
-    (tei_model.choicePart | tei_choice)+,
+    (tei_model.choicePart | tei_choice),
     tei_att.global.attributes,
     empty
   }
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 2749ee8b6..51d0d255c 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -2547,7 +2547,7 @@ tei_choice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element choice {
-    (tei_model.choicePart | tei_choice)+,
+    (tei_model.choicePart | tei_choice),
     tei_att.global.attributes,
     empty
   }
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index cfba7812e..ec0094d30 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -2542,7 +2542,7 @@ tei_choice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element tei:choice {
-    (tei_model.choicePart | tei_choice)+,
+    (tei_model.choicePart | tei_choice),
     tei_att.global.attributes,
     empty
   }
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index fb7e65c7b..4fb6fa6a5 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -4,6 +4,15 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
          ns="http://www.tei-c.org/ns/1.0">
+   <define name="t_macro.abContent">
+      <zeroOrMore>
+         <choice>
+            <text/>
+            <ref name="t_model.paraPart"/>
+            <ref name="t_ab"/>
+         </choice>
+      </zeroOrMore>
+   </define>
    <define name="t_macro.paraContent">
       <zeroOrMore>
          <choice>
@@ -82,6 +91,300 @@
          </zeroOrMore>
       </element>
    </define>
+   <define name="anyElement-openPara_plain">
+      <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-openPara_plain"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_0_1">
+      <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-openPara_0_1"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_0_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-openPara_0_2"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_0_6">
+      <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-openPara_0_6"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_0_unbounded">
+      <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-openPara_0_unbounded"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_1_1">
+      <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-openPara_1_1"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_1_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-openPara_1_2"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_1_6">
+      <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-openPara_1_6"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_1_unbounded">
+      <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-openPara_1_unbounded"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_2_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-openPara_2_2"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_2_6">
+      <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-openPara_2_6"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_2_unbounded">
+      <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-openPara_2_unbounded"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_4_6">
+      <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-openPara_4_6"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="anyElement-openPara_4_unbounded">
+      <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-openPara_4_unbounded"/>
+            </choice>
+         </zeroOrMore>
+      </element>
+   </define>
    <define name="t_att.anchoring.attributes">
       <ref name="t_att.anchoring.attribute.anchored"/>
       <ref name="t_att.anchoring.attribute.targetEnd"/>
@@ -3039,17 +3342,59 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <choice>
          <ref name="t_p"/>
          <ref name="t_ab"/>
+         <ref name="t_openPara_plain"/>
+         <ref name="t_openPara_0_1"/>
+         <ref name="t_openPara_0_2"/>
+         <ref name="t_openPara_0_6"/>
+         <ref name="t_openPara_0_unbounded"/>
+         <ref name="t_openPara_1_1"/>
+         <ref name="t_openPara_1_2"/>
+         <ref name="t_openPara_1_6"/>
+         <ref name="t_openPara_1_unbounded"/>
+         <ref name="t_openPara_2_2"/>
+         <ref name="t_openPara_2_6"/>
+         <ref name="t_openPara_2_unbounded"/>
+         <ref name="t_openPara_4_6"/>
+         <ref name="t_openPara_4_unbounded"/>
       </choice>
    </define>
    <define name="t_model.pLike_alternation">
       <choice>
          <ref name="t_p"/>
          <ref name="t_ab"/>
+         <ref name="t_openPara_plain"/>
+         <ref name="t_openPara_0_1"/>
+         <ref name="t_openPara_0_2"/>
+         <ref name="t_openPara_0_6"/>
+         <ref name="t_openPara_0_unbounded"/>
+         <ref name="t_openPara_1_1"/>
+         <ref name="t_openPara_1_2"/>
+         <ref name="t_openPara_1_6"/>
+         <ref name="t_openPara_1_unbounded"/>
+         <ref name="t_openPara_2_2"/>
+         <ref name="t_openPara_2_6"/>
+         <ref name="t_openPara_2_unbounded"/>
+         <ref name="t_openPara_4_6"/>
+         <ref name="t_openPara_4_unbounded"/>
       </choice>
    </define>
    <define name="t_model.pLike_sequence">
       <ref name="t_p"/>
       <ref name="t_ab"/>
+      <ref name="t_openPara_plain"/>
+      <ref name="t_openPara_0_1"/>
+      <ref name="t_openPara_0_2"/>
+      <ref name="t_openPara_0_6"/>
+      <ref name="t_openPara_0_unbounded"/>
+      <ref name="t_openPara_1_1"/>
+      <ref name="t_openPara_1_2"/>
+      <ref name="t_openPara_1_6"/>
+      <ref name="t_openPara_1_unbounded"/>
+      <ref name="t_openPara_2_2"/>
+      <ref name="t_openPara_2_6"/>
+      <ref name="t_openPara_2_unbounded"/>
+      <ref name="t_openPara_4_6"/>
+      <ref name="t_openPara_4_unbounded"/>
    </define>
    <define name="t_model.pLike_sequenceOptional">
       <optional>
@@ -3058,6 +3403,48 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <optional>
          <ref name="t_ab"/>
       </optional>
+      <optional>
+         <ref name="t_openPara_plain"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_0_1"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_0_2"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_0_6"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_0_unbounded"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_1_1"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_1_2"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_1_6"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_1_unbounded"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_2_2"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_2_6"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_2_unbounded"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_4_6"/>
+      </optional>
+      <optional>
+         <ref name="t_openPara_4_unbounded"/>
+      </optional>
    </define>
    <define name="t_model.pLike_sequenceOptionalRepeatable">
       <zeroOrMore>
@@ -3066,6 +3453,48 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <zeroOrMore>
          <ref name="t_ab"/>
       </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_plain"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_0_1"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_0_2"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_0_6"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_0_unbounded"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_1_1"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_1_2"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_1_6"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_1_unbounded"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_2_2"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_2_6"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_2_unbounded"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_4_6"/>
+      </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_openPara_4_unbounded"/>
+      </zeroOrMore>
    </define>
    <define name="t_model.pLike_sequenceRepeatable">
       <oneOrMore>
@@ -3074,6 +3503,48 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <oneOrMore>
          <ref name="t_ab"/>
       </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_plain"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_0_1"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_0_2"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_0_6"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_0_unbounded"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_1_1"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_1_2"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_1_6"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_1_unbounded"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_2_2"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_2_6"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_2_unbounded"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_4_6"/>
+      </oneOrMore>
+      <oneOrMore>
+         <ref name="t_openPara_4_unbounded"/>
+      </oneOrMore>
    </define>
    <define name="t_model.stageLike">
       <choice>
@@ -7680,112 +8151,7 @@ The attributes @to and @from on <name/> may each contain only a single value</re
    <define name="t_ab">
       <element name="ab">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
-         <ref name="anyElement-ab"/>
-         <ref name="t_gb"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <zeroOrMore>
-            <ref name="anyElement-ab"/>
-         </zeroOrMore>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <oneOrMore>
-            <ref name="anyElement-ab"/>
-         </oneOrMore>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <zeroOrMore>
-            <ref name="anyElement-ab"/>
-         </zeroOrMore>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <optional>
-            <ref name="anyElement-ab"/>
-         </optional>
-         <ref name="t_gb"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <ref name="anyElement-ab"/>
-         <zeroOrMore>
-            <ref name="anyElement-ab"/>
-         </zeroOrMore>
+         <ref name="t_macro.abContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-21">
@@ -9078,6 +9444,211 @@ Sample values include: 1] TEI (Text Encoding Initiative); 2] DBK (Docbook); 3] X
          <empty/>
       </element>
    </define>
+   <define name="t_openPara_plain">
+      <element name="openPara_plain">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">no <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> nor <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code>
+         </a:documentation>
+         <ref name="anyElement-openPara_plain"/>
+      </element>
+   </define>
+   <define name="t_openPara_0_1">
+      <element name="openPara_0_1">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 1</a:documentation>
+         <optional>
+            <ref name="anyElement-openPara_0_1"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_0_2">
+      <element name="openPara_0_2">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 2</a:documentation>
+         <optional>
+            <ref name="anyElement-openPara_0_2"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_0_2"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_0_6">
+      <element name="openPara_0_6">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
+         <optional>
+            <ref name="anyElement-openPara_0_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_0_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_0_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_0_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_0_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_0_6"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_0_unbounded">
+      <element name="openPara_0_unbounded">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
+         <zeroOrMore>
+            <ref name="anyElement-openPara_0_unbounded"/>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="t_openPara_1_1">
+      <element name="openPara_1_1">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 1</a:documentation>
+         <ref name="anyElement-openPara_1_1"/>
+      </element>
+   </define>
+   <define name="t_openPara_1_2">
+      <element name="openPara_1_2">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 2</a:documentation>
+         <ref name="anyElement-openPara_1_2"/>
+         <optional>
+            <ref name="anyElement-openPara_1_2"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_1_6">
+      <element name="openPara_1_6">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
+         <ref name="anyElement-openPara_1_6"/>
+         <optional>
+            <ref name="anyElement-openPara_1_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_1_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_1_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_1_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_1_6"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_1_unbounded">
+      <element name="openPara_1_unbounded">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
+         <oneOrMore>
+            <ref name="anyElement-openPara_1_unbounded"/>
+         </oneOrMore>
+      </element>
+   </define>
+   <define name="t_openPara_2_2">
+      <element name="openPara_2_2">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 2, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 2</a:documentation>
+         <ref name="anyElement-openPara_2_2"/>
+         <ref name="anyElement-openPara_2_2"/>
+      </element>
+   </define>
+   <define name="t_openPara_2_6">
+      <element name="openPara_2_6">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 2, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
+         <ref name="anyElement-openPara_2_6"/>
+         <ref name="anyElement-openPara_2_6"/>
+         <optional>
+            <ref name="anyElement-openPara_2_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_2_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_2_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_2_6"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_2_unbounded">
+      <element name="openPara_2_unbounded">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 2, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
+         <ref name="anyElement-openPara_2_unbounded"/>
+         <ref name="anyElement-openPara_2_unbounded"/>
+         <zeroOrMore>
+            <ref name="anyElement-openPara_2_unbounded"/>
+         </zeroOrMore>
+      </element>
+   </define>
+   <define name="t_openPara_4_6">
+      <element name="openPara_4_6">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 4, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
+         <ref name="anyElement-openPara_4_6"/>
+         <ref name="anyElement-openPara_4_6"/>
+         <ref name="anyElement-openPara_4_6"/>
+         <ref name="anyElement-openPara_4_6"/>
+         <optional>
+            <ref name="anyElement-openPara_4_6"/>
+         </optional>
+         <optional>
+            <ref name="anyElement-openPara_4_6"/>
+         </optional>
+      </element>
+   </define>
+   <define name="t_openPara_4_unbounded">
+      <element name="openPara_4_unbounded">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
+            <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 4, <code xmlns="http://www.w3.org/1999/xhtml"
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
+         <ref name="anyElement-openPara_4_unbounded"/>
+         <ref name="anyElement-openPara_4_unbounded"/>
+         <ref name="anyElement-openPara_4_unbounded"/>
+         <ref name="anyElement-openPara_4_unbounded"/>
+         <zeroOrMore>
+            <ref name="anyElement-openPara_4_unbounded"/>
+         </zeroOrMore>
+      </element>
+   </define>
    <start>
       <choice>
          <ref name="t_TEI"/>
diff --git a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
index 87a994220..622e44fb4 100644
--- a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
+++ b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
@@ -1,5 +1,5 @@
 /invalidInstances/testPure1InvalidInstance.xml:29:51: error: element "tag" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "bibl", "biblFull", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "desc", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "stage", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w"
-/invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer"
+/invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "openPara_0_1", "openPara_0_2", "openPara_0_6", "openPara_0_unbounded", "openPara_1_1", "openPara_1_2", "openPara_1_6", "openPara_1_unbounded", "openPara_2_2", "openPara_2_6", "openPara_2_unbounded", "openPara_4_6", "openPara_4_unbounded", "openPara_plain", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer"
 /invalidInstances/testPure1InvalidInstance.xml:44:34: error: attribute "synch" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "decls", "exclude", "hand", "n", "next", "part", "prev", "rend", "rendition", "resp", "sameAs", "select", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
 /invalidInstances/testPure1InvalidInstance.xml:50:33: error: attribute "type" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "exclude", "n", "next", "prev", "rend", "rendition", "resp", "sameAs", "select", "sortKey", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
 /invalidInstances/testPure1InvalidInstance.xml:62:47: error: value of attribute "corresp" is invalid; must be an integer
diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd
index 93e9788c1..eb6cf9f3b 100644
--- a/Test2/inputFiles/testPure1.odd
+++ b/Test2/inputFiles/testPure1.odd
@@ -224,34 +224,189 @@
         </elementSpec>
 
         <!--
-            Change the content of <ab> just to test <anyElement> with
-            @minOccurs and @maxOccurs. The <gb> elements are there to
-            “gather” the <anyElement>s into groups. — Syd, 2023-10-02
+            I wanted to change the content of <ab> just to test
+            <anyElement> with @minOccurs and @maxOccurs, using the
+            <gb> element to “gather” the <anyElement>s into
+            groups. (It is commented out below.) But it turns out
+            having > 1 <anyElement> in a content model causes a RELAX
+            NG schema failure; see issue #631 and pull reqeust #632.
+            Since I can’t do that I have here instead created a bunch
+            of new paragraph-level elements that each contain a single
+            <anyElement>.
+            Once #631 is fixed, this entire section can be replaced
+            with the stuff commented out below; same with the
+	    corresponding section of testPure1ValidInstance.xml.
+            Syd — 2023-10-07
         -->
-        <elementSpec ident="ab" module="linking" mode="change">
+        <elementSpec mode="add" ident="openPara_plain">
+          <desc>no <att>minOccurs</att> nor <att>maxOccurs</att></desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement/>
+          </content>
+        </elementSpec>
+
+        <elementSpec mode="add" ident="openPara_0_1">
+          <desc><att>minOccurs</att> 0, <att>maxOccurs</att> 1</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="0" maxOccurs="1"/>
+          </content>
+        </elementSpec>
+
+        <elementSpec mode="add" ident="openPara_0_2">
+          <desc><att>minOccurs</att> 0, <att>maxOccurs</att> 2</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="0" maxOccurs="2"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_0_6">
+          <desc><att>minOccurs</att> 0, <att>maxOccurs</att> 6</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="0" maxOccurs="6"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_0_unbounded">
+          <desc><att>minOccurs</att> 0, <att>maxOccurs</att> unbounded</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="0" maxOccurs="unbounded"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_1_1">
+          <desc><att>minOccurs</att> 1, <att>maxOccurs</att> 1</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="1" maxOccurs="1"/>
+          </content>
+        </elementSpec>
+
+        <elementSpec mode="add" ident="openPara_1_2">
+          <desc><att>minOccurs</att> 1, <att>maxOccurs</att> 2</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="1" maxOccurs="2"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_1_6">
+          <desc><att>minOccurs</att> 1, <att>maxOccurs</att> 6</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="1" maxOccurs="6"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_1_unbounded">
+          <desc><att>minOccurs</att> 1, <att>maxOccurs</att> unbounded</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="1" maxOccurs="unbounded"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_2_2">
+          <desc><att>minOccurs</att> 2, <att>maxOccurs</att> 2</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="2" maxOccurs="2"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_2_6">
+          <desc><att>minOccurs</att> 2, <att>maxOccurs</att> 6</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="2" maxOccurs="6"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_2_unbounded">
+          <desc><att>minOccurs</att> 2, <att>maxOccurs</att> unbounded</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="2" maxOccurs="unbounded"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_4_6">
+          <desc><att>minOccurs</att> 4, <att>maxOccurs</att> 6</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
+          <content>
+            <anyElement minOccurs="4" maxOccurs="6"/>
+          </content>
+        </elementSpec>
+        
+        <elementSpec mode="add" ident="openPara_4_unbounded">
+          <desc><att>minOccurs</att> 4, <att>maxOccurs</att> unbounded</desc>
+          <classes>
+            <memberOf key="model.pLike"/>
+          </classes>
           <content>
-	    <!-- plain, just for reference -->
-            <anyElement                            />         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-	    <!-- min=0, max=various -->
-            <anyElement minOccurs="0" maxOccurs="1"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="0" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="0" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="0" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-	    <!-- min=1, max=various -->
-            <anyElement minOccurs="1" maxOccurs="1"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="1" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="1" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="1" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-	    <!-- min=2, max=various -->
-            <anyElement minOccurs="2" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="2" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-            <anyElement minOccurs="2" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
-	    <!-- min=4, max=various -->
-            <anyElement minOccurs="4" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/>
             <anyElement minOccurs="4" maxOccurs="unbounded"/>
           </content>
         </elementSpec>
 
+        <!-- <!-\- -->
+        <!--     Change the content of <ab> just to test <anyElement> with -->
+        <!--     @minOccurs and @maxOccurs. The <gb> elements are there to -->
+        <!--     “gather” the <anyElement>s into groups. — Syd, 2023-10-02 -->
+        <!-- -\-> -->
+        <!-- <elementSpec ident="ab" module="linking" mode="change"> -->
+        <!--   <content> -->
+        <!--     <!-\- plain, just for reference -\-> -->
+        <!--     <anyElement                            />         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <!-\- min=0, max=various -\-> -->
+        <!--     <anyElement minOccurs="0" maxOccurs="1"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="0" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="0" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="0" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <!-\- min=1, max=various -\-> -->
+        <!--     <anyElement minOccurs="1" maxOccurs="1"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="1" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="1" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="1" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <!-\- min=2, max=various -\-> -->
+        <!--     <anyElement minOccurs="2" maxOccurs="2"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="2" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="2" maxOccurs="unbounded"/> <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <!-\- min=4, max=various -\-> -->
+        <!--     <anyElement minOccurs="4" maxOccurs="6"/>         <elementRef key="gb" minOccurs="1" maxOccurs="1"/> -->
+        <!--     <anyElement minOccurs="4" maxOccurs="unbounded"/> -->
+        <!--   </content> -->
+        <!-- </elementSpec> -->
+
       </schemaSpec>
     </body>
     <back>
diff --git a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
index 578e13203..251ac1995 100644
--- a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
+++ b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
@@ -39,53 +39,53 @@
       </div>
 
       <div>
-	<head>Test of <gi>dataRef</gi></head>
-	<p>I'm not about to try to work <gi>measureGrp</gi> into four
-	clever sentences, so:
-	<list>
-	  <label><att>corresp</att>: <gi>dataRef</gi> w/ <att>key</att></label>
-	  <item><measureGrp corresp="0"/> Should be
-	  valid, as <val>0</val> is a teidata.count
-	  (i.e., non-negative integer.)</item>
-
-	  <label><att>select</att>: <gi>dataRef</gi> w/ <att>name</att></label>
-	  <item><measureGrp select="1"/> Should be valid, as
-	  <val>1</val> is a non-negative integer.</item>
-
-	  <label><att>sameAs</att>: <gi>dataRef</gi> w/ <att>key</att> &amp; <att>restriction</att></label>
-	  <item><measureGrp sameAs="2"/> Should be
-	  valid, as <val>2</val> is a 1- or
-	  2-digit teidata.count (i.e., non-negative
-	  integer).</item>
-
-	  <label><att>copyOf</att>: <gi>dataRef</gi> w/ <att>name</att> &amp; <att>restriction</att></label>
-	  <item><measureGrp copyOf="34"/> Should be valid, as
-	  <val>34</val> is a 1- or 2-digit non-negative
-	  integer.</item>
-	</list>
-	</p>
+        <head>Test of <gi>dataRef</gi></head>
+        <p>I'm not about to try to work <gi>measureGrp</gi> into four
+        clever sentences, so:
+        <list>
+          <label><att>corresp</att>: <gi>dataRef</gi> w/ <att>key</att></label>
+          <item><measureGrp corresp="0"/> Should be
+          valid, as <val>0</val> is a teidata.count
+          (i.e., non-negative integer.)</item>
+
+          <label><att>select</att>: <gi>dataRef</gi> w/ <att>name</att></label>
+          <item><measureGrp select="1"/> Should be valid, as
+          <val>1</val> is a non-negative integer.</item>
+
+          <label><att>sameAs</att>: <gi>dataRef</gi> w/ <att>key</att> &amp; <att>restriction</att></label>
+          <item><measureGrp sameAs="2"/> Should be
+          valid, as <val>2</val> is a 1- or
+          2-digit teidata.count (i.e., non-negative
+          integer).</item>
+
+          <label><att>copyOf</att>: <gi>dataRef</gi> w/ <att>name</att> &amp; <att>restriction</att></label>
+          <item><measureGrp copyOf="34"/> Should be valid, as
+          <val>34</val> is a 1- or 2-digit non-negative
+          integer.</item>
+        </list>
+        </p>
       </div>
 
       <div>
-	<head>Testing content model and occurences of element refs</head>
-	<p>The following <gi>bibl</gi> should be valid. It
-	<emph>should</emph> be invalid if you add 2 more
-	<gi>publisher</gi> elements (for a total of 4), but is not.
-	See <ref
-	target="https://github.com/TEIC/Stylesheets/issues/354">354</ref>.
-	<bibl>
-	  <author>one</author>
-	  <author>two</author>
-	  <title xml:lang="es">uno</title>
-	  <title xml:lang="es">dos</title>
-	  <title xml:lang="es">tres</title>
-	  <title xml:lang="es">quatro</title>
-	  <title xml:lang="es">cinco</title>
-	  <publisher xml:lang="ja">ich</publisher>
-	  <publisher xml:lang="ja">ni</publisher>
-	  <date when="2019-01-05"/>
-	</bibl>
-	</p>
+        <head>Testing content model and occurences of element refs</head>
+        <p>The following <gi>bibl</gi> should be valid. It
+        <emph>should</emph> be invalid if you add 2 more
+        <gi>publisher</gi> elements (for a total of 4), but is not.
+        See <ref
+        target="https://github.com/TEIC/Stylesheets/issues/354">354</ref>.
+        <bibl>
+          <author>one</author>
+          <author>two</author>
+          <title xml:lang="es">uno</title>
+          <title xml:lang="es">dos</title>
+          <title xml:lang="es">tres</title>
+          <title xml:lang="es">quatro</title>
+          <title xml:lang="es">cinco</title>
+          <publisher xml:lang="ja">ich</publisher>
+          <publisher xml:lang="ja">ni</publisher>
+          <date when="2019-01-05"/>
+        </bibl>
+        </p>
       </div>
       
       <div>
@@ -112,142 +112,294 @@
           <choice><corr>order</corr><sic>oder</sic></choice>.</p>
       </div>
 
-      <div>
-	<head>Testing <att>minOccurs</att> and <att>maxOccurs</att> on <gi>anyElement</gi></head>
-	<ab xmlns:tst1="http://www.tei-c.org/ns/testMin" xmlns:tst2="http://www.tei-c.org/ns/test_min" n="mins">
-	  <!-- plain, just for reference -->
-	  <tst1:plain/>
-	  <gb n="above matches 1 to 1"/>
-	  <!-- min=0, max=various -->
-	  <gb n="above matches 0 to 1"/>
-	  <gb n="above matches 0 to 2"/>
-	  <gb n="above matches 0 to 6"/>
-	  <gb n="above matches 0 to ∞"/>
-	  <!-- min=1, max=various -->
-	  <tst2:one_to_one/>
-	  <gb n="above matches 1 to 1"/>
-	  <tst1:one_to_two/>
-	  <gb n="above matches 1 to 2"/>
-	  <tst2:one_to_six/>
-	  <gb n="above matches 1 to 6"/>
-	  <tst1:one_to_inf/>
-	  <gb n="above matches 1 to ∞"/>
-	  <!-- min=2, max=various -->
-	  <tst2:two_to_two/> <tst1:two_to_two/>
-	  <gb n="above matches 2 to 2"/>
-	  <tst2:two_to_six/> <tst1:two_to_six/>
-	  <gb n="above matches 2 to 6"/>
-	  <tst2:two_to_inf/> <tst1:two_to_inf/>
-	  <gb n="above matches 2 to ∞"/>
-	  <!-- min=4, max=various -->
-	  <tst2:four_to_six/> <tst1:four_to_six/>
-	  <tst2:four_to_six/> <tst1:four_to_six/>
-	  <gb n="above matches 4 to 6"/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <gb n="above matches 4 to ∞"/>
-	</ab>
-
-	<ab xmlns:tst1="http://www.tei-c.org/ns/test_mid" xmlns:tst2="http://www.tei-c.org/ns/testMid" n="mids">
-	  <!-- plain, just for reference -->
-	  <tst2:plain/>
-	  <gb n="above matches 1 to 1"/>
-	  <!-- min=0, max=various -->
-	  <tst1:zero_to_one/>
-	  <gb n="above matches 0 to 1"/>
-	  <tst2:zero_to_two/>
-	  <gb n="above matches 0 to 2"/>
-	  <tst1:zero_to_six/>
-	  <tst2:zero_to_six/>
-	  <tst1:zero_to_six/>
-	  <gb n="above matches 0 to 6"/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <gb n="above matches 0 to ∞"/>
-	  <!-- min=1, max=various -->
-	  <tst2:one_to_one/>
-	  <gb n="above matches 1 to 1"/>
-	  <tst1:one_to_two/>
-	  <gb n="above matches 1 to 2"/>
-	  <tst2:one_to_six/>
-	  <tst1:one_to_six/>
-	  <tst2:one_to_six/>
-	  <gb n="above matches 1 to 6"/>
-	  <tst1:one_to_inf/> <tst2:one_to_inf/>
-	  <tst1:one_to_inf/> <tst2:one_to_inf/>
-	  <gb n="above matches 1 to ∞"/>
-	  <!-- min=2, max=various -->
-	  <tst1:two_to_two/> <tst2:two_to_two/>
-	  <gb n="above matches 2 to 2"/>
-	  <tst1:two_to_six/> <tst2:two_to_six/>
-	  <tst1:two_to_six/> <tst2:two_to_six/>
-	  <gb n="above matches 2 to 6"/>
-	  <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/>
-	  <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/>
-	  <gb n="above matches 2 to ∞"/>
-	  <!-- min=4, max=various -->
-	  <tst1:four_to_six/> <tst2:four_to_six/> <tst1:four_to_six/>
-	  <tst2:four_to_six/> <tst1:four_to_six/>
-	  <gb n="above matches 4 to 6"/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <gb n="above matches 4 to ∞"/>
-	</ab>
-
-	<ab xmlns:tst1="http://www.tei-c.org/ns/test_max" xmlns:tst2="http://www.tei-c.org/ns/testMax" n="maxs">
-	  <!-- plain, just for reference -->
-	  <tst2:plain/>
-	  <gb n="above matches 1 to 1"/>
-	  <!-- min=0, max=various -->
-	  <tst1:zero_to_one/>
-	  <gb n="above matches 0 to 1"/>
-	  <tst2:zero_to_two/> <tst1:zero_to_two/>
-	  <gb n="above matches 0 to 2"/>
-	  <tst2:zero_to_six/> <tst1:zero_to_six/> <tst2:zero_to_six/>
-	  <tst1:zero_to_six/> <tst2:zero_to_six/> <tst1:zero_to_six/>
-	  <gb n="above matches 0 to 6"/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/>
-	  <gb n="above matches 0 to ∞"/>
-	  <!-- min=1, max=various -->
-	  <tst2:one_to_one/>
-	  <gb n="above matches 1 to 1"/>
-	  <tst1:one_to_two/> <tst2:one_to_two/>
-	  <gb n="above matches 1 to 2"/>
-	  <tst1:one_to_six/> <tst2:one_to_six/> <tst1:one_to_six/>
-	  <tst2:one_to_six/> <tst1:one_to_six/> <tst2:one_to_six/>
-	  <gb n="above matches 1 to 6"/>
-	  <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/>
-	  <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/>
-	  <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/>
-	  <gb n="above matches 1 to ∞"/>
-	  <!-- min=2, max=various -->
-	  <tst2:two_to_two/> <tst1:two_to_two/>
-	  <gb n="above matches 2 to 2"/>
-	  <tst2:two_to_six/> <tst1:two_to_six/> <tst2:two_to_six/>
-	  <tst1:two_to_six/> <tst2:two_to_six/> <tst1:two_to_six/>
-	  <gb n="above matches 2 to 6"/>
-	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
-	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
-	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
-	  <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/>
-	  <gb n="above matches 2 to ∞"/>
-	  <!-- min=4, max=various -->
-	  <tst2:four_to_six/> <tst1:four_to_six/> <tst2:four_to_six/>
-	  <tst1:four_to_six/> <tst2:four_to_six/> <tst1:four_to_six/>
-	  <gb n="above matches 4 to 6"/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/>
-	  <gb n="above matches 4 to ∞"/>
-	</ab>
+      <!-- Temporary test of @minOccurs and @maxOccurs on
+           <anyElement>, until testPure1.odd can use intended test
+           (i.e., until #631 is fixed). -->
+      <div xmlns:s="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:y="http://www.w3.org/2008/SMIL30/Structure" xmlns:d="http://www.io-link.com/IODD/2010/10">
+        <head>Testing <att>minOccurs</att> and <att>maxOccurs</att> on <gi>anyElement</gi></head>
+        <openPara_plain>
+          <s:whatever1/>
+        </openPara_plain>
+        <!--  -->
+        <openPara_0_1/>
+        <openPara_0_1>
+          <y:blort/>
+        </openPara_0_1>
+
+        <openPara_0_2/>
+        <openPara_0_2>
+          <d:widget/>
+        </openPara_0_2>
+        <openPara_0_2>
+          <d:widget/>
+          <d:widget/>
+        </openPara_0_2>
+
+        <openPara_0_6/>
+        <openPara_0_6>
+          <s:one/>
+        </openPara_0_6>
+        <openPara_0_6>
+          <s:one/><s:two/>
+        </openPara_0_6>
+        <openPara_0_6>
+          <s:one/><s:two/><s:three/>
+        </openPara_0_6>
+        <openPara_0_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/>
+        </openPara_0_6>
+        <openPara_0_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/>
+        </openPara_0_6>
+        <openPara_0_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+        </openPara_0_6>
+        <openPara_0_unbounded>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+          <s:seven/><s:eight/><s:nine/>
+        </openPara_0_unbounded>
+        <!--  -->
+        <openPara_1_1>
+          <y:blort/>
+        </openPara_1_1>
+
+        <openPara_1_2>
+          <d:widget/>
+        </openPara_1_2>
+        <openPara_1_2>
+          <d:widget/>
+          <d:widget/>
+        </openPara_1_2>
 
+        <openPara_1_6>
+          <s:one/>
+        </openPara_1_6>
+        <openPara_1_6>
+          <s:one/><s:two/>
+        </openPara_1_6>
+        <openPara_1_6>
+          <s:one/><s:two/><s:three/>
+        </openPara_1_6>
+        <openPara_1_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/>
+        </openPara_1_6>
+        <openPara_1_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/>
+        </openPara_1_6>
+        <openPara_1_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+        </openPara_1_6>
+
+        <openPara_1_unbounded>
+          <s:one/>
+        </openPara_1_unbounded>
+        <openPara_1_unbounded>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+          <s:seven/><s:eight/><s:nine/>
+        </openPara_1_unbounded>
+        <!--  -->
+        <openPara_2_2>
+          <d:widget/>
+          <d:widget/>
+        </openPara_2_2>
+
+        <openPara_2_6>
+          <s:one/><s:two/>
+        </openPara_2_6>
+        <openPara_2_6>
+          <s:one/><s:two/><s:three/>
+        </openPara_2_6>
+        <openPara_2_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/>
+        </openPara_2_6>
+        <openPara_2_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/>
+        </openPara_2_6>
+        <openPara_2_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+        </openPara_2_6>
+
+        <openPara_2_unbounded>
+          <s:one/><s:two/>
+        </openPara_2_unbounded>
+        <openPara_2_unbounded>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+          <s:seven/><s:eight/><s:nine/>
+        </openPara_2_unbounded>
+        <!--  -->
+        <openPara_4_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/>
+        </openPara_4_6>
+        <openPara_4_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/>
+        </openPara_4_6>
+        <openPara_4_6>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+        </openPara_4_6>
+
+        <openPara_4_unbounded>
+          <s:one/><y:two/><d:three/><s:four/>
+        </openPara_4_unbounded>
+        <openPara_4_unbounded>
+          <s:one/><s:two/><s:three/>
+          <s:four/><s:five/><s:six/>
+          <s:seven/><s:eight/><s:nine/>
+        </openPara_4_unbounded>
+        
       </div>
+        
+      <!-- See corresponding comment in testPure1.odd (search for "#631"). -->
+      <!-- <div> -->
+      <!--      <head>Testing <att>minOccurs</att> and <att>maxOccurs</att> on <gi>anyElement</gi></head> -->
+      <!--      <ab xmlns:tst1="http://www.tei-c.org/ns/testMin" xmlns:tst2="http://www.tei-c.org/ns/test_min" n="mins"> -->
+      <!--        <!-\- plain, just for reference -\-> -->
+      <!--        <tst1:plain/> -->
+      <!--        <gb n="above matches 1 to 1"/> -->
+      <!--        <!-\- min=0, max=various -\-> -->
+      <!--        <gb n="above matches 0 to 1"/> -->
+      <!--        <gb n="above matches 0 to 2"/> -->
+      <!--        <gb n="above matches 0 to 6"/> -->
+      <!--        <gb n="above matches 0 to ∞"/> -->
+      <!--        <!-\- min=1, max=various -\-> -->
+      <!--        <tst2:one_to_one/> -->
+      <!--        <gb n="above matches 1 to 1"/> -->
+      <!--        <tst1:one_to_two/> -->
+      <!--        <gb n="above matches 1 to 2"/> -->
+      <!--        <tst2:one_to_six/> -->
+      <!--        <gb n="above matches 1 to 6"/> -->
+      <!--        <tst1:one_to_inf/> -->
+      <!--        <gb n="above matches 1 to ∞"/> -->
+      <!--        <!-\- min=2, max=various -\-> -->
+      <!--        <tst2:two_to_two/> <tst1:two_to_two/> -->
+      <!--        <gb n="above matches 2 to 2"/> -->
+      <!--        <tst2:two_to_six/> <tst1:two_to_six/> -->
+      <!--        <gb n="above matches 2 to 6"/> -->
+      <!--        <tst2:two_to_inf/> <tst1:two_to_inf/> -->
+      <!--        <gb n="above matches 2 to ∞"/> -->
+      <!--        <!-\- min=4, max=various -\-> -->
+      <!--        <tst2:four_to_six/> <tst1:four_to_six/> -->
+      <!--        <tst2:four_to_six/> <tst1:four_to_six/> -->
+      <!--        <gb n="above matches 4 to 6"/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <gb n="above matches 4 to ∞"/> -->
+      <!--      </ab> -->
+
+      <!--      <ab xmlns:tst1="http://www.tei-c.org/ns/test_mid" xmlns:tst2="http://www.tei-c.org/ns/testMid" n="mids"> -->
+      <!--        <!-\- plain, just for reference -\-> -->
+      <!--        <tst2:plain/> -->
+      <!--        <gb n="above matches 1 to 1"/> -->
+      <!--        <!-\- min=0, max=various -\-> -->
+      <!--        <tst1:zero_to_one/> -->
+      <!--        <gb n="above matches 0 to 1"/> -->
+      <!--        <tst2:zero_to_two/> -->
+      <!--        <gb n="above matches 0 to 2"/> -->
+      <!--        <tst1:zero_to_six/> -->
+      <!--        <tst2:zero_to_six/> -->
+      <!--        <tst1:zero_to_six/> -->
+      <!--        <gb n="above matches 0 to 6"/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <gb n="above matches 0 to ∞"/> -->
+      <!--        <!-\- min=1, max=various -\-> -->
+      <!--        <tst2:one_to_one/> -->
+      <!--        <gb n="above matches 1 to 1"/> -->
+      <!--        <tst1:one_to_two/> -->
+      <!--        <gb n="above matches 1 to 2"/> -->
+      <!--        <tst2:one_to_six/> -->
+      <!--        <tst1:one_to_six/> -->
+      <!--        <tst2:one_to_six/> -->
+      <!--        <gb n="above matches 1 to 6"/> -->
+      <!--        <tst1:one_to_inf/> <tst2:one_to_inf/> -->
+      <!--        <tst1:one_to_inf/> <tst2:one_to_inf/> -->
+      <!--        <gb n="above matches 1 to ∞"/> -->
+      <!--        <!-\- min=2, max=various -\-> -->
+      <!--        <tst1:two_to_two/> <tst2:two_to_two/> -->
+      <!--        <gb n="above matches 2 to 2"/> -->
+      <!--        <tst1:two_to_six/> <tst2:two_to_six/> -->
+      <!--        <tst1:two_to_six/> <tst2:two_to_six/> -->
+      <!--        <gb n="above matches 2 to 6"/> -->
+      <!--        <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> -->
+      <!--        <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> -->
+      <!--        <gb n="above matches 2 to ∞"/> -->
+      <!--        <!-\- min=4, max=various -\-> -->
+      <!--        <tst1:four_to_six/> <tst2:four_to_six/> <tst1:four_to_six/> -->
+      <!--        <tst2:four_to_six/> <tst1:four_to_six/> -->
+      <!--        <gb n="above matches 4 to 6"/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <gb n="above matches 4 to ∞"/> -->
+      <!--      </ab> -->
+
+      <!--      <ab xmlns:tst1="http://www.tei-c.org/ns/test_max" xmlns:tst2="http://www.tei-c.org/ns/testMax" n="maxs"> -->
+      <!--        <!-\- plain, just for reference -\-> -->
+      <!--        <tst2:plain/> -->
+      <!--        <gb n="above matches 1 to 1"/> -->
+      <!--        <!-\- min=0, max=various -\-> -->
+      <!--        <tst1:zero_to_one/> -->
+      <!--        <gb n="above matches 0 to 1"/> -->
+      <!--        <tst2:zero_to_two/> <tst1:zero_to_two/> -->
+      <!--        <gb n="above matches 0 to 2"/> -->
+      <!--        <tst2:zero_to_six/> <tst1:zero_to_six/> <tst2:zero_to_six/> -->
+      <!--        <tst1:zero_to_six/> <tst2:zero_to_six/> <tst1:zero_to_six/> -->
+      <!--        <gb n="above matches 0 to 6"/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <tst2:zero_to_inf/> <tst1:zero_to_inf/> <tst2:zero_to_inf/> <tst1:zero_to_inf/> -->
+      <!--        <gb n="above matches 0 to ∞"/> -->
+      <!--        <!-\- min=1, max=various -\-> -->
+      <!--        <tst2:one_to_one/> -->
+      <!--        <gb n="above matches 1 to 1"/> -->
+      <!--        <tst1:one_to_two/> <tst2:one_to_two/> -->
+      <!--        <gb n="above matches 1 to 2"/> -->
+      <!--        <tst1:one_to_six/> <tst2:one_to_six/> <tst1:one_to_six/> -->
+      <!--        <tst2:one_to_six/> <tst1:one_to_six/> <tst2:one_to_six/> -->
+      <!--        <gb n="above matches 1 to 6"/> -->
+      <!--        <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> -->
+      <!--        <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> -->
+      <!--        <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> <tst2:one_to_inf/> <tst1:one_to_inf/> -->
+      <!--        <gb n="above matches 1 to ∞"/> -->
+      <!--        <!-\- min=2, max=various -\-> -->
+      <!--        <tst2:two_to_two/> <tst1:two_to_two/> -->
+      <!--        <gb n="above matches 2 to 2"/> -->
+      <!--        <tst2:two_to_six/> <tst1:two_to_six/> <tst2:two_to_six/> -->
+      <!--        <tst1:two_to_six/> <tst2:two_to_six/> <tst1:two_to_six/> -->
+      <!--        <gb n="above matches 2 to 6"/> -->
+      <!--        <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> -->
+      <!--        <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> -->
+      <!--        <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> -->
+      <!--        <tst2:two_to_inf/> <tst1:two_to_inf/> <tst2:two_to_inf/> <tst1:two_to_inf/> -->
+      <!--        <gb n="above matches 2 to ∞"/> -->
+      <!--        <!-\- min=4, max=various -\-> -->
+      <!--        <tst2:four_to_six/> <tst1:four_to_six/> <tst2:four_to_six/> -->
+      <!--        <tst1:four_to_six/> <tst2:four_to_six/> <tst1:four_to_six/> -->
+      <!--        <gb n="above matches 4 to 6"/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> <tst2:four_to_inf/> <tst1:four_to_inf/> -->
+      <!--        <gb n="above matches 4 to ∞"/> -->
+      <!--      </ab> -->
+
+      <!-- </div> -->
 
     </body>
   </text>
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index 2689513cb..5a80ec6b1 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -230,18 +230,18 @@ of this software, even if advised of the possibility of such damage.
         <xsl:apply-templates mode="pass3"/>
       </xsl:for-each>
     </xsl:variable>
-    <xsl:if test="$verbose eq 'true'">
-      <xsl:message select="'DEBUG: div it up from within schemaSpecBody template'"/>
-      <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass1">
-        <xsl:copy-of select="$pass1"/>
-      </rng:div>      
-      <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass2">
-        <xsl:copy-of select="$pass2"/>
-      </rng:div>      
-      <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass3">
-        <xsl:copy-of select="$pass3"/>
-      </rng:div>
-    </xsl:if>
+    <!-- <xsl:if test="$verbose eq 'true'"> -->
+    <!--   <xsl:message select="'DEBUG: div it up from within schemaSpecBody template'"/> -->
+    <!--   <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass1"> -->
+    <!--     <xsl:copy-of select="$pass1"/> -->
+    <!--   </rng:div>       -->
+    <!--   <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass2"> -->
+    <!--     <xsl:copy-of select="$pass2"/> -->
+    <!--   </rng:div>       -->
+    <!--   <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass3"> -->
+    <!--     <xsl:copy-of select="$pass3"/> -->
+    <!--   </rng:div> -->
+    <!-- </xsl:if> -->
     <xsl:sequence select="$pass3"/>
 </xsl:template>
 

From 7ef0c0e3a37cc6f049e7c691d99e62a008c67ffb Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 8 Oct 2023 11:36:00 -0400
Subject: [PATCH 06/50] Now have @minOccurs and @maxOccurs working on
 <sequence> (and thus <interleave>), too. Passes tests, so *may* be eligible
 to merge into dev, but not really ready, yet, as need to work on
 repeatability of <alternate>.

---
 Test2/expected-results/testAttValQuant.rng |  10 +
 Test2/expected-results/testPure1.rng       | 254 +++++++++++++++++++--
 Test2/inputFiles/testPure1.odd             |  64 ++++++
 odds/teiodds.xsl                           | 117 ++++------
 4 files changed, 363 insertions(+), 82 deletions(-)

diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index b28ed4a77..4e302178c 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -3921,6 +3921,16 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             <ref name="model.choicePart"/>
             <ref name="choice"/>
          </choice>
+         <choice>
+            <ref name="model.choicePart"/>
+            <ref name="choice"/>
+         </choice>
+         <zeroOrMore>
+            <choice>
+               <ref name="model.choicePart"/>
+               <ref name="choice"/>
+            </choice>
+         </zeroOrMore>
          <ref name="att.global.attributes"/>
          <empty/>
       </element>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 4fb6fa6a5..3bbfbcf91 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -3577,6 +3577,9 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="t_model.entryPart">
       <notAllowed/>
    </define>
+   <define name="t_model.eventLike">
+      <notAllowed/>
+   </define>
    <define name="t_model.global.edit">
       <choice>
          <ref name="t_gap"/>
@@ -3681,6 +3684,11 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          <ref name="t_model.placeNamePart_sequenceRepeatable"/>
       </oneOrMore>
    </define>
+   <define name="t_model.orgPart">
+      <choice>
+         <ref name="t_model.eventLike"/>
+      </choice>
+   </define>
    <define name="t_model.publicationStmtPart.agency">
       <choice>
          <ref name="t_publisher"/>
@@ -3898,6 +3906,9 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
    <define name="t_model.catDescPart">
       <notAllowed/>
    </define>
+   <define name="t_model.textDescPart">
+      <notAllowed/>
+   </define>
    <define name="t_model.addressLike">
       <choice>
          <ref name="t_email"/>
@@ -4034,6 +4045,20 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          <ref name="t_model.global.edit"/>
       </choice>
    </define>
+   <define name="t_model.biblPart">
+      <choice>
+         <ref name="t_model.respLike"/>
+         <ref name="t_model.imprintPart"/>
+         <ref name="t_series"/>
+         <ref name="t_citedRange"/>
+         <ref name="t_bibl"/>
+         <ref name="t_relatedItem"/>
+         <ref name="t_textLang"/>
+         <ref name="t_edition"/>
+         <ref name="t_extent"/>
+         <ref name="t_availability"/>
+      </choice>
+   </define>
    <define name="t_model.frontPart">
       <choice>
          <ref name="t_model.frontPart.drama"/>
@@ -4326,6 +4351,9 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          <ref name="t_TEI"/>
       </choice>
    </define>
+   <define name="t_model.objectLike">
+      <notAllowed/>
+   </define>
    <define name="t_att.personal.attributes">
       <ref name="t_att.naming.attributes"/>
       <ref name="t_att.personal.attribute.full"/>
@@ -5588,6 +5616,28 @@ Elements]</a:documentation>
          <empty/>
       </element>
    </define>
+   <define name="t_series">
+      <element name="series">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(series information) contains information about the series in which a book or other bibliographic item has appeared. [3.12.2.1. Analytic, Monographic, and Series Levels]</a:documentation>
+         <zeroOrMore>
+            <choice>
+               <text/>
+               <ref name="t_model.gLike"/>
+               <ref name="t_title"/>
+               <ref name="t_model.ptrLike"/>
+               <ref name="t_editor"/>
+               <ref name="t_respStmt"/>
+               <ref name="t_biblScope"/>
+               <ref name="t_idno"/>
+               <ref name="t_textLang"/>
+               <ref name="t_model.global"/>
+               <ref name="t_availability"/>
+            </choice>
+         </zeroOrMore>
+         <ref name="t_att.global.attributes"/>
+         <empty/>
+      </element>
+   </define>
    <define name="t_author">
       <element name="author">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(author) in a bibliographic reference, contains the name(s) of an author, personal or corporate, of a work; for example in the same form as that provided by a recognized bibliographic name authority. [3.12.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement]</a:documentation>
@@ -5756,6 +5806,16 @@ Elements]</a:documentation>
          <empty/>
       </element>
    </define>
+   <define name="t_citedRange">
+      <element name="citedRange">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited range) defines the range of cited content, often represented by pages or other units [3.12.2.5. Scopes and Ranges in Bibliographic Citations]</a:documentation>
+         <ref name="t_macro.phraseSeq"/>
+         <ref name="t_att.global.attributes"/>
+         <ref name="t_att.pointing.attributes"/>
+         <ref name="t_att.citing.attributes"/>
+         <empty/>
+      </element>
+   </define>
    <define name="t_pubPlace">
       <element name="pubPlace">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(publication place) contains the name of the place where a bibliographic item was published. [3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
@@ -6435,28 +6495,194 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_seriesStmt">
       <element name="seriesStmt">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(series statement) groups information about the series, if any, to which a publication belongs. [2.2.5. The Series Statement 2.2. The File Description]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(series statement)  [2.2.5. The Series Statement 2.2. The File Description]</a:documentation>
          <choice>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <ref name="t_said"/>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.biblPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.biblPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.biblPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.biblPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <zeroOrMore>
+               <group>
+                  <ref name="t_label"/>
+                  <ref name="t_pc"/>
+               </group>
+            </zeroOrMore>
+            <group>
+               <ref name="t_label"/>
+               <ref name="t_orgName"/>
+               <ref name="t_pc"/>
+            </group>
+            <group>
+               <ref name="t_label"/>
+               <optional>
+                  <ref name="t_model.orgPart"/>
+               </optional>
+               <ref name="t_pc"/>
+            </group>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.orgPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.orgPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.orgPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
             <oneOrMore>
-               <ref name="t_model.pLike"/>
+               <group>
+                  <ref name="t_label"/>
+                  <ref name="t_model.objectLike"/>
+                  <ref name="t_pc"/>
+               </group>
             </oneOrMore>
             <group>
-               <oneOrMore>
-                  <ref name="t_title"/>
-               </oneOrMore>
+               <ref name="t_label"/>
+               <ref name="t_term"/>
+               <ref name="t_pc"/>
+            </group>
+            <group>
+               <ref name="t_label"/>
+               <ref name="t_term"/>
+               <ref name="t_pc"/>
+            </group>
+            <group>
+               <ref name="t_label"/>
+               <optional>
+                  <ref name="t_model.textDescPart"/>
+               </optional>
+               <ref name="t_pc"/>
+            </group>
+            <group>
+               <ref name="t_label"/>
+               <optional>
+                  <ref name="t_model.textDescPart"/>
+               </optional>
+               <ref name="t_pc"/>
+            </group>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.textDescPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <optional>
+               <group>
+                  <ref name="t_label"/>
+                  <optional>
+                     <ref name="t_model.textDescPart"/>
+                  </optional>
+                  <ref name="t_pc"/>
+               </group>
+            </optional>
+            <group>
+               <ref name="t_label"/>
+               <ref name="t_model.teiHeaderPart"/>
+               <ref name="t_pc"/>
+            </group>
+            <group>
+               <ref name="t_label"/>
+               <ref name="t_model.teiHeaderPart"/>
+               <ref name="t_pc"/>
+            </group>
+            <zeroOrMore>
+               <group>
+                  <ref name="t_label"/>
+                  <ref name="t_model.teiHeaderPart"/>
+                  <ref name="t_pc"/>
+               </group>
+            </zeroOrMore>
+            <interleave>
+               <ref name="t_label"/>
                <zeroOrMore>
-                  <choice>
-                     <ref name="t_editor"/>
-                     <ref name="t_respStmt"/>
-                  </choice>
+                  <ref name="t_idno"/>
                </zeroOrMore>
+               <ref name="t_pc"/>
+            </interleave>
+            <interleave>
+               <ref name="t_label"/>
                <zeroOrMore>
-                  <choice>
-                     <ref name="t_idno"/>
-                     <ref name="t_biblScope"/>
-                  </choice>
+                  <ref name="t_idno"/>
                </zeroOrMore>
-            </group>
+               <ref name="t_pc"/>
+            </interleave>
+            <optional>
+               <interleave>
+                  <ref name="t_label"/>
+                  <zeroOrMore>
+                     <ref name="t_idno"/>
+                  </zeroOrMore>
+                  <ref name="t_pc"/>
+               </interleave>
+            </optional>
+            <optional>
+               <interleave>
+                  <ref name="t_label"/>
+                  <zeroOrMore>
+                     <ref name="t_idno"/>
+                  </zeroOrMore>
+                  <ref name="t_pc"/>
+               </interleave>
+            </optional>
          </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 eb6cf9f3b..903f5e546 100644
--- a/Test2/inputFiles/testPure1.odd
+++ b/Test2/inputFiles/testPure1.odd
@@ -223,6 +223,70 @@
           </remarks>
         </elementSpec>
 
+	<!-- Test @minOccurs, @maxOccurs, and @preserveOrder=false on <sequence>  -->
+	<elementSpec ident="seriesStmt" mode="change" module="header">
+	  <desc/>
+	  <content>
+	    <alternate>
+	      <!-- min=0 -->
+	      <sequence minOccurs="0" maxOccurs="1">
+		<elementRef key="label"/>
+		<elementRef key="said"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <sequence minOccurs="0" maxOccurs="4">
+		<elementRef key="label"/>
+		<classRef key="model.biblPart" minOccurs="0"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <sequence minOccurs="0" maxOccurs="unbounded">
+		<elementRef key="label"/>
+		<elementRef key="zone"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <!-- min=1 -->
+	      <sequence minOccurs="1" maxOccurs="1">
+		<elementRef key="label"/>
+		<elementRef key="orgName"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <sequence minOccurs="1" maxOccurs="4">
+		<elementRef key="label"/>
+		<classRef key="model.orgPart" minOccurs="0"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <sequence minOccurs="1" maxOccurs="unbounded">
+		<elementRef key="label"/>
+		<classRef key="model.objectLike"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <!-- min=2 -->
+	      <sequence minOccurs="2" maxOccurs="2">
+		<elementRef key="label"/>
+		<elementRef key="term"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <sequence minOccurs="2" maxOccurs="4">
+		<elementRef key="label"/>
+		<classRef key="model.textDescPart" minOccurs="0"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <sequence minOccurs="2" maxOccurs="unbounded">
+		<elementRef key="label"/>
+		<classRef key="model.teiHeaderPart"/>
+		<elementRef key="pc"/>
+	      </sequence>
+	      <!-- preserveOrder false -->
+	      <sequence preserveOrder="false" minOccurs="2" maxOccurs="4">
+		<elementRef key="label"/>
+		<elementRef key="idno" minOccurs="0" maxOccurs="unbounded"/>
+		<elementRef key="pc"/>
+	      </sequence>
+
+	    </alternate>
+	  </content>
+	</elementSpec>
+
         <!--
             I wanted to change the content of <ab> just to test
             <anyElement> with @minOccurs and @maxOccurs, using the
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 1a54c58b6..58e87471f 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -323,24 +323,27 @@ of this software, even if advised of the possibility of such damage.
     <xsl:apply-templates mode="decomposed"/>
   </xsl:template>
 
-
+  <!-- In "tangle" mode we ignore TEI elements unless specifically
+       matched, below. -->
   <xsl:template match="tei:*" mode="tangle"/>
   
   <xsl:template match="tei:anyElement" mode="tangle">
     <xsl:variable name="spec" select="ancestor::tei:elementSpec|ancestor::tei:macroSpec"/>
-    <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
-    <?tei winita UPDATING for #627 here — Syd, 2023-10-01 ?>
-    <xsl:variable name="repeatMe" as="element()+">
+    <xsl:variable name="repeatMe" as="element()">
       <rng:ref name="{concat('anyElement-',$spec/@ident)}"/>
     </xsl:variable>
     <xsl:call-template name="repeat_as_needed">
-      <xsl:with-param name="repeatMe" select="$repeatMe" as="element()+"/>
+      <xsl:with-param name="repeatMe" select="$repeatMe" as="element()"/>
     </xsl:call-template>
   </xsl:template>
 
-  <xsl:template name="repeat_as_needed">
-    <xsl:param name="repeatMe" as="element()+"/>
+  <!-- Given an element (presumably a RELAX NG element), generate the
+       correct RELAX NG code around that element to match it the right
+       number of times based on the @minOccurs and @maxOccurs of the
+       current context node (which is presumably a member of
+       att.repeatable). -->
+  <xsl:template name="repeat_as_needed" as="element()+">
+    <xsl:param name="repeatMe" as="element()"/>
     <xsl:variable name="norMinMax" select="tei:norMinMax(.)" as="item()+"/>
     <xsl:variable name="min" select="$norMinMax[1]"/>
     <xsl:variable name="max" select="$norMinMax[2]"/>
@@ -665,13 +668,6 @@ of this software, even if advised of the possibility of such damage.
             <xsl:with-param name="class" select="$thisClass"/>
           </xsl:call-template>
         </xsl:variable>
-
-        <!--<xsl:message>
-
-DEBUG <xsl:value-of select="$thisClass"/><xsl:value-of
-select="$suffix"/> generated <xsl:value-of
-select="$makeDecls"/></xsl:message>
--->
         <xsl:choose>
           <!--
                <xsl:when test="$makeDecls=''">
@@ -831,14 +827,13 @@ select="$makeDecls"/></xsl:message>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-
+    <!--  -->
     <xsl:choose>
       <xsl:when test="$suffix='' or $suffix='NULL'">
         <rng:ref name="{$localprefix}{@ident}"/>
       </xsl:when>
       <xsl:otherwise>
-        <rng:ref
-             name="{$localprefix}{@ident}_{$suffix}"/>
+        <rng:ref name="{$localprefix}{@ident}_{$suffix}"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -2100,61 +2095,47 @@ select="$makeDecls"/></xsl:message>
    </xsl:template>
 
    <!-- for Pure ODD -->
-  <xsl:template match="tei:sequence" mode="#default tangle">
-    <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
-    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
-    <!-- sequences of <dataRef> need use <list>, not <group> -->
-    <xsl:variable name="group_or_list" select="if ( *[ not( self::tei:dataRef ) ] ) then 'group' else 'list'"/>
-    <xsl:choose>
-      <xsl:when test="@preserveOrder eq 'false'  and  string-length($owe) eq 0">
-        <xsl:element name="{$group_or_list}" namespace="http://relaxng.org/ns/structure/1.0">
-          <rng:interleave>
-            <xsl:apply-templates mode="tangle"/>
-          </rng:interleave>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="string-length($owe) eq 0">
-        <xsl:element name="{$group_or_list}" namespace="http://relaxng.org/ns/structure/1.0">
-          <xsl:apply-templates mode="tangle"/>
-        </xsl:element>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$owe}" namespace="http://relaxng.org/ns/structure/1.0">
-          <xsl:element name="{$group_or_list}" namespace="http://relaxng.org/ns/structure/1.0">
-            <xsl:apply-templates mode="tangle"/>
-          </xsl:element>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+   <xsl:template match="tei:sequence | tei:interleave" mode="#default tangle">
+     <!-- sequences of <dataRef> need use <list>, not <group> -->
+     <xsl:variable name="group_or_list" select="if ( *[ not( self::tei:dataRef ) ] ) then 'group' else 'list'"/>
+     <xsl:variable name="to_be_sequenced" as="element()+">
+       <xsl:apply-templates mode="tangle" select="*"/>
+     </xsl:variable>
+     <xsl:variable name="group_or_list_content" as="element()+">
+       <xsl:choose>
+         <xsl:when test="@preserveOrder eq 'false'  or  self::tei:interleave">
+           <rng:interleave>
+             <xsl:sequence select="$to_be_sequenced[self::element()]"/>
+           </rng:interleave>
+         </xsl:when>
+         <xsl:otherwise>
+           <xsl:sequence select="$to_be_sequenced[self::element()]"/>
+         </xsl:otherwise>
+       </xsl:choose>
+     </xsl:variable>
+     <xsl:variable name="repeatMe" as="element()">
+       <xsl:element name="{$group_or_list}" namespace="http://relaxng.org/ns/structure/1.0">
+         <xsl:sequence select="$group_or_list_content"/>
+       </xsl:element>
+     </xsl:variable>
+     <xsl:call-template name="repeat_as_needed">
+       <xsl:with-param name="repeatMe" select="$repeatMe" as="element()"/>
+     </xsl:call-template>
+   </xsl:template>
 
   <xsl:template match="tei:textNode"   mode="#default tangle">
     <rng:text/>
   </xsl:template>
 
   <xsl:template match="tei:alternate"  mode="#default tangle">
-    <!-- "owe" = occurence wrapper element -->
-    <xsl:variable name="owe" select="tei:norMinMax(.)[3]"/>
-    <?tei winita UPDATE for #627 needed here — Syd, 2023-10-01 ?>
-    <xsl:choose>
-      <xsl:when test="string-length($owe) eq 0">
-        <rng:choice>
-          <xsl:apply-templates mode="tangle"/>
-        </rng:choice>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$owe}" namespace="http://relaxng.org/ns/structure/1.0">
-          <rng:choice>
-            <xsl:apply-templates mode="tangle"/>
-          </rng:choice>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  
-  <xsl:template match="tei:interleave" mode="#default tangle">
-    <xsl:message>met an interleave</xsl:message>
+    <xsl:variable name="repeatMe" as="element()">
+      <rng:choice>
+        <xsl:apply-templates mode="tangle"/>
+      </rng:choice>
+    </xsl:variable>
+     <xsl:call-template name="repeat_as_needed">
+       <xsl:with-param name="repeatMe" select="$repeatMe" as="element()"/>
+     </xsl:call-template>
   </xsl:template>
   
   <xsl:template match="tei:elementRef|tei:classRef|tei:macroRef"   mode="#default tangle">
@@ -2168,7 +2149,7 @@ select="$makeDecls"/></xsl:message>
     <xsl:variable name="this" select="@key"/>
     <xsl:variable name="except" select="@except"/>
     <xsl:variable name="include" select="@include"/>
-    <xsl:variable name="c">
+    <xsl:variable name="c" as="element()+">
       <xsl:choose>
         <xsl:when test="not(@expand) and (@include or @except)">
           <xsl:variable name="context" select="."/>

From 89fa20cfd16bb1c973fc8dfa7e198ae00de7c0f7 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sun, 8 Oct 2023 20:14:48 -0400
Subject: [PATCH 07/50] Various minor things:  * Removed some debugging code  *
 Added tests (in Test2/testPure1) for sequence/@m[ia][nx]Occurs and
 alternate/@m[ia][nx]Occurs, including valid instance, but not invalid  *
 Updated tests (in Test/)

---
 Test/expected-results/test.rng                |  10 +
 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              |   2 +
 Test/expected-results/test34.rnc              |   2 +
 Test/expected-results/test35.rnc              |   2 +
 Test2/expected-results/testPure1.rng          | 180 +++++++++++++-
 Test2/inputFiles/testPure1.odd                |  71 ++++++
 .../validInstances/testPure1ValidInstance.xml | 219 ++++++++++++++++++
 odds/odd2relax.xsl                            |  18 --
 11 files changed, 496 insertions(+), 26 deletions(-)

diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 4ac339802..9518c17ca 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -4490,6 +4490,16 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
         <ref name="model.choicePart"/>
         <ref name="choice"/>
       </choice>
+      <choice>
+        <ref name="model.choicePart"/>
+        <ref name="choice"/>
+      </choice>
+      <zeroOrMore>
+        <choice>
+          <ref name="model.choicePart"/>
+          <ref name="choice"/>
+        </choice>
+      </zeroOrMore>
       <ref name="att.global.attributes"/>
       <empty/>
     </element>
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index a61ac6df6..ccb3157f8 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -2380,7 +2380,11 @@ choice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element choice {
-    (model.choicePart | choice), att.global.attributes, empty
+    (model.choicePart | choice),
+    (model.choicePart | choice),
+    (model.choicePart | choice)*,
+    att.global.attributes,
+    empty
   }
 reg =
   
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index 5d80076fa..ca2539cca 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -2916,7 +2916,11 @@ choice =
   
   ## (choix) regroupe un certain nombre de balisages alternatifs possibles pour un même endroit dans un texte. [3.5. Simple Editorial Changes]
   element choice {
-    (model.choicePart | choice), att.global.attributes, empty
+    (model.choicePart | choice),
+    (model.choicePart | choice),
+    (model.choicePart | choice)*,
+    att.global.attributes,
+    empty
   }
 reg =
   
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index 62d9b8bd3..98941a8ab 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -2810,7 +2810,11 @@ Tchoice =
   
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element choice {
-    (Tmodel.choicePart | Tchoice), Tatt.global.attributes, empty
+    (Tmodel.choicePart | Tchoice),
+    (Tmodel.choicePart | Tchoice),
+    (Tmodel.choicePart | Tchoice)*,
+    Tatt.global.attributes,
+    empty
   }
 Treg =
   
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index 70eabd463..38fa83a57 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -2543,6 +2543,8 @@ tei_choice =
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element tei:choice {
     (tei_model.choicePart | tei_choice),
+    (tei_model.choicePart | tei_choice),
+    (tei_model.choicePart | tei_choice)*,
     tei_att.global.attributes,
     empty
   }
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 51d0d255c..d5449e88f 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -2548,6 +2548,8 @@ tei_choice =
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element choice {
     (tei_model.choicePart | tei_choice),
+    (tei_model.choicePart | tei_choice),
+    (tei_model.choicePart | tei_choice)*,
     tei_att.global.attributes,
     empty
   }
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index ec0094d30..5e1fdc73b 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -2543,6 +2543,8 @@ tei_choice =
   ## (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
   element tei:choice {
     (tei_model.choicePart | tei_choice),
+    (tei_model.choicePart | tei_choice),
+    (tei_model.choicePart | tei_choice)*,
     tei_att.global.attributes,
     empty
   }
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 3bbfbcf91..f6d044e90 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -8602,16 +8602,186 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_altGrp">
       <element name="altGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml"
-                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> elements and possibly pointers. [16.8. Alternation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group)  [16.8. Alternation]</a:documentation>
          <group>
+            <optional>
+               <choice>
+                  <ref name="t_persName"/>
+                  <ref name="t_placeName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+               </choice>
+            </optional>
+            <ref name="t_gb"/>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <ref name="t_gb"/>
             <zeroOrMore>
-               <ref name="t_model.descLike"/>
+               <choice>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+                  <ref name="t_rs"/>
+               </choice>
             </zeroOrMore>
+            <ref name="t_gb"/>
+            <ref name="t_gb"/>
+            <choice>
+               <ref name="t_persName"/>
+               <ref name="t_placeName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+            </choice>
+            <ref name="t_gb"/>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <ref name="t_gb"/>
+            <oneOrMore>
+               <choice>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+                  <ref name="t_rs"/>
+               </choice>
+            </oneOrMore>
+            <ref name="t_gb"/>
+            <ref name="t_gb"/>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <optional>
+               <choice>
+                  <ref name="t_orgName"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+               </choice>
+            </optional>
+            <ref name="t_gb"/>
+            <choice>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+               <ref name="t_rs"/>
+            </choice>
+            <choice>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+               <ref name="t_rs"/>
+            </choice>
             <zeroOrMore>
                <choice>
-                  <ref name="t_alt"/>
-                  <ref name="t_ptr"/>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+                  <ref name="t_rs"/>
+               </choice>
+            </zeroOrMore>
+            <ref name="t_gb"/>
+            <ref name="t_gb"/>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <choice>
+               <ref name="t_orgName"/>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+            </choice>
+            <ref name="t_gb"/>
+            <choice>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+               <ref name="t_rs"/>
+            </choice>
+            <choice>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+               <ref name="t_rs"/>
+            </choice>
+            <choice>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+               <ref name="t_rs"/>
+            </choice>
+            <choice>
+               <ref name="t_model.publicationStmtPart.detail"/>
+               <ref name="t_name"/>
+               <ref name="t_rs"/>
+            </choice>
+            <zeroOrMore>
+               <choice>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+                  <ref name="t_name"/>
+                  <ref name="t_rs"/>
                </choice>
             </zeroOrMore>
          </group>
diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd
index 903f5e546..4f01ce38f 100644
--- a/Test2/inputFiles/testPure1.odd
+++ b/Test2/inputFiles/testPure1.odd
@@ -287,6 +287,77 @@
 	  </content>
 	</elementSpec>
 
+	<!-- Test @minOccurs & @maxOccurs on <alternate>  -->
+	<elementSpec ident="altGrp" mode="change" module="header">
+	  <desc/>
+	  <content>
+	    <sequence minOccurs="1" maxOccurs="1">
+	      <alternate minOccurs="0" maxOccurs="1">
+		<elementRef key="persName"/>
+		<elementRef key="placeName"/>
+		<classRef key="model.publicationStmtPart.detail"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="0" maxOccurs="4">
+		<elementRef key="orgName"/>
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="0" maxOccurs="unbounded">
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+		<elementRef key="rs"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="1" maxOccurs="1">
+		<elementRef key="persName"/>
+		<elementRef key="placeName"/>
+		<classRef key="model.publicationStmtPart.detail"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="1" maxOccurs="4">
+		<elementRef key="orgName"/>
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="1" maxOccurs="unbounded">
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+		<elementRef key="rs"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="2" maxOccurs="4">
+		<elementRef key="orgName"/>
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="2" maxOccurs="unbounded">
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+		<elementRef key="rs"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="4" maxOccurs="4">
+		<elementRef key="orgName"/>
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+	      </alternate>
+	      <elementRef key="gb"/>
+	      <alternate minOccurs="4" maxOccurs="unbounded">
+		<classRef key="model.publicationStmtPart.detail"/>
+		<elementRef key="name"/>
+		<elementRef key="rs"/>
+	      </alternate>
+	    </sequence>
+	  </content>
+	</elementSpec>
+	
         <!--
             I wanted to change the content of <ab> just to test
             <anyElement> with @minOccurs and @maxOccurs, using the
diff --git a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
index 251ac1995..d6647b09d 100644
--- a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
+++ b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
@@ -112,6 +112,225 @@
           <choice><corr>order</corr><sic>oder</sic></choice>.</p>
       </div>
 
+      <!-- Test @minOccurs and @maxOccurs on <alternate> -->
+      <div>
+	<head>Testing <att>minOccurs</att> and <att>maxOccurs</att> on <gi>alternate</gi></head>
+	<altGrp type="mins">
+	  <!-- ( persName | placeName | model.publicationStmtPart.detail)?, -->
+	  <gb type="min"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <gb type="min"/>
+	  <!-- ( model.publicationStmtPart.detail | name | rs)*, -->
+	  <gb type="min"/>
+	  <gb type="min"/>
+	  <!-- ( persName | placeName | model.publicationStmtPart.detail), -->
+	  <persName/>
+	  <gb type="min"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <orgName/>
+	  <gb type="min"/>
+	  <!-- ( model.publicationStmtPart.detail | name | rs)+, -->
+	  <name/>
+	  <gb type="min"/>
+	  <gb type="min"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <orgName/>
+	  <date type="model.publicationStmtPart.detail"/>
+	  <gb type="min"/>
+	  <!--
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs)*,
+	  -->
+	  <idno type="model.publicationStmtPart.detail"/>
+	  <rs/>
+	  <gb type="min"/>
+	  <gb type="min"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	  -->
+	  <orgName/>
+	  <pubPlace n="model.publicationStmtPart.detail"/>
+	  <name/>
+	  <orgName/>
+	  <gb type="min"/>
+	  <!--
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs)*),
+	  -->
+	  <rs/><name/><ptr/><rs/>
+	</altGrp>
+	<altGrp type="mids">
+	  <!-- ( persName | placeName | model.publicationStmtPart.detail)?, -->
+	  <persName/>
+	  <gb type="mid"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <orgName/><ptr/>
+	  <gb type="mid"/>
+	  <!-- ( model.publicationStmtPart.detail | name | rs)*, -->
+	  <rs/><name/><name/><ptr/>
+	  <gb type="mid"/>
+	  <gb type="mid"/>
+	  <!-- ( persName | placeName | model.publicationStmtPart.detail), -->
+	  <persName/>
+	  <gb type="mid"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <ptr/><orgName/>
+	  <gb type="mid"/>
+	  <!-- ( model.publicationStmtPart.detail | name | rs)+, -->
+	  <name/><ptr/><rs/><idno n="model.publicationStmtPart.detail"/>
+	  <gb type="mid"/>
+	  <gb type="mid"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <orgName/>
+	  <date type="model.publicationStmtPart.detail"/>
+	  <gb type="mid"/>
+	  <!--
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs)*,
+	  -->
+	  <idno type="model.publicationStmtPart.detail"/>
+	  <rs/>
+	  <ptr/><name/>
+	  <gb type="mid"/>
+	  <gb type="mid"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	  -->
+	  <orgName/>
+	  <pubPlace n="model.publicationStmtPart.detail"/>
+	  <name/>
+	  <orgName/>
+	  <gb type="mid"/>
+	  <!--
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs)*),
+	  -->
+	  <rs/><name/><ptr/><rs/><idno n="model.publicationStmtPart.detail"/><rs/>
+	</altGrp>
+	<altGrp type="mins">
+	  <!-- ( persName | placeName | model.publicationStmtPart.detail)?, -->
+	  <placeName/>
+	  <gb type="max"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <orgName/><ptr/><ref n="model.publicationStmtPart.detail"/><name/>
+	  <gb type="max"/>
+	  <!-- ( model.publicationStmtPart.detail | name | rs)*, -->
+	  <rs n="00"/><rs n="01"/><rs n="02"/><rs n="03"/><rs n="04"/><rs n="05"/><rs n="06"/><rs n="07"/><rs n="08"/><rs n="09"/>
+	  <rs n="10"/><rs n="11"/><rs n="12"/><rs n="13"/><rs n="14"/><rs n="15"/><rs n="16"/><rs n="17"/><rs n="18"/><rs n="19"/>
+	  <rs n="20"/><rs n="21"/><rs n="22"/><rs n="23"/><rs n="24"/><rs n="25"/><rs n="26"/><rs n="27"/><rs n="28"/><rs n="29"/>
+	  <rs n="30"/><rs n="31"/><rs n="32"/><rs n="33"/><rs n="34"/><rs n="35"/><rs n="36"/><rs n="37"/><rs n="38"/><rs n="39"/>
+	  <gb type="max"/>
+	  <gb type="max"/>
+	  <!-- ( persName | placeName | model.publicationStmtPart.detail), -->
+	  <placeName/>
+	  <gb type="max"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <ptr/><orgName/><ref n="model.publicationStmtPart.detail"/><name/>
+	  <gb type="max"/>
+	  <!-- ( model.publicationStmtPart.detail | name | rs)+, -->
+	  <rs n="00"/><name n="01"/><date n="02"/><idno n="03"/><ptr n="04"/><pubPlace n="05"/><ref n="06"/><rs n="07"/><name n="08"/><rs n="09"/>
+	  <rs n="10"/><name n="11"/><date n="12"/><idno n="13"/><ptr n="14"/><pubPlace n="15"/><ref n="16"/><rs n="17"/><name n="18"/><rs n="19"/>
+	  <rs n="20"/><name n="21"/><date n="22"/><idno n="23"/><ptr n="24"/><pubPlace n="25"/><ref n="26"/><rs n="27"/><name n="28"/><rs n="29"/>
+	  <gb type="max"/>
+	  <gb type="max"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	      ( orgName | model.publicationStmtPart.detail | name)?,
+	  -->
+	  <orgName/>
+	  <date type="model.publicationStmtPart.detail"/>
+	  <orgName/>
+	  <name/>
+	  <gb type="max"/>
+	  <!--
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs)*,
+	  -->
+	  <ptr/><name/><rs/><ptr/><rs/><name/><idno/>
+	  <name/><ptr/><ptr/><rs/><name/><rs/><date/>
+	  <gb type="max"/>
+	  <gb type="max"/>
+	  <!--
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	      ( orgName | model.publicationStmtPart.detail | name),
+	  -->
+	  <orgName/>
+	  <pubPlace n="model.publicationStmtPart.detail"/>
+	  <orgName/>
+	  <name/>
+	  <gb type="max"/>
+	  <!--
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs),
+	      ( model.publicationStmtPart.detail | name | rs)*),
+	  -->
+	  <rs n="00"/><ptr n="01"/><date n="02"/><idno n="03"/><ref n="04"/><pubPlace n="05"/><rs n="06"/><rs n="07"/><ptr n="08"/><rs n="09"/>
+	  <rs n="10"/><ptr n="11"/><date n="12"/><idno n="13"/><ref n="14"/><pubPlace n="15"/><rs n="16"/><rs n="17"/><ptr n="18"/><rs n="19"/>
+	  <rs n="20"/><ptr n="21"/><date n="22"/><idno n="23"/><ref n="24"/><pubPlace n="25"/><rs n="26"/><rs n="27"/><ptr n="28"/><rs n="29"/>
+	</altGrp>
+      </div>
+      
       <!-- Temporary test of @minOccurs and @maxOccurs on
            <anyElement>, until testPure1.odd can use intended test
            (i.e., until #631 is fixed). -->
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index 5a80ec6b1..83e34280b 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -178,9 +178,6 @@ of this software, even if advised of the possibility of such damage.
           <xsl:apply-templates mode="tangle" select="."/>
         </xsl:for-each>
         <xsl:for-each select=".//tei:anyElement">
-          <xsl:if test="$verbose eq 'true'">
-            <xsl:message select="'DEBUG: calling anyElement template for #'||position()||' from schemaSpecBody template'"/>
-          </xsl:if>
           <xsl:call-template name="anyElement"/>
         </xsl:for-each>
         <xsl:apply-templates mode="tangle" select="tei:elementSpec|tei:classSpec"/>
@@ -215,9 +212,6 @@ of this software, even if advised of the possibility of such damage.
     <!-- in 2nd and 3rd  passes, throw away any RNG <define> elements
       which do not have a <ref>, any <ref> which has no <define>
       to point to, and any empty <choice> -->
-    <xsl:if test="$verbose eq 'true'">
-      <xsl:message select="'DEBUG: multi-pass time from schemaSpecBody template!'"/>
-    </xsl:if>
     <xsl:variable name="pass2">
       <xsl:for-each select="$pass1/root">
         <root>
@@ -295,9 +289,6 @@ of this software, even if advised of the possibility of such damage.
     <xsl:if test="@type='core'">
       <xsl:call-template name="predeclare-classes"/>
       <xsl:for-each select="//tei:anyElement">
-        <xsl:if test="$verbose eq 'true'">
-          <xsl:message select="'DEBUG: calling anyElement template for #'||position()||' from moduleSpec-body template'"/>
-        </xsl:if>
         <xsl:call-template name="anyElement"/>
       </xsl:for-each>
     </xsl:if>
@@ -390,9 +381,6 @@ of this software, even if advised of the possibility of such damage.
         <xsl:otherwise>http://www.tei-c.org/ns/1.0 teix:egXML</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:if test="$verbose eq 'true'">
-      <xsl:message select="'DEBUG: in anyElement template, set id='||$id"/>
-    </xsl:if>
     <define name="{$id}" xmlns="http://relaxng.org/ns/structure/1.0">
       <element>
         <anyName>
@@ -688,12 +676,6 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
 
   <xsl:template match="rng:define" mode="pass3">
-    <xsl:if test="$verbose eq 'true'">
-      <xsl:message select="'DEBUG: defining ---------'||@name||' with combine='||@combine"/>
-      <xsl:message select="'DEBUG: REFED('||@name||')='||exists(key('REFED',@name))"/>
-      <xsl:message select="'DEBUG: XPAT…('||@name||')='||exists(key('XPATTERNS',@name))"/>
-      <xsl:message select="'DEBUG: '||count(key('DEFED',@name))"></xsl:message>
-    </xsl:if>
     <xsl:choose>
       <xsl:when test="key('REFED',@name) or key('XPATTERNS',@name)">
         <xsl:choose>

From 06e91543348902492e3028e8d12aeaad9f155f19 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Mon, 9 Oct 2023 22:15:58 -0400
Subject: [PATCH 08/50] Convert commented-out debugging code to useful comment.

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

diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index 83e34280b..18fb980d5 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -224,18 +224,17 @@ of this software, even if advised of the possibility of such damage.
         <xsl:apply-templates mode="pass3"/>
       </xsl:for-each>
     </xsl:variable>
-    <!-- <xsl:if test="$verbose eq 'true'"> -->
-    <!--   <xsl:message select="'DEBUG: div it up from within schemaSpecBody template'"/> -->
-    <!--   <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass1"> -->
-    <!--     <xsl:copy-of select="$pass1"/> -->
-    <!--   </rng:div>       -->
-    <!--   <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass2"> -->
-    <!--     <xsl:copy-of select="$pass2"/> -->
-    <!--   </rng:div>       -->
-    <!--   <rng:div ns="http://www.tei-c.org/ns/DEBUG/odd2relax.xsl_pass3"> -->
-    <!--     <xsl:copy-of select="$pass3"/> -->
-    <!--   </rng:div> -->
-    <!-- </xsl:if> -->
+    <!-- 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"/>
 </xsl:template>
 

From be6a80941c56394190dc42c1358ad5daa85d3940 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Thu, 12 Oct 2023 14:09:53 -0400
Subject: [PATCH 09/50] 2 minor updates: 1) Apparently there are times when the
 'c' variable in the template for elementRef|classRef|macroRef boils down to
 an empty sequence. 2) Handle the case when there is no <datatype> child of
 the <attDef> being processed.

---
 odds/odd2dtd.xsl | 4 +++-
 odds/teiodds.xsl | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/odds/odd2dtd.xsl b/odds/odd2dtd.xsl
index 6f0f06039..79e05e414 100644
--- a/odds/odd2dtd.xsl
+++ b/odds/odd2dtd.xsl
@@ -1519,7 +1519,9 @@ of this software, even if advised of the possibility of such damage.
       </xsl:when>
     </xsl:choose>
     <xsl:value-of select="tei:createSpecName(.)"/>
-    <xsl:variable name="datNorMinMax" select="tei:norMinMax( tei:datatype )"/>
+    <xsl:variable name="datNorMinMax" select="if ( tei:datatype )
+					      then tei:norMinMax( tei:datatype )
+					      else ( 1, 1 )"/>
     <xsl:variable name="datmin" select="$datNorMinMax[1]"/>
     <xsl:variable name="datmax" select="$datNorMinMax[2]"/>
     <xsl:choose>
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 58e87471f..2d751172a 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -2149,7 +2149,7 @@ of this software, even if advised of the possibility of such damage.
     <xsl:variable name="this" select="@key"/>
     <xsl:variable name="except" select="@except"/>
     <xsl:variable name="include" select="@include"/>
-    <xsl:variable name="c" as="element()+">
+    <xsl:variable name="c" as="element()*">
       <xsl:choose>
         <xsl:when test="not(@expand) and (@include or @except)">
           <xsl:variable name="context" select="."/>

From 1b8d7ddce8bc3e8eece68862217b132125ed5884 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sat, 4 Nov 2023 21:49:00 -0400
Subject: [PATCH 10/50] This state of repo is (I believe) not working as per my
 comment of 2023-10-15 on PR #633.

---
 Test2/expected-results/testAttValQuant.rng    | 520 ++++-----
 Test2/expected-results/testNonTeiOdd1.rng     |  14 +-
 Test2/expected-results/testPure1.rng          | 994 ++++++++----------
 .../testPure1InvalidInstanceRngMessages.txt   |   9 +-
 .../testPure1InvalidInstance.xml              |  24 +-
 Test2/inputFiles/testPure1.odd                |  42 +-
 .../validInstances/testPure1ValidInstance.xml | 164 +--
 odds/odd2relax.xsl                            |  13 +
 odds/teiodds.xsl                              |  16 +-
 9 files changed, 869 insertions(+), 927 deletions(-)

diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index 4e302178c..b77f5f1aa 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -4128,12 +4128,10 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
                <ref name="model.global"/>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="model.addrPart"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.addrPart"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -4386,12 +4384,10 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </zeroOrMore>
             <choice>
                <oneOrMore>
-                  <group>
-                     <ref name="item"/>
-                     <zeroOrMore>
-                        <ref name="model.global"/>
-                     </zeroOrMore>
-                  </group>
+                  <ref name="item"/>
+                  <zeroOrMore>
+                     <ref name="model.global"/>
+                  </zeroOrMore>
                </oneOrMore>
                <group>
                   <optional>
@@ -4401,26 +4397,22 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                      <ref name="headItem"/>
                   </optional>
                   <oneOrMore>
-                     <group>
-                        <ref name="label"/>
-                        <zeroOrMore>
-                           <ref name="model.global"/>
-                        </zeroOrMore>
-                        <ref name="item"/>
-                        <zeroOrMore>
-                           <ref name="model.global"/>
-                        </zeroOrMore>
-                     </group>
+                     <ref name="label"/>
+                     <zeroOrMore>
+                        <ref name="model.global"/>
+                     </zeroOrMore>
+                     <ref name="item"/>
+                     <zeroOrMore>
+                        <ref name="model.global"/>
+                     </zeroOrMore>
                   </oneOrMore>
                </group>
             </choice>
             <zeroOrMore>
-               <group>
-                  <ref name="model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.divBottom"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -4557,12 +4549,10 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <element name="index">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index entry) marks a location to be indexed for whatever purpose. [3.9.2. Index Entries]</a:documentation>
          <zeroOrMore>
-            <group>
-               <ref name="term"/>
-               <optional>
-                  <ref name="index"/>
-               </optional>
-            </group>
+            <ref name="term"/>
+            <optional>
+               <ref name="index"/>
+            </optional>
          </zeroOrMore>
          <ref name="att.global.attributes"/>
          <ref name="att.spanning.attributes"/>
@@ -4792,19 +4782,17 @@ Elements]</a:documentation>
                <ref name="model.noteLike"/>
             </zeroOrMore>
             <zeroOrMore>
-               <group>
-                  <ref name="edition"/>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="idno"/>
-                        <ref name="model.ptrLike"/>
-                        <ref name="editor"/>
-                        <ref name="sponsor"/>
-                        <ref name="funder"/>
-                        <ref name="respStmt"/>
-                     </choice>
-                  </zeroOrMore>
-               </group>
+               <ref name="edition"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="idno"/>
+                     <ref name="model.ptrLike"/>
+                     <ref name="editor"/>
+                     <ref name="sponsor"/>
+                     <ref name="funder"/>
+                     <ref name="respStmt"/>
+                  </choice>
+               </zeroOrMore>
             </zeroOrMore>
             <ref name="imprint"/>
             <zeroOrMore>
@@ -4960,18 +4948,16 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
                </choice>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <choice>
-                     <ref name="model.imprintPart"/>
-                     <ref name="model.dateLike"/>
-                  </choice>
-                  <zeroOrMore>
-                     <ref name="respStmt"/>
-                  </zeroOrMore>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <choice>
+                  <ref name="model.imprintPart"/>
+                  <ref name="model.dateLike"/>
+               </choice>
+               <zeroOrMore>
+                  <ref name="respStmt"/>
+               </zeroOrMore>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -5047,12 +5033,10 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
                <ref name="analytic"/>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="monogr"/>
-                  <zeroOrMore>
-                     <ref name="series"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="monogr"/>
+               <zeroOrMore>
+                  <ref name="series"/>
+               </zeroOrMore>
             </oneOrMore>
             <zeroOrMore>
                <choice>
@@ -5087,16 +5071,14 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
                </choice>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <oneOrMore>
-                     <ref name="model.biblLike"/>
-                  </oneOrMore>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="model.milestoneLike"/>
-                     </choice>
-                  </zeroOrMore>
-               </group>
+               <oneOrMore>
+                  <ref name="model.biblLike"/>
+               </oneOrMore>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="model.milestoneLike"/>
+                  </choice>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -5199,12 +5181,10 @@ relatedItem element must be empty</sch:report>
                </choice>
             </zeroOrMore>
             <zeroOrMore>
-               <group>
-                  <ref name="model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.divBottom"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -5243,30 +5223,26 @@ relatedItem element must be empty</sch:report>
                <ref name="model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="speaker"/>
+               <ref name="speaker"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
+            </optional>
+            <oneOrMore>
+               <choice>
+                  <ref name="lg"/>
+                  <ref name="model.lLike"/>
+                  <ref name="model.pLike"/>
+                  <ref name="model.listLike"/>
+                  <ref name="model.stageLike"/>
+                  <ref name="model.attributable"/>
+               </choice>
+               <choice>
                   <zeroOrMore>
                      <ref name="model.global"/>
                   </zeroOrMore>
-               </group>
-            </optional>
-            <oneOrMore>
-               <group>
-                  <choice>
-                     <ref name="lg"/>
-                     <ref name="model.lLike"/>
-                     <ref name="model.pLike"/>
-                     <ref name="model.listLike"/>
-                     <ref name="model.stageLike"/>
-                     <ref name="model.attributable"/>
-                  </choice>
-                  <choice>
-                     <zeroOrMore>
-                        <ref name="model.global"/>
-                     </zeroOrMore>
-                     <ref name="q"/>
-                  </choice>
-               </group>
+                  <ref name="q"/>
+               </choice>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -5563,12 +5539,10 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(publication statement) groups information concerning the publication or distribution of an electronic or other text. [2.2.4. Publication, Distribution, Licensing, etc. 2.2. The File Description]</a:documentation>
          <choice>
             <oneOrMore>
-               <group>
-                  <ref name="model.publicationStmtPart.agency"/>
-                  <zeroOrMore>
-                     <ref name="model.publicationStmtPart.detail"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.publicationStmtPart.agency"/>
+               <zeroOrMore>
+                  <ref name="model.publicationStmtPart.detail"/>
+               </zeroOrMore>
             </oneOrMore>
             <oneOrMore>
                <ref name="model.pLike"/>
@@ -6916,12 +6890,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <ref name="model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="front"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="front"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </optional>
             <choice>
                <ref name="body"/>
@@ -6931,12 +6903,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <ref name="model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="back"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="back"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </optional>
          </group>
          <ref name="att.global.attributes"/>
@@ -6954,96 +6924,80 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <ref name="model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="model.divTop"/>
+               <ref name="model.divTop"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="model.global"/>
+                     <ref name="model.divTop"/>
+                  </choice>
+               </zeroOrMore>
+            </optional>
+            <optional>
+               <ref name="model.divGenLike"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="model.global"/>
+                     <ref name="model.divGenLike"/>
+                  </choice>
+               </zeroOrMore>
+            </optional>
+            <choice>
+               <oneOrMore>
+                  <ref name="model.divLike"/>
                   <zeroOrMore>
                      <choice>
                         <ref name="model.global"/>
-                        <ref name="model.divTop"/>
+                        <ref name="model.divGenLike"/>
                      </choice>
                   </zeroOrMore>
-               </group>
-            </optional>
-            <optional>
-               <group>
-                  <ref name="model.divGenLike"/>
+               </oneOrMore>
+               <oneOrMore>
+                  <ref name="model.div1Like"/>
                   <zeroOrMore>
                      <choice>
                         <ref name="model.global"/>
                         <ref name="model.divGenLike"/>
                      </choice>
                   </zeroOrMore>
-               </group>
-            </optional>
-            <choice>
-               <oneOrMore>
-                  <group>
-                     <ref name="model.divLike"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="model.global"/>
-                           <ref name="model.divGenLike"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
-               </oneOrMore>
-               <oneOrMore>
-                  <group>
-                     <ref name="model.div1Like"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="model.global"/>
-                           <ref name="model.divGenLike"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
                </oneOrMore>
                <group>
                   <oneOrMore>
-                     <group>
-                        <choice>
-                           <ref name="model.common"/>
-                        </choice>
-                        <zeroOrMore>
-                           <ref name="model.global"/>
-                        </zeroOrMore>
-                     </group>
+                     <choice>
+                        <ref name="model.common"/>
+                     </choice>
+                     <zeroOrMore>
+                        <ref name="model.global"/>
+                     </zeroOrMore>
                   </oneOrMore>
                   <optional>
                      <choice>
                         <oneOrMore>
-                           <group>
-                              <ref name="model.divLike"/>
-                              <zeroOrMore>
-                                 <choice>
-                                    <ref name="model.global"/>
-                                    <ref name="model.divGenLike"/>
-                                 </choice>
-                              </zeroOrMore>
-                           </group>
+                           <ref name="model.divLike"/>
+                           <zeroOrMore>
+                              <choice>
+                                 <ref name="model.global"/>
+                                 <ref name="model.divGenLike"/>
+                              </choice>
+                           </zeroOrMore>
                         </oneOrMore>
                         <oneOrMore>
-                           <group>
-                              <ref name="model.div1Like"/>
-                              <zeroOrMore>
-                                 <choice>
-                                    <ref name="model.global"/>
-                                    <ref name="model.divGenLike"/>
-                                 </choice>
-                              </zeroOrMore>
-                           </group>
+                           <ref name="model.div1Like"/>
+                           <zeroOrMore>
+                              <choice>
+                                 <ref name="model.global"/>
+                                 <ref name="model.divGenLike"/>
+                              </choice>
+                           </zeroOrMore>
                         </oneOrMore>
                      </choice>
                   </optional>
                </group>
             </choice>
             <zeroOrMore>
-               <group>
-                  <ref name="model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.divBottom"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -7092,12 +7046,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <ref name="model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="front"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="front"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </optional>
             <choice>
                <ref name="body"/>
@@ -7107,12 +7059,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <ref name="model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="back"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="back"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </optional>
          </group>
          <ref name="att.global.attributes"/>
@@ -7132,52 +7082,42 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                </choice>
             </zeroOrMore>
             <optional>
-               <group>
-                  <choice>
+               <choice>
+                  <oneOrMore>
+                     <choice>
+                        <ref name="model.divLike"/>
+                        <ref name="model.divGenLike"/>
+                     </choice>
+                     <zeroOrMore>
+                        <ref name="model.global"/>
+                     </zeroOrMore>
+                  </oneOrMore>
+                  <group>
                      <oneOrMore>
-                        <group>
-                           <choice>
-                              <ref name="model.divLike"/>
-                              <ref name="model.divGenLike"/>
-                           </choice>
-                           <zeroOrMore>
-                              <ref name="model.global"/>
-                           </zeroOrMore>
-                        </group>
-                     </oneOrMore>
-                     <group>
-                        <oneOrMore>
-                           <group>
-                              <choice>
-                                 <ref name="model.common"/>
-                              </choice>
-                              <zeroOrMore>
-                                 <ref name="model.global"/>
-                              </zeroOrMore>
-                           </group>
-                        </oneOrMore>
+                        <choice>
+                           <ref name="model.common"/>
+                        </choice>
                         <zeroOrMore>
-                           <group>
-                              <choice>
-                                 <ref name="model.divLike"/>
-                                 <ref name="model.divGenLike"/>
-                              </choice>
-                              <zeroOrMore>
-                                 <ref name="model.global"/>
-                              </zeroOrMore>
-                           </group>
+                           <ref name="model.global"/>
                         </zeroOrMore>
-                     </group>
-                  </choice>
-                  <zeroOrMore>
-                     <group>
-                        <ref name="model.divBottom"/>
+                     </oneOrMore>
+                     <zeroOrMore>
+                        <choice>
+                           <ref name="model.divLike"/>
+                           <ref name="model.divGenLike"/>
+                        </choice>
                         <zeroOrMore>
                            <ref name="model.global"/>
                         </zeroOrMore>
-                     </group>
+                     </zeroOrMore>
+                  </group>
+               </choice>
+               <zeroOrMore>
+                  <ref name="model.divBottom"/>
+                  <zeroOrMore>
+                     <ref name="model.global"/>
                   </zeroOrMore>
-               </group>
+               </zeroOrMore>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -7274,12 +7214,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                </choice>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="model.common"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.common"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -7376,12 +7314,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                </choice>
             </zeroOrMore>
             <zeroOrMore>
-               <group>
-                  <ref name="model.divBottomPart"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.divBottomPart"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -7425,12 +7361,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <ref name="model.global"/>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="titlePart"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="titlePart"/>
+               <zeroOrMore>
+                  <ref name="model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
@@ -7549,41 +7483,37 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                </choice>
             </zeroOrMore>
             <optional>
-               <group>
-                  <choice>
-                     <group>
-                        <ref name="model.div1Like"/>
-                        <zeroOrMore>
-                           <choice>
-                              <ref name="model.div1Like"/>
-                              <ref name="model.frontPart"/>
-                              <ref name="model.global"/>
-                           </choice>
-                        </zeroOrMore>
-                     </group>
-                     <group>
-                        <ref name="model.divLike"/>
-                        <zeroOrMore>
-                           <choice>
-                              <ref name="model.divLike"/>
-                              <ref name="model.frontPart"/>
-                              <ref name="model.global"/>
-                           </choice>
-                        </zeroOrMore>
-                     </group>
-                  </choice>
-                  <optional>
-                     <group>
+               <choice>
+                  <group>
+                     <ref name="model.div1Like"/>
+                     <zeroOrMore>
+                        <choice>
+                           <ref name="model.div1Like"/>
+                           <ref name="model.frontPart"/>
+                           <ref name="model.global"/>
+                        </choice>
+                     </zeroOrMore>
+                  </group>
+                  <group>
+                     <ref name="model.divLike"/>
+                     <zeroOrMore>
+                        <choice>
+                           <ref name="model.divLike"/>
+                           <ref name="model.frontPart"/>
+                           <ref name="model.global"/>
+                        </choice>
+                     </zeroOrMore>
+                  </group>
+               </choice>
+               <optional>
+                  <ref name="model.divBottom"/>
+                  <zeroOrMore>
+                     <choice>
                         <ref name="model.divBottom"/>
-                        <zeroOrMore>
-                           <choice>
-                              <ref name="model.divBottom"/>
-                              <ref name="model.global"/>
-                           </choice>
-                        </zeroOrMore>
-                     </group>
-                  </optional>
-               </group>
+                        <ref name="model.global"/>
+                     </choice>
+                  </zeroOrMore>
+               </optional>
             </optional>
          </group>
          <ref name="att.global.attributes"/>
@@ -7629,15 +7559,13 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                </choice>
             </optional>
             <optional>
-               <group>
-                  <ref name="model.divBottomPart"/>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="model.divBottomPart"/>
-                        <ref name="model.global"/>
-                     </choice>
-                  </zeroOrMore>
-               </group>
+               <ref name="model.divBottomPart"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="model.divBottomPart"/>
+                     <ref name="model.global"/>
+                  </choice>
+               </zeroOrMore>
             </optional>
          </group>
          <ref name="att.global.attributes"/>
diff --git a/Test2/expected-results/testNonTeiOdd1.rng b/Test2/expected-results/testNonTeiOdd1.rng
index c0ae33e2e..2c3984af0 100644
--- a/Test2/expected-results/testNonTeiOdd1.rng
+++ b/Test2/expected-results/testNonTeiOdd1.rng
@@ -328,14 +328,12 @@
       <element name="tr" ns="http://www.w3.org/1999/xhtml">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A table row.</a:documentation>
          <oneOrMore>
-            <group>
-               <zeroOrMore>
-                  <ref name="th"/>
-               </zeroOrMore>
-               <zeroOrMore>
-                  <ref name="td"/>
-               </zeroOrMore>
-            </group>
+            <zeroOrMore>
+               <ref name="th"/>
+            </zeroOrMore>
+            <zeroOrMore>
+               <ref name="td"/>
+            </zeroOrMore>
          </oneOrMore>
       </element>
    </define>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index f6d044e90..aadb94daf 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -112,7 +112,7 @@
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_0_1">
+   <define name="anyElement-openPara_0-1">
       <element>
          <anyName>
             <except>
@@ -128,12 +128,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_0_1"/>
+               <ref name="anyElement-openPara_0-1"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_0_2">
+   <define name="anyElement-openPara_0-2">
       <element>
          <anyName>
             <except>
@@ -149,12 +149,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_0_2"/>
+               <ref name="anyElement-openPara_0-2"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_0_6">
+   <define name="anyElement-openPara_0-6">
       <element>
          <anyName>
             <except>
@@ -170,12 +170,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_0_6"/>
+               <ref name="anyElement-openPara_0-6"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_0_unbounded">
+   <define name="anyElement-openPara_0-unbounded">
       <element>
          <anyName>
             <except>
@@ -191,12 +191,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_0_unbounded"/>
+               <ref name="anyElement-openPara_0-unbounded"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_1_1">
+   <define name="anyElement-openPara_1-1">
       <element>
          <anyName>
             <except>
@@ -212,12 +212,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_1_1"/>
+               <ref name="anyElement-openPara_1-1"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_1_2">
+   <define name="anyElement-openPara_1-2">
       <element>
          <anyName>
             <except>
@@ -233,12 +233,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_1_2"/>
+               <ref name="anyElement-openPara_1-2"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_1_6">
+   <define name="anyElement-openPara_1-6">
       <element>
          <anyName>
             <except>
@@ -254,12 +254,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_1_6"/>
+               <ref name="anyElement-openPara_1-6"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_1_unbounded">
+   <define name="anyElement-openPara_1-unbounded">
       <element>
          <anyName>
             <except>
@@ -275,12 +275,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_1_unbounded"/>
+               <ref name="anyElement-openPara_1-unbounded"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_2_2">
+   <define name="anyElement-openPara_2-2">
       <element>
          <anyName>
             <except>
@@ -296,12 +296,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_2_2"/>
+               <ref name="anyElement-openPara_2-2"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_2_6">
+   <define name="anyElement-openPara_2-6">
       <element>
          <anyName>
             <except>
@@ -317,12 +317,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_2_6"/>
+               <ref name="anyElement-openPara_2-6"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_2_unbounded">
+   <define name="anyElement-openPara_2-unbounded">
       <element>
          <anyName>
             <except>
@@ -338,12 +338,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_2_unbounded"/>
+               <ref name="anyElement-openPara_2-unbounded"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_4_6">
+   <define name="anyElement-openPara_4-6">
       <element>
          <anyName>
             <except>
@@ -359,12 +359,12 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_4_6"/>
+               <ref name="anyElement-openPara_4-6"/>
             </choice>
          </zeroOrMore>
       </element>
    </define>
-   <define name="anyElement-openPara_4_unbounded">
+   <define name="anyElement-openPara_4-unbounded">
       <element>
          <anyName>
             <except>
@@ -380,7 +380,7 @@
          <zeroOrMore>
             <choice>
                <text/>
-               <ref name="anyElement-openPara_4_unbounded"/>
+               <ref name="anyElement-openPara_4-unbounded"/>
             </choice>
          </zeroOrMore>
       </element>
@@ -3342,59 +3342,62 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <choice>
          <ref name="t_p"/>
          <ref name="t_ab"/>
+         <ref name="t_alt_of_seq_3-4"/>
          <ref name="t_openPara_plain"/>
-         <ref name="t_openPara_0_1"/>
-         <ref name="t_openPara_0_2"/>
-         <ref name="t_openPara_0_6"/>
-         <ref name="t_openPara_0_unbounded"/>
-         <ref name="t_openPara_1_1"/>
-         <ref name="t_openPara_1_2"/>
-         <ref name="t_openPara_1_6"/>
-         <ref name="t_openPara_1_unbounded"/>
-         <ref name="t_openPara_2_2"/>
-         <ref name="t_openPara_2_6"/>
-         <ref name="t_openPara_2_unbounded"/>
-         <ref name="t_openPara_4_6"/>
-         <ref name="t_openPara_4_unbounded"/>
+         <ref name="t_openPara_0-1"/>
+         <ref name="t_openPara_0-2"/>
+         <ref name="t_openPara_0-6"/>
+         <ref name="t_openPara_0-unbounded"/>
+         <ref name="t_openPara_1-1"/>
+         <ref name="t_openPara_1-2"/>
+         <ref name="t_openPara_1-6"/>
+         <ref name="t_openPara_1-unbounded"/>
+         <ref name="t_openPara_2-2"/>
+         <ref name="t_openPara_2-6"/>
+         <ref name="t_openPara_2-unbounded"/>
+         <ref name="t_openPara_4-6"/>
+         <ref name="t_openPara_4-unbounded"/>
       </choice>
    </define>
    <define name="t_model.pLike_alternation">
       <choice>
          <ref name="t_p"/>
          <ref name="t_ab"/>
+         <ref name="t_alt_of_seq_3-4"/>
          <ref name="t_openPara_plain"/>
-         <ref name="t_openPara_0_1"/>
-         <ref name="t_openPara_0_2"/>
-         <ref name="t_openPara_0_6"/>
-         <ref name="t_openPara_0_unbounded"/>
-         <ref name="t_openPara_1_1"/>
-         <ref name="t_openPara_1_2"/>
-         <ref name="t_openPara_1_6"/>
-         <ref name="t_openPara_1_unbounded"/>
-         <ref name="t_openPara_2_2"/>
-         <ref name="t_openPara_2_6"/>
-         <ref name="t_openPara_2_unbounded"/>
-         <ref name="t_openPara_4_6"/>
-         <ref name="t_openPara_4_unbounded"/>
+         <ref name="t_openPara_0-1"/>
+         <ref name="t_openPara_0-2"/>
+         <ref name="t_openPara_0-6"/>
+         <ref name="t_openPara_0-unbounded"/>
+         <ref name="t_openPara_1-1"/>
+         <ref name="t_openPara_1-2"/>
+         <ref name="t_openPara_1-6"/>
+         <ref name="t_openPara_1-unbounded"/>
+         <ref name="t_openPara_2-2"/>
+         <ref name="t_openPara_2-6"/>
+         <ref name="t_openPara_2-unbounded"/>
+         <ref name="t_openPara_4-6"/>
+         <ref name="t_openPara_4-unbounded"/>
       </choice>
    </define>
    <define name="t_model.pLike_sequence">
       <ref name="t_p"/>
       <ref name="t_ab"/>
+      <ref name="t_alt_of_seq_3-4"/>
       <ref name="t_openPara_plain"/>
-      <ref name="t_openPara_0_1"/>
-      <ref name="t_openPara_0_2"/>
-      <ref name="t_openPara_0_6"/>
-      <ref name="t_openPara_0_unbounded"/>
-      <ref name="t_openPara_1_1"/>
-      <ref name="t_openPara_1_2"/>
-      <ref name="t_openPara_1_6"/>
-      <ref name="t_openPara_1_unbounded"/>
-      <ref name="t_openPara_2_2"/>
-      <ref name="t_openPara_2_6"/>
-      <ref name="t_openPara_2_unbounded"/>
-      <ref name="t_openPara_4_6"/>
-      <ref name="t_openPara_4_unbounded"/>
+      <ref name="t_openPara_0-1"/>
+      <ref name="t_openPara_0-2"/>
+      <ref name="t_openPara_0-6"/>
+      <ref name="t_openPara_0-unbounded"/>
+      <ref name="t_openPara_1-1"/>
+      <ref name="t_openPara_1-2"/>
+      <ref name="t_openPara_1-6"/>
+      <ref name="t_openPara_1-unbounded"/>
+      <ref name="t_openPara_2-2"/>
+      <ref name="t_openPara_2-6"/>
+      <ref name="t_openPara_2-unbounded"/>
+      <ref name="t_openPara_4-6"/>
+      <ref name="t_openPara_4-unbounded"/>
    </define>
    <define name="t_model.pLike_sequenceOptional">
       <optional>
@@ -3403,47 +3406,50 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <optional>
          <ref name="t_ab"/>
       </optional>
+      <optional>
+         <ref name="t_alt_of_seq_3-4"/>
+      </optional>
       <optional>
          <ref name="t_openPara_plain"/>
       </optional>
       <optional>
-         <ref name="t_openPara_0_1"/>
+         <ref name="t_openPara_0-1"/>
       </optional>
       <optional>
-         <ref name="t_openPara_0_2"/>
+         <ref name="t_openPara_0-2"/>
       </optional>
       <optional>
-         <ref name="t_openPara_0_6"/>
+         <ref name="t_openPara_0-6"/>
       </optional>
       <optional>
-         <ref name="t_openPara_0_unbounded"/>
+         <ref name="t_openPara_0-unbounded"/>
       </optional>
       <optional>
-         <ref name="t_openPara_1_1"/>
+         <ref name="t_openPara_1-1"/>
       </optional>
       <optional>
-         <ref name="t_openPara_1_2"/>
+         <ref name="t_openPara_1-2"/>
       </optional>
       <optional>
-         <ref name="t_openPara_1_6"/>
+         <ref name="t_openPara_1-6"/>
       </optional>
       <optional>
-         <ref name="t_openPara_1_unbounded"/>
+         <ref name="t_openPara_1-unbounded"/>
       </optional>
       <optional>
-         <ref name="t_openPara_2_2"/>
+         <ref name="t_openPara_2-2"/>
       </optional>
       <optional>
-         <ref name="t_openPara_2_6"/>
+         <ref name="t_openPara_2-6"/>
       </optional>
       <optional>
-         <ref name="t_openPara_2_unbounded"/>
+         <ref name="t_openPara_2-unbounded"/>
       </optional>
       <optional>
-         <ref name="t_openPara_4_6"/>
+         <ref name="t_openPara_4-6"/>
       </optional>
       <optional>
-         <ref name="t_openPara_4_unbounded"/>
+         <ref name="t_openPara_4-unbounded"/>
       </optional>
    </define>
    <define name="t_model.pLike_sequenceOptionalRepeatable">
@@ -3453,47 +3459,50 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <zeroOrMore>
          <ref name="t_ab"/>
       </zeroOrMore>
+      <zeroOrMore>
+         <ref name="t_alt_of_seq_3-4"/>
+      </zeroOrMore>
       <zeroOrMore>
          <ref name="t_openPara_plain"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_0_1"/>
+         <ref name="t_openPara_0-1"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_0_2"/>
+         <ref name="t_openPara_0-2"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_0_6"/>
+         <ref name="t_openPara_0-6"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_0_unbounded"/>
+         <ref name="t_openPara_0-unbounded"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_1_1"/>
+         <ref name="t_openPara_1-1"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_1_2"/>
+         <ref name="t_openPara_1-2"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_1_6"/>
+         <ref name="t_openPara_1-6"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_1_unbounded"/>
+         <ref name="t_openPara_1-unbounded"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_2_2"/>
+         <ref name="t_openPara_2-2"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_2_6"/>
+         <ref name="t_openPara_2-6"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_2_unbounded"/>
+         <ref name="t_openPara_2-unbounded"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_4_6"/>
+         <ref name="t_openPara_4-6"/>
       </zeroOrMore>
       <zeroOrMore>
-         <ref name="t_openPara_4_unbounded"/>
+         <ref name="t_openPara_4-unbounded"/>
       </zeroOrMore>
    </define>
    <define name="t_model.pLike_sequenceRepeatable">
@@ -3503,47 +3512,50 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <oneOrMore>
          <ref name="t_ab"/>
       </oneOrMore>
+      <oneOrMore>
+         <ref name="t_alt_of_seq_3-4"/>
+      </oneOrMore>
       <oneOrMore>
          <ref name="t_openPara_plain"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_0_1"/>
+         <ref name="t_openPara_0-1"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_0_2"/>
+         <ref name="t_openPara_0-2"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_0_6"/>
+         <ref name="t_openPara_0-6"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_0_unbounded"/>
+         <ref name="t_openPara_0-unbounded"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_1_1"/>
+         <ref name="t_openPara_1-1"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_1_2"/>
+         <ref name="t_openPara_1-2"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_1_6"/>
+         <ref name="t_openPara_1-6"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_1_unbounded"/>
+         <ref name="t_openPara_1-unbounded"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_2_2"/>
+         <ref name="t_openPara_2-2"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_2_6"/>
+         <ref name="t_openPara_2-6"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_2_unbounded"/>
+         <ref name="t_openPara_2-unbounded"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_4_6"/>
+         <ref name="t_openPara_4-6"/>
       </oneOrMore>
       <oneOrMore>
-         <ref name="t_openPara_4_unbounded"/>
+         <ref name="t_openPara_4-unbounded"/>
       </oneOrMore>
    </define>
    <define name="t_model.stageLike">
@@ -5028,12 +5040,10 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
                <ref name="t_model.global"/>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="t_model.addrPart"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.addrPart"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -5318,12 +5328,10 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </zeroOrMore>
             <choice>
                <oneOrMore>
-                  <group>
-                     <ref name="t_item"/>
-                     <zeroOrMore>
-                        <ref name="t_model.global"/>
-                     </zeroOrMore>
-                  </group>
+                  <ref name="t_item"/>
+                  <zeroOrMore>
+                     <ref name="t_model.global"/>
+                  </zeroOrMore>
                </oneOrMore>
                <group>
                   <optional>
@@ -5333,26 +5341,22 @@ attributes @target and @cRef may be supplied on <name/>.</report>
                      <ref name="t_headItem"/>
                   </optional>
                   <oneOrMore>
-                     <group>
-                        <ref name="t_label"/>
-                        <zeroOrMore>
-                           <ref name="t_model.global"/>
-                        </zeroOrMore>
-                        <ref name="t_item"/>
-                        <zeroOrMore>
-                           <ref name="t_model.global"/>
-                        </zeroOrMore>
-                     </group>
+                     <ref name="t_label"/>
+                     <zeroOrMore>
+                        <ref name="t_model.global"/>
+                     </zeroOrMore>
+                     <ref name="t_item"/>
+                     <zeroOrMore>
+                        <ref name="t_model.global"/>
+                     </zeroOrMore>
                   </oneOrMore>
                </group>
             </choice>
             <zeroOrMore>
-               <group>
-                  <ref name="t_model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.divBottom"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -5466,12 +5470,10 @@ attributes @target and @cRef may be supplied on <name/>.</report>
       <element name="index">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index entry) marks a location to be indexed for whatever purpose. [3.9.2. Index Entries]</a:documentation>
          <zeroOrMore>
-            <group>
-               <ref name="t_term"/>
-               <optional>
-                  <ref name="t_index"/>
-               </optional>
-            </group>
+            <ref name="t_term"/>
+            <optional>
+               <ref name="t_index"/>
+            </optional>
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.spanning.attributes"/>
@@ -5770,18 +5772,16 @@ Elements]</a:documentation>
                </choice>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <choice>
-                     <ref name="t_model.imprintPart"/>
-                     <ref name="t_model.dateLike"/>
-                  </choice>
-                  <zeroOrMore>
-                     <ref name="t_respStmt"/>
-                  </zeroOrMore>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <choice>
+                  <ref name="t_model.imprintPart"/>
+                  <ref name="t_model.dateLike"/>
+               </choice>
+               <zeroOrMore>
+                  <ref name="t_respStmt"/>
+               </zeroOrMore>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -5902,16 +5902,14 @@ Elements]</a:documentation>
                </choice>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <oneOrMore>
-                     <ref name="t_model.biblLike"/>
-                  </oneOrMore>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="t_model.milestoneLike"/>
-                     </choice>
-                  </zeroOrMore>
-               </group>
+               <oneOrMore>
+                  <ref name="t_model.biblLike"/>
+               </oneOrMore>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="t_model.milestoneLike"/>
+                  </choice>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -6014,12 +6012,10 @@ relatedItem element must be empty</sch:report>
                </choice>
             </zeroOrMore>
             <zeroOrMore>
-               <group>
-                  <ref name="t_model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.divBottom"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -6058,30 +6054,26 @@ relatedItem element must be empty</sch:report>
                <ref name="t_model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="t_speaker"/>
+               <ref name="t_speaker"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
+            </optional>
+            <oneOrMore>
+               <choice>
+                  <ref name="t_lg"/>
+                  <ref name="t_model.lLike"/>
+                  <ref name="t_model.pLike"/>
+                  <ref name="t_model.listLike"/>
+                  <ref name="t_model.stageLike"/>
+                  <ref name="t_model.attributable"/>
+               </choice>
+               <choice>
                   <zeroOrMore>
                      <ref name="t_model.global"/>
                   </zeroOrMore>
-               </group>
-            </optional>
-            <oneOrMore>
-               <group>
-                  <choice>
-                     <ref name="t_lg"/>
-                     <ref name="t_model.lLike"/>
-                     <ref name="t_model.pLike"/>
-                     <ref name="t_model.listLike"/>
-                     <ref name="t_model.stageLike"/>
-                     <ref name="t_model.attributable"/>
-                  </choice>
-                  <choice>
-                     <zeroOrMore>
-                        <ref name="t_model.global"/>
-                     </zeroOrMore>
-                     <ref name="t_q"/>
-                  </choice>
-               </group>
+                  <ref name="t_q"/>
+               </choice>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -6377,12 +6369,10 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(publication statement) groups information concerning the publication or distribution of an electronic or other text. [2.2.4. Publication, Distribution, Licensing, etc. 2.2. The File Description]</a:documentation>
          <choice>
             <oneOrMore>
-               <group>
-                  <ref name="t_model.publicationStmtPart.agency"/>
-                  <zeroOrMore>
-                     <ref name="t_model.publicationStmtPart.detail"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.publicationStmtPart.agency"/>
+               <zeroOrMore>
+                  <ref name="t_model.publicationStmtPart.detail"/>
+               </zeroOrMore>
             </oneOrMore>
             <oneOrMore>
                <ref name="t_model.pLike"/>
@@ -6498,53 +6488,43 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(series statement)  [2.2.5. The Series Statement 2.2. The File Description]</a:documentation>
          <choice>
             <optional>
-               <group>
-                  <ref name="t_label"/>
-                  <ref name="t_said"/>
-                  <ref name="t_pc"/>
-               </group>
+               <ref name="t_label"/>
+               <ref name="t_said"/>
+               <ref name="t_pc"/>
             </optional>
-            <optional>
-               <group>
+            <group>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.biblPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
-            <optional>
-               <group>
+               </optional>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.biblPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
-            <optional>
-               <group>
+               </optional>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.biblPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
-            <optional>
-               <group>
+               </optional>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.biblPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
+               </optional>
+            </group>
             <zeroOrMore>
-               <group>
-                  <ref name="t_label"/>
-                  <ref name="t_pc"/>
-               </group>
+               <ref name="t_label"/>
+               <ref name="t_pc"/>
             </zeroOrMore>
             <group>
                <ref name="t_label"/>
@@ -6557,47 +6537,37 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                   <ref name="t_model.orgPart"/>
                </optional>
                <ref name="t_pc"/>
-            </group>
-            <optional>
-               <group>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.orgPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
-            <optional>
-               <group>
+               </optional>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.orgPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
-            <optional>
-               <group>
+               </optional>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.orgPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
+               </optional>
+            </group>
             <oneOrMore>
-               <group>
-                  <ref name="t_label"/>
-                  <ref name="t_model.objectLike"/>
-                  <ref name="t_pc"/>
-               </group>
+               <ref name="t_label"/>
+               <ref name="t_model.objectLike"/>
+               <ref name="t_pc"/>
             </oneOrMore>
             <group>
                <ref name="t_label"/>
                <ref name="t_term"/>
                <ref name="t_pc"/>
-            </group>
-            <group>
                <ref name="t_label"/>
                <ref name="t_term"/>
                <ref name="t_pc"/>
@@ -6608,64 +6578,40 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                   <ref name="t_model.textDescPart"/>
                </optional>
                <ref name="t_pc"/>
-            </group>
-            <group>
                <ref name="t_label"/>
                <optional>
                   <ref name="t_model.textDescPart"/>
                </optional>
                <ref name="t_pc"/>
-            </group>
-            <optional>
-               <group>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.textDescPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
-            <optional>
-               <group>
+               </optional>
+               <optional>
                   <ref name="t_label"/>
                   <optional>
                      <ref name="t_model.textDescPart"/>
                   </optional>
                   <ref name="t_pc"/>
-               </group>
-            </optional>
+               </optional>
+            </group>
             <group>
                <ref name="t_label"/>
                <ref name="t_model.teiHeaderPart"/>
                <ref name="t_pc"/>
-            </group>
-            <group>
                <ref name="t_label"/>
                <ref name="t_model.teiHeaderPart"/>
                <ref name="t_pc"/>
-            </group>
-            <zeroOrMore>
-               <group>
+               <zeroOrMore>
                   <ref name="t_label"/>
                   <ref name="t_model.teiHeaderPart"/>
                   <ref name="t_pc"/>
-               </group>
-            </zeroOrMore>
-            <interleave>
-               <ref name="t_label"/>
-               <zeroOrMore>
-                  <ref name="t_idno"/>
-               </zeroOrMore>
-               <ref name="t_pc"/>
-            </interleave>
-            <interleave>
-               <ref name="t_label"/>
-               <zeroOrMore>
-                  <ref name="t_idno"/>
                </zeroOrMore>
-               <ref name="t_pc"/>
-            </interleave>
-            <optional>
+            </group>
+            <group>
                <interleave>
                   <ref name="t_label"/>
                   <zeroOrMore>
@@ -6673,8 +6619,6 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                   </zeroOrMore>
                   <ref name="t_pc"/>
                </interleave>
-            </optional>
-            <optional>
                <interleave>
                   <ref name="t_label"/>
                   <zeroOrMore>
@@ -6682,7 +6626,25 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
                   </zeroOrMore>
                   <ref name="t_pc"/>
                </interleave>
-            </optional>
+               <optional>
+                  <interleave>
+                     <ref name="t_label"/>
+                     <zeroOrMore>
+                        <ref name="t_idno"/>
+                     </zeroOrMore>
+                     <ref name="t_pc"/>
+                  </interleave>
+               </optional>
+               <optional>
+                  <interleave>
+                     <ref name="t_label"/>
+                     <zeroOrMore>
+                        <ref name="t_idno"/>
+                     </zeroOrMore>
+                     <ref name="t_pc"/>
+                  </interleave>
+               </optional>
+            </group>
          </choice>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declarable.attributes"/>
@@ -9013,12 +8975,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                <ref name="t_model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="t_front"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_front"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </optional>
             <choice>
                <ref name="t_body"/>
@@ -9028,12 +8988,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                <ref name="t_model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="t_back"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_back"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </optional>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9051,96 +9009,80 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                <ref name="t_model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="t_model.divTop"/>
+               <ref name="t_model.divTop"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="t_model.global"/>
+                     <ref name="t_model.divTop"/>
+                  </choice>
+               </zeroOrMore>
+            </optional>
+            <optional>
+               <ref name="t_model.divGenLike"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="t_model.global"/>
+                     <ref name="t_model.divGenLike"/>
+                  </choice>
+               </zeroOrMore>
+            </optional>
+            <choice>
+               <oneOrMore>
+                  <ref name="t_model.divLike"/>
                   <zeroOrMore>
                      <choice>
                         <ref name="t_model.global"/>
-                        <ref name="t_model.divTop"/>
+                        <ref name="t_model.divGenLike"/>
                      </choice>
                   </zeroOrMore>
-               </group>
-            </optional>
-            <optional>
-               <group>
-                  <ref name="t_model.divGenLike"/>
+               </oneOrMore>
+               <oneOrMore>
+                  <ref name="t_model.div1Like"/>
                   <zeroOrMore>
                      <choice>
                         <ref name="t_model.global"/>
                         <ref name="t_model.divGenLike"/>
                      </choice>
                   </zeroOrMore>
-               </group>
-            </optional>
-            <choice>
-               <oneOrMore>
-                  <group>
-                     <ref name="t_model.divLike"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="t_model.global"/>
-                           <ref name="t_model.divGenLike"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
-               </oneOrMore>
-               <oneOrMore>
-                  <group>
-                     <ref name="t_model.div1Like"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="t_model.global"/>
-                           <ref name="t_model.divGenLike"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
                </oneOrMore>
                <group>
                   <oneOrMore>
-                     <group>
-                        <choice>
-                           <ref name="t_model.common"/>
-                        </choice>
-                        <zeroOrMore>
-                           <ref name="t_model.global"/>
-                        </zeroOrMore>
-                     </group>
+                     <choice>
+                        <ref name="t_model.common"/>
+                     </choice>
+                     <zeroOrMore>
+                        <ref name="t_model.global"/>
+                     </zeroOrMore>
                   </oneOrMore>
                   <optional>
                      <choice>
                         <oneOrMore>
-                           <group>
-                              <ref name="t_model.divLike"/>
-                              <zeroOrMore>
-                                 <choice>
-                                    <ref name="t_model.global"/>
-                                    <ref name="t_model.divGenLike"/>
-                                 </choice>
-                              </zeroOrMore>
-                           </group>
+                           <ref name="t_model.divLike"/>
+                           <zeroOrMore>
+                              <choice>
+                                 <ref name="t_model.global"/>
+                                 <ref name="t_model.divGenLike"/>
+                              </choice>
+                           </zeroOrMore>
                         </oneOrMore>
                         <oneOrMore>
-                           <group>
-                              <ref name="t_model.div1Like"/>
-                              <zeroOrMore>
-                                 <choice>
-                                    <ref name="t_model.global"/>
-                                    <ref name="t_model.divGenLike"/>
-                                 </choice>
-                              </zeroOrMore>
-                           </group>
+                           <ref name="t_model.div1Like"/>
+                           <zeroOrMore>
+                              <choice>
+                                 <ref name="t_model.global"/>
+                                 <ref name="t_model.divGenLike"/>
+                              </choice>
+                           </zeroOrMore>
                         </oneOrMore>
                      </choice>
                   </optional>
                </group>
             </choice>
             <zeroOrMore>
-               <group>
-                  <ref name="t_model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.divBottom"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9189,12 +9131,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                <ref name="t_model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="t_front"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_front"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </optional>
             <choice>
                <ref name="t_body"/>
@@ -9204,12 +9144,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                <ref name="t_model.global"/>
             </zeroOrMore>
             <optional>
-               <group>
-                  <ref name="t_back"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_back"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </optional>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9229,52 +9167,42 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                </choice>
             </zeroOrMore>
             <optional>
-               <group>
-                  <choice>
+               <choice>
+                  <oneOrMore>
+                     <choice>
+                        <ref name="t_model.divLike"/>
+                        <ref name="t_model.divGenLike"/>
+                     </choice>
+                     <zeroOrMore>
+                        <ref name="t_model.global"/>
+                     </zeroOrMore>
+                  </oneOrMore>
+                  <group>
                      <oneOrMore>
-                        <group>
-                           <choice>
-                              <ref name="t_model.divLike"/>
-                              <ref name="t_model.divGenLike"/>
-                           </choice>
-                           <zeroOrMore>
-                              <ref name="t_model.global"/>
-                           </zeroOrMore>
-                        </group>
-                     </oneOrMore>
-                     <group>
-                        <oneOrMore>
-                           <group>
-                              <choice>
-                                 <ref name="t_model.common"/>
-                              </choice>
-                              <zeroOrMore>
-                                 <ref name="t_model.global"/>
-                              </zeroOrMore>
-                           </group>
-                        </oneOrMore>
+                        <choice>
+                           <ref name="t_model.common"/>
+                        </choice>
                         <zeroOrMore>
-                           <group>
-                              <choice>
-                                 <ref name="t_model.divLike"/>
-                                 <ref name="t_model.divGenLike"/>
-                              </choice>
-                              <zeroOrMore>
-                                 <ref name="t_model.global"/>
-                              </zeroOrMore>
-                           </group>
+                           <ref name="t_model.global"/>
                         </zeroOrMore>
-                     </group>
-                  </choice>
-                  <zeroOrMore>
-                     <group>
-                        <ref name="t_model.divBottom"/>
+                     </oneOrMore>
+                     <zeroOrMore>
+                        <choice>
+                           <ref name="t_model.divLike"/>
+                           <ref name="t_model.divGenLike"/>
+                        </choice>
                         <zeroOrMore>
                            <ref name="t_model.global"/>
                         </zeroOrMore>
-                     </group>
+                     </zeroOrMore>
+                  </group>
+               </choice>
+               <zeroOrMore>
+                  <ref name="t_model.divBottom"/>
+                  <zeroOrMore>
+                     <ref name="t_model.global"/>
                   </zeroOrMore>
-               </group>
+               </zeroOrMore>
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -9371,12 +9299,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                </choice>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="t_model.common"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.common"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9473,12 +9399,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                </choice>
             </zeroOrMore>
             <zeroOrMore>
-               <group>
-                  <ref name="t_model.divBottomPart"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.divBottomPart"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </zeroOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9521,12 +9445,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                <ref name="t_model.global"/>
             </zeroOrMore>
             <oneOrMore>
-               <group>
-                  <ref name="t_titlePart"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_titlePart"/>
+               <zeroOrMore>
+                  <ref name="t_model.global"/>
+               </zeroOrMore>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9644,41 +9566,37 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                </choice>
             </zeroOrMore>
             <optional>
-               <group>
-                  <choice>
-                     <group>
-                        <ref name="t_model.div1Like"/>
-                        <zeroOrMore>
-                           <choice>
-                              <ref name="t_model.div1Like"/>
-                              <ref name="t_model.frontPart"/>
-                              <ref name="t_model.global"/>
-                           </choice>
-                        </zeroOrMore>
-                     </group>
-                     <group>
-                        <ref name="t_model.divLike"/>
-                        <zeroOrMore>
-                           <choice>
-                              <ref name="t_model.divLike"/>
-                              <ref name="t_model.frontPart"/>
-                              <ref name="t_model.global"/>
-                           </choice>
-                        </zeroOrMore>
-                     </group>
-                  </choice>
-                  <optional>
-                     <group>
+               <choice>
+                  <group>
+                     <ref name="t_model.div1Like"/>
+                     <zeroOrMore>
+                        <choice>
+                           <ref name="t_model.div1Like"/>
+                           <ref name="t_model.frontPart"/>
+                           <ref name="t_model.global"/>
+                        </choice>
+                     </zeroOrMore>
+                  </group>
+                  <group>
+                     <ref name="t_model.divLike"/>
+                     <zeroOrMore>
+                        <choice>
+                           <ref name="t_model.divLike"/>
+                           <ref name="t_model.frontPart"/>
+                           <ref name="t_model.global"/>
+                        </choice>
+                     </zeroOrMore>
+                  </group>
+               </choice>
+               <optional>
+                  <ref name="t_model.divBottom"/>
+                  <zeroOrMore>
+                     <choice>
                         <ref name="t_model.divBottom"/>
-                        <zeroOrMore>
-                           <choice>
-                              <ref name="t_model.divBottom"/>
-                              <ref name="t_model.global"/>
-                           </choice>
-                        </zeroOrMore>
-                     </group>
-                  </optional>
-               </group>
+                        <ref name="t_model.global"/>
+                     </choice>
+                  </zeroOrMore>
+               </optional>
             </optional>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9724,15 +9642,13 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                </choice>
             </optional>
             <optional>
-               <group>
-                  <ref name="t_model.divBottomPart"/>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="t_model.divBottomPart"/>
-                        <ref name="t_model.global"/>
-                     </choice>
-                  </zeroOrMore>
-               </group>
+               <ref name="t_model.divBottomPart"/>
+               <zeroOrMore>
+                  <choice>
+                     <ref name="t_model.divBottomPart"/>
+                     <ref name="t_model.global"/>
+                  </choice>
+               </zeroOrMore>
             </optional>
          </group>
          <ref name="t_att.global.attributes"/>
@@ -9840,6 +9756,26 @@ Sample values include: 1] TEI (Text Encoding Initiative); 2] DBK (Docbook); 3] X
          <empty/>
       </element>
    </define>
+   <define name="t_alt_of_seq_3-4">
+      <element name="alt_of_seq_3-4">
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">test developed by Raff Viglianti 2023-10-12</a:documentation>
+         <choice>
+            <group>
+               <ref name="t_emph"/>
+               <ref name="t_lb"/>
+               <ref name="t_emph"/>
+               <ref name="t_lb"/>
+               <ref name="t_emph"/>
+               <ref name="t_lb"/>
+               <optional>
+                  <ref name="t_emph"/>
+                  <ref name="t_lb"/>
+               </optional>
+            </group>
+            <ref name="t_orgName"/>
+         </choice>
+      </element>
+   </define>
    <define name="t_openPara_plain">
       <element name="openPara_plain">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">no <code xmlns="http://www.w3.org/1999/xhtml"
@@ -9849,199 +9785,199 @@ Sample values include: 1] TEI (Text Encoding Initiative); 2] DBK (Docbook); 3] X
          <ref name="anyElement-openPara_plain"/>
       </element>
    </define>
-   <define name="t_openPara_0_1">
-      <element name="openPara_0_1">
+   <define name="t_openPara_0-1">
+      <element name="openPara_0-1">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 1</a:documentation>
          <optional>
-            <ref name="anyElement-openPara_0_1"/>
+            <ref name="anyElement-openPara_0-1"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_0_2">
-      <element name="openPara_0_2">
+   <define name="t_openPara_0-2">
+      <element name="openPara_0-2">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 2</a:documentation>
          <optional>
-            <ref name="anyElement-openPara_0_2"/>
+            <ref name="anyElement-openPara_0-2"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_0_2"/>
+            <ref name="anyElement-openPara_0-2"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_0_6">
-      <element name="openPara_0_6">
+   <define name="t_openPara_0-6">
+      <element name="openPara_0-6">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
          <optional>
-            <ref name="anyElement-openPara_0_6"/>
+            <ref name="anyElement-openPara_0-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_0_6"/>
+            <ref name="anyElement-openPara_0-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_0_6"/>
+            <ref name="anyElement-openPara_0-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_0_6"/>
+            <ref name="anyElement-openPara_0-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_0_6"/>
+            <ref name="anyElement-openPara_0-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_0_6"/>
+            <ref name="anyElement-openPara_0-6"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_0_unbounded">
-      <element name="openPara_0_unbounded">
+   <define name="t_openPara_0-unbounded">
+      <element name="openPara_0-unbounded">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 0, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
          <zeroOrMore>
-            <ref name="anyElement-openPara_0_unbounded"/>
+            <ref name="anyElement-openPara_0-unbounded"/>
          </zeroOrMore>
       </element>
    </define>
-   <define name="t_openPara_1_1">
-      <element name="openPara_1_1">
+   <define name="t_openPara_1-1">
+      <element name="openPara_1-1">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 1</a:documentation>
-         <ref name="anyElement-openPara_1_1"/>
+         <ref name="anyElement-openPara_1-1"/>
       </element>
    </define>
-   <define name="t_openPara_1_2">
-      <element name="openPara_1_2">
+   <define name="t_openPara_1-2">
+      <element name="openPara_1-2">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 2</a:documentation>
-         <ref name="anyElement-openPara_1_2"/>
+         <ref name="anyElement-openPara_1-2"/>
          <optional>
-            <ref name="anyElement-openPara_1_2"/>
+            <ref name="anyElement-openPara_1-2"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_1_6">
-      <element name="openPara_1_6">
+   <define name="t_openPara_1-6">
+      <element name="openPara_1-6">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
-         <ref name="anyElement-openPara_1_6"/>
+         <ref name="anyElement-openPara_1-6"/>
          <optional>
-            <ref name="anyElement-openPara_1_6"/>
+            <ref name="anyElement-openPara_1-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_1_6"/>
+            <ref name="anyElement-openPara_1-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_1_6"/>
+            <ref name="anyElement-openPara_1-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_1_6"/>
+            <ref name="anyElement-openPara_1-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_1_6"/>
+            <ref name="anyElement-openPara_1-6"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_1_unbounded">
-      <element name="openPara_1_unbounded">
+   <define name="t_openPara_1-unbounded">
+      <element name="openPara_1-unbounded">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 1, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
          <oneOrMore>
-            <ref name="anyElement-openPara_1_unbounded"/>
+            <ref name="anyElement-openPara_1-unbounded"/>
          </oneOrMore>
       </element>
    </define>
-   <define name="t_openPara_2_2">
-      <element name="openPara_2_2">
+   <define name="t_openPara_2-2">
+      <element name="openPara_2-2">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 2, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 2</a:documentation>
-         <ref name="anyElement-openPara_2_2"/>
-         <ref name="anyElement-openPara_2_2"/>
+         <ref name="anyElement-openPara_2-2"/>
+         <ref name="anyElement-openPara_2-2"/>
       </element>
    </define>
-   <define name="t_openPara_2_6">
-      <element name="openPara_2_6">
+   <define name="t_openPara_2-6">
+      <element name="openPara_2-6">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 2, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
-         <ref name="anyElement-openPara_2_6"/>
-         <ref name="anyElement-openPara_2_6"/>
+         <ref name="anyElement-openPara_2-6"/>
+         <ref name="anyElement-openPara_2-6"/>
          <optional>
-            <ref name="anyElement-openPara_2_6"/>
+            <ref name="anyElement-openPara_2-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_2_6"/>
+            <ref name="anyElement-openPara_2-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_2_6"/>
+            <ref name="anyElement-openPara_2-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_2_6"/>
+            <ref name="anyElement-openPara_2-6"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_2_unbounded">
-      <element name="openPara_2_unbounded">
+   <define name="t_openPara_2-unbounded">
+      <element name="openPara_2-unbounded">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 2, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
-         <ref name="anyElement-openPara_2_unbounded"/>
-         <ref name="anyElement-openPara_2_unbounded"/>
+         <ref name="anyElement-openPara_2-unbounded"/>
+         <ref name="anyElement-openPara_2-unbounded"/>
          <zeroOrMore>
-            <ref name="anyElement-openPara_2_unbounded"/>
+            <ref name="anyElement-openPara_2-unbounded"/>
          </zeroOrMore>
       </element>
    </define>
-   <define name="t_openPara_4_6">
-      <element name="openPara_4_6">
+   <define name="t_openPara_4-6">
+      <element name="openPara_4-6">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 4, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> 6</a:documentation>
-         <ref name="anyElement-openPara_4_6"/>
-         <ref name="anyElement-openPara_4_6"/>
-         <ref name="anyElement-openPara_4_6"/>
-         <ref name="anyElement-openPara_4_6"/>
+         <ref name="anyElement-openPara_4-6"/>
+         <ref name="anyElement-openPara_4-6"/>
+         <ref name="anyElement-openPara_4-6"/>
+         <ref name="anyElement-openPara_4-6"/>
          <optional>
-            <ref name="anyElement-openPara_4_6"/>
+            <ref name="anyElement-openPara_4-6"/>
          </optional>
          <optional>
-            <ref name="anyElement-openPara_4_6"/>
+            <ref name="anyElement-openPara_4-6"/>
          </optional>
       </element>
    </define>
-   <define name="t_openPara_4_unbounded">
-      <element name="openPara_4_unbounded">
+   <define name="t_openPara_4-unbounded">
+      <element name="openPara_4-unbounded">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
             <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@minOccurs</code> 4, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">@maxOccurs</code> unbounded</a:documentation>
-         <ref name="anyElement-openPara_4_unbounded"/>
-         <ref name="anyElement-openPara_4_unbounded"/>
-         <ref name="anyElement-openPara_4_unbounded"/>
-         <ref name="anyElement-openPara_4_unbounded"/>
+         <ref name="anyElement-openPara_4-unbounded"/>
+         <ref name="anyElement-openPara_4-unbounded"/>
+         <ref name="anyElement-openPara_4-unbounded"/>
+         <ref name="anyElement-openPara_4-unbounded"/>
          <zeroOrMore>
-            <ref name="anyElement-openPara_4_unbounded"/>
+            <ref name="anyElement-openPara_4-unbounded"/>
          </zeroOrMore>
       </element>
    </define>
diff --git a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
index 622e44fb4..5955ed131 100644
--- a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
+++ b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
@@ -1,5 +1,5 @@
 /invalidInstances/testPure1InvalidInstance.xml:29:51: error: element "tag" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "bibl", "biblFull", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "desc", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "stage", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w"
-/invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "openPara_0_1", "openPara_0_2", "openPara_0_6", "openPara_0_unbounded", "openPara_1_1", "openPara_1_2", "openPara_1_6", "openPara_1_unbounded", "openPara_2_2", "openPara_2_6", "openPara_2_unbounded", "openPara_4_6", "openPara_4_unbounded", "openPara_plain", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer"
+/invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "alt_of_seq_3-4", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "openPara_0-1", "openPara_0-2", "openPara_0-6", "openPara_0-unbounded", "openPara_1-1", "openPara_1-2", "openPara_1-6", "openPara_1-unbounded", "openPara_2-2", "openPara_2-6", "openPara_2-unbounded", "openPara_4-6", "openPara_4-unbounded", "openPara_plain", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer"
 /invalidInstances/testPure1InvalidInstance.xml:44:34: error: attribute "synch" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "decls", "exclude", "hand", "n", "next", "part", "prev", "rend", "rendition", "resp", "sameAs", "select", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
 /invalidInstances/testPure1InvalidInstance.xml:50:33: error: attribute "type" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "exclude", "n", "next", "prev", "rend", "rendition", "resp", "sameAs", "select", "sortKey", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
 /invalidInstances/testPure1InvalidInstance.xml:62:47: error: value of attribute "corresp" is invalid; must be an integer
@@ -19,3 +19,10 @@
 /invalidInstances/testPure1InvalidInstance.xml:148:73: error: character content of element "email" invalid; must be equal to "amourdecosmos@gmail.com" or "thevenerablebede@gmail.com"
 /invalidInstances/testPure1InvalidInstance.xml:154:30: error: element "reg" not allowed yet; expected element "abbr", "corr", "expan" or "orig"
 /invalidInstances/testPure1InvalidInstance.xml:154:46: error: element "orig" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:161:19: error: element "alt_of_seq_3-4" incomplete; expected element "emph" or "orgName"
+/invalidInstances/testPure1InvalidInstance.xml:163:24: error: element "orgName" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:168:19: error: element "alt_of_seq_3-4" incomplete; missing required element "emph"
+/invalidInstances/testPure1InvalidInstance.xml:174:11: error: element "emph" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:174:16: error: element "lb" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:175:11: error: element "emph" not allowed here; expected the element end-tag
+/invalidInstances/testPure1InvalidInstance.xml:175:16: error: element "lb" not allowed here; expected the element end-tag
diff --git a/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml b/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml
index 156df7377..3d3666d47 100644
--- a/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml
+++ b/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml
@@ -153,7 +153,29 @@
         <head>Testing <att>preserveOrder</att> on <gi>sequence</gi></head>
         <p>This <choice><reg>test</reg><orig>Test</orig></choice> should be invalid, as the <gi>orig</gi> ought to appear before the <gi>reg</gi>.</p>
       </div>
-      
+
+      <div>
+	<head>One more test of <att>minOccurs</att> and
+	<att>maxOccurs</att> on <gi>sequence</gi> child of
+	<gi>alternate</gi></head>
+	<alt_of_seq_3-4/>	<!-- invalid, content is required -->
+	<alt_of_seq_3-4>	<!-- invalid, one and only 1 <orgName> child allowed -->
+	  <orgName/><orgName/>
+	</alt_of_seq_3-4>
+	<alt_of_seq_3-4>	<!-- invalid, 3–4 <emph>, <lb> pairs required -->
+	  <emph/><lb/>
+	  <emph/><lb/>
+	</alt_of_seq_3-4>
+	<alt_of_seq_3-4>	<!-- invalid, 3–4 <emph>, <lb> pairs required -->
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	</alt_of_seq_3-4>
+      </div>
+	
     </body>
   </text>
 </TEI>
diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd
index 4f01ce38f..378c7358f 100644
--- a/Test2/inputFiles/testPure1.odd
+++ b/Test2/inputFiles/testPure1.odd
@@ -357,6 +357,22 @@
 	    </sequence>
 	  </content>
 	</elementSpec>
+
+	<elementSpec mode="add" ident="alt_of_seq_3-4">
+	  <desc>test developed by Raff Viglianti 2023-10-12</desc>
+	  <classes>
+	    <memberOf key="model.pLike"/>
+	  </classes>
+	  <content>
+	    <alternate>
+	      <sequence minOccurs="3" maxOccurs="4">
+		<elementRef key="emph"/>
+		<elementRef key="lb"/>
+	      </sequence>
+	      <elementRef key="orgName"/>
+	    </alternate>
+	  </content>
+	</elementSpec>
 	
         <!--
             I wanted to change the content of <ab> just to test
@@ -383,7 +399,7 @@
           </content>
         </elementSpec>
 
-        <elementSpec mode="add" ident="openPara_0_1">
+        <elementSpec mode="add" ident="openPara_0-1">
           <desc><att>minOccurs</att> 0, <att>maxOccurs</att> 1</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -393,7 +409,7 @@
           </content>
         </elementSpec>
 
-        <elementSpec mode="add" ident="openPara_0_2">
+        <elementSpec mode="add" ident="openPara_0-2">
           <desc><att>minOccurs</att> 0, <att>maxOccurs</att> 2</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -403,7 +419,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_0_6">
+        <elementSpec mode="add" ident="openPara_0-6">
           <desc><att>minOccurs</att> 0, <att>maxOccurs</att> 6</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -413,7 +429,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_0_unbounded">
+        <elementSpec mode="add" ident="openPara_0-unbounded">
           <desc><att>minOccurs</att> 0, <att>maxOccurs</att> unbounded</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -423,7 +439,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_1_1">
+        <elementSpec mode="add" ident="openPara_1-1">
           <desc><att>minOccurs</att> 1, <att>maxOccurs</att> 1</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -433,7 +449,7 @@
           </content>
         </elementSpec>
 
-        <elementSpec mode="add" ident="openPara_1_2">
+        <elementSpec mode="add" ident="openPara_1-2">
           <desc><att>minOccurs</att> 1, <att>maxOccurs</att> 2</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -443,7 +459,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_1_6">
+        <elementSpec mode="add" ident="openPara_1-6">
           <desc><att>minOccurs</att> 1, <att>maxOccurs</att> 6</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -453,7 +469,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_1_unbounded">
+        <elementSpec mode="add" ident="openPara_1-unbounded">
           <desc><att>minOccurs</att> 1, <att>maxOccurs</att> unbounded</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -463,7 +479,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_2_2">
+        <elementSpec mode="add" ident="openPara_2-2">
           <desc><att>minOccurs</att> 2, <att>maxOccurs</att> 2</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -473,7 +489,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_2_6">
+        <elementSpec mode="add" ident="openPara_2-6">
           <desc><att>minOccurs</att> 2, <att>maxOccurs</att> 6</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -483,7 +499,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_2_unbounded">
+        <elementSpec mode="add" ident="openPara_2-unbounded">
           <desc><att>minOccurs</att> 2, <att>maxOccurs</att> unbounded</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -493,7 +509,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_4_6">
+        <elementSpec mode="add" ident="openPara_4-6">
           <desc><att>minOccurs</att> 4, <att>maxOccurs</att> 6</desc>
           <classes>
             <memberOf key="model.pLike"/>
@@ -503,7 +519,7 @@
           </content>
         </elementSpec>
         
-        <elementSpec mode="add" ident="openPara_4_unbounded">
+        <elementSpec mode="add" ident="openPara_4-unbounded">
           <desc><att>minOccurs</att> 4, <att>maxOccurs</att> unbounded</desc>
           <classes>
             <memberOf key="model.pLike"/>
diff --git a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
index d6647b09d..368ceb2f2 100644
--- a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
+++ b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
@@ -330,6 +330,28 @@
 	  <rs n="20"/><ptr n="21"/><date n="22"/><idno n="23"/><ref n="24"/><pubPlace n="25"/><rs n="26"/><rs n="27"/><ptr n="28"/><rs n="29"/>
 	</altGrp>
       </div>
+
+
+      <!-- Extra test of @minOccurs and @maxOccurs on sequence in alternate -->
+      <div>
+	<head>One more test of <att>minOccurs</att> and
+	<att>maxOccurs</att> on <gi>sequence</gi> child of
+	<gi>alternate</gi></head>
+	<alt_of_seq_3-4>
+	  <orgName/>
+	</alt_of_seq_3-4>
+	<alt_of_seq_3-4>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	</alt_of_seq_3-4>
+	<alt_of_seq_3-4>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	  <emph/><lb/>
+	</alt_of_seq_3-4>
+      </div>
       
       <!-- Temporary test of @minOccurs and @maxOccurs on
            <anyElement>, until testPure1.odd can use intended test
@@ -340,145 +362,145 @@
           <s:whatever1/>
         </openPara_plain>
         <!--  -->
-        <openPara_0_1/>
-        <openPara_0_1>
+        <openPara_0-1/>
+        <openPara_0-1>
           <y:blort/>
-        </openPara_0_1>
+        </openPara_0-1>
 
-        <openPara_0_2/>
-        <openPara_0_2>
+        <openPara_0-2/>
+        <openPara_0-2>
           <d:widget/>
-        </openPara_0_2>
-        <openPara_0_2>
+        </openPara_0-2>
+        <openPara_0-2>
           <d:widget/>
           <d:widget/>
-        </openPara_0_2>
+        </openPara_0-2>
 
-        <openPara_0_6/>
-        <openPara_0_6>
+        <openPara_0-6/>
+        <openPara_0-6>
           <s:one/>
-        </openPara_0_6>
-        <openPara_0_6>
+        </openPara_0-6>
+        <openPara_0-6>
           <s:one/><s:two/>
-        </openPara_0_6>
-        <openPara_0_6>
+        </openPara_0-6>
+        <openPara_0-6>
           <s:one/><s:two/><s:three/>
-        </openPara_0_6>
-        <openPara_0_6>
+        </openPara_0-6>
+        <openPara_0-6>
           <s:one/><s:two/><s:three/>
           <s:four/>
-        </openPara_0_6>
-        <openPara_0_6>
+        </openPara_0-6>
+        <openPara_0-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/>
-        </openPara_0_6>
-        <openPara_0_6>
+        </openPara_0-6>
+        <openPara_0-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
-        </openPara_0_6>
-        <openPara_0_unbounded>
+        </openPara_0-6>
+        <openPara_0-unbounded>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
           <s:seven/><s:eight/><s:nine/>
-        </openPara_0_unbounded>
+        </openPara_0-unbounded>
         <!--  -->
-        <openPara_1_1>
+        <openPara_1-1>
           <y:blort/>
-        </openPara_1_1>
+        </openPara_1-1>
 
-        <openPara_1_2>
+        <openPara_1-2>
           <d:widget/>
-        </openPara_1_2>
-        <openPara_1_2>
+        </openPara_1-2>
+        <openPara_1-2>
           <d:widget/>
           <d:widget/>
-        </openPara_1_2>
+        </openPara_1-2>
 
-        <openPara_1_6>
+        <openPara_1-6>
           <s:one/>
-        </openPara_1_6>
-        <openPara_1_6>
+        </openPara_1-6>
+        <openPara_1-6>
           <s:one/><s:two/>
-        </openPara_1_6>
-        <openPara_1_6>
+        </openPara_1-6>
+        <openPara_1-6>
           <s:one/><s:two/><s:three/>
-        </openPara_1_6>
-        <openPara_1_6>
+        </openPara_1-6>
+        <openPara_1-6>
           <s:one/><s:two/><s:three/>
           <s:four/>
-        </openPara_1_6>
-        <openPara_1_6>
+        </openPara_1-6>
+        <openPara_1-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/>
-        </openPara_1_6>
-        <openPara_1_6>
+        </openPara_1-6>
+        <openPara_1-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
-        </openPara_1_6>
+        </openPara_1-6>
 
-        <openPara_1_unbounded>
+        <openPara_1-unbounded>
           <s:one/>
-        </openPara_1_unbounded>
-        <openPara_1_unbounded>
+        </openPara_1-unbounded>
+        <openPara_1-unbounded>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
           <s:seven/><s:eight/><s:nine/>
-        </openPara_1_unbounded>
+        </openPara_1-unbounded>
         <!--  -->
-        <openPara_2_2>
+        <openPara_2-2>
           <d:widget/>
           <d:widget/>
-        </openPara_2_2>
+        </openPara_2-2>
 
-        <openPara_2_6>
+        <openPara_2-6>
           <s:one/><s:two/>
-        </openPara_2_6>
-        <openPara_2_6>
+        </openPara_2-6>
+        <openPara_2-6>
           <s:one/><s:two/><s:three/>
-        </openPara_2_6>
-        <openPara_2_6>
+        </openPara_2-6>
+        <openPara_2-6>
           <s:one/><s:two/><s:three/>
           <s:four/>
-        </openPara_2_6>
-        <openPara_2_6>
+        </openPara_2-6>
+        <openPara_2-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/>
-        </openPara_2_6>
-        <openPara_2_6>
+        </openPara_2-6>
+        <openPara_2-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
-        </openPara_2_6>
+        </openPara_2-6>
 
-        <openPara_2_unbounded>
+        <openPara_2-unbounded>
           <s:one/><s:two/>
-        </openPara_2_unbounded>
-        <openPara_2_unbounded>
+        </openPara_2-unbounded>
+        <openPara_2-unbounded>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
           <s:seven/><s:eight/><s:nine/>
-        </openPara_2_unbounded>
+        </openPara_2-unbounded>
         <!--  -->
-        <openPara_4_6>
+        <openPara_4-6>
           <s:one/><s:two/><s:three/>
           <s:four/>
-        </openPara_4_6>
-        <openPara_4_6>
+        </openPara_4-6>
+        <openPara_4-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/>
-        </openPara_4_6>
-        <openPara_4_6>
+        </openPara_4-6>
+        <openPara_4-6>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
-        </openPara_4_6>
+        </openPara_4-6>
 
-        <openPara_4_unbounded>
+        <openPara_4-unbounded>
           <s:one/><y:two/><d:three/><s:four/>
-        </openPara_4_unbounded>
-        <openPara_4_unbounded>
+        </openPara_4-unbounded>
+        <openPara_4-unbounded>
           <s:one/><s:two/><s:three/>
           <s:four/><s:five/><s:six/>
           <s:seven/><s:eight/><s:nine/>
-        </openPara_4_unbounded>
+        </openPara_4-unbounded>
         
       </div>
         
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index 18fb980d5..d2f5291e4 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -236,6 +236,19 @@ of this software, even if advised of the possibility of such damage.
          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">
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 2d751172a..646067c58 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -343,7 +343,7 @@ of this software, even if advised of the possibility of such damage.
        current context node (which is presumably a member of
        att.repeatable). -->
   <xsl:template name="repeat_as_needed" as="element()+">
-    <xsl:param name="repeatMe" as="element()"/>
+    <xsl:param name="repeatMe" as="element()+"/>
     <xsl:variable name="norMinMax" select="tei:norMinMax(.)" as="item()+"/>
     <xsl:variable name="min" select="$norMinMax[1]"/>
     <xsl:variable name="max" select="$norMinMax[2]"/>
@@ -2113,14 +2113,14 @@ of this software, even if advised of the possibility of such damage.
          </xsl:otherwise>
        </xsl:choose>
      </xsl:variable>
-     <xsl:variable name="repeatMe" as="element()">
-       <xsl:element name="{$group_or_list}" namespace="http://relaxng.org/ns/structure/1.0">
-         <xsl:sequence select="$group_or_list_content"/>
-       </xsl:element>
+     <xsl:variable name="repeatMe" as="element()+">
+       <xsl:sequence select="$group_or_list_content"/>
      </xsl:variable>
-     <xsl:call-template name="repeat_as_needed">
-       <xsl:with-param name="repeatMe" select="$repeatMe" as="element()"/>
-     </xsl:call-template>
+     <xsl:element name="{$group_or_list}" namespace="http://relaxng.org/ns/structure/1.0">
+       <xsl:call-template name="repeat_as_needed">
+	 <xsl:with-param name="repeatMe" select="$repeatMe" as="element()+"/>
+       </xsl:call-template>
+     </xsl:element>
    </xsl:template>
 
   <xsl:template match="tei:textNode"   mode="#default tangle">

From 91a8ff4d49846e343650087f9d8221b1fbfb731e Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sat, 4 Nov 2023 23:16:07 -0400
Subject: [PATCH 11/50] This commit _seems_ to be working correctly: passes
 Test/, Test2/, the Guidelines test process, and the Guidelines build OK.

---
 Test/expected-results/test-pure.odd.html   |    4 +-
 Test/expected-results/test.rng             | 1172 +++++++++-----------
 Test/expected-results/test15.odd.html      |   26 +-
 Test/expected-results/test15.odd.rnc       |   16 +-
 Test/expected-results/test21.odd.rnc       |   16 +-
 Test/expected-results/test30.rnc           |    2 +-
 Test/expected-results/test33.rnc           |   16 +-
 Test/expected-results/test34.rnc           |   16 +-
 Test/expected-results/test35.rnc           |   16 +-
 Test/expected-results/testClass.rnc        |    2 +-
 Test2/expected-results/testAttValQuant.rng |  270 ++---
 Test2/expected-results/testPure1.rng       |  282 ++---
 odds/odd2relax.xsl                         |  231 ++--
 odds/teiodds.xsl                           |    1 -
 14 files changed, 999 insertions(+), 1071 deletions(-)

diff --git a/Test/expected-results/test-pure.odd.html b/Test/expected-results/test-pure.odd.html
index a9aa5aad5..102f2574a 100644
--- a/Test/expected-results/test-pure.odd.html
+++ b/Test/expected-results/test-pure.odd.html
@@ -1080,9 +1080,9 @@ <h2>
                 </td>
                 <td class="wovenodd-col2">
                   <pre id="index.xml-eg-d32e835" class="pre_eg">
-element t5 { text | ( 
+element t5 { text | ( ( 
 <a class="link_ref" href="#TEI.bit" title="&lt;bit&gt;">bit</a>, 
-<a class="link_ref" href="#TEI.bob" title="&lt;bob&gt;">bob</a> )+ }
+<a class="link_ref" href="#TEI.bob" title="&lt;bob&gt;">bob</a> )+ ) }
 <a href="#index.xml-eg-d32e835" class="anchorlink">⚓</a>
 </pre>
                 </td>
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 9518c17ca..9eff6a5e0 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -4701,12 +4701,10 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
           <ref name="model.global"/>
         </zeroOrMore>
         <oneOrMore>
-          <group>
-            <ref name="model.addrPart"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.addrPart"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -4955,12 +4953,10 @@ attributes @target and @cRef may be supplied on <name/>.</report>
         </zeroOrMore>
         <choice>
           <oneOrMore>
-            <group>
-              <ref name="item"/>
-              <zeroOrMore>
-                <ref name="model.global"/>
-              </zeroOrMore>
-            </group>
+            <ref name="item"/>
+            <zeroOrMore>
+              <ref name="model.global"/>
+            </zeroOrMore>
           </oneOrMore>
           <group>
             <optional>
@@ -4970,26 +4966,22 @@ attributes @target and @cRef may be supplied on <name/>.</report>
               <ref name="headItem"/>
             </optional>
             <oneOrMore>
-              <group>
-                <ref name="label"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-                <ref name="item"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <ref name="label"/>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
+              <ref name="item"/>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
             </oneOrMore>
           </group>
         </choice>
         <zeroOrMore>
-          <group>
-            <ref name="model.divBottom"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.divBottom"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </zeroOrMore>
       </group>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-list-gloss-list-must-have-labels-constraint-rule-12">
@@ -5121,12 +5113,10 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
     <element name="index">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index entry) marks a location to be indexed for whatever purpose. [3.9.2. Index Entries]</a:documentation>
       <zeroOrMore>
-        <group>
-          <ref name="term"/>
-          <optional>
-            <ref name="index"/>
-          </optional>
-        </group>
+        <ref name="term"/>
+        <optional>
+          <ref name="index"/>
+        </optional>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
       <ref name="att.spanning.attributes"/>
@@ -5354,19 +5344,17 @@ Elements]</a:documentation>
           <ref name="model.noteLike"/>
         </zeroOrMore>
         <zeroOrMore>
-          <group>
-            <ref name="edition"/>
-            <zeroOrMore>
-              <choice>
-                <ref name="idno"/>
-                <ref name="model.ptrLike"/>
-                <ref name="editor"/>
-                <ref name="sponsor"/>
-                <ref name="funder"/>
-                <ref name="respStmt"/>
-              </choice>
-            </zeroOrMore>
-          </group>
+          <ref name="edition"/>
+          <zeroOrMore>
+            <choice>
+              <ref name="idno"/>
+              <ref name="model.ptrLike"/>
+              <ref name="editor"/>
+              <ref name="sponsor"/>
+              <ref name="funder"/>
+              <ref name="respStmt"/>
+            </choice>
+          </zeroOrMore>
         </zeroOrMore>
         <ref name="imprint"/>
         <zeroOrMore>
@@ -5522,18 +5510,16 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </choice>
         </zeroOrMore>
         <oneOrMore>
-          <group>
-            <choice>
-              <ref name="model.imprintPart"/>
-              <ref name="model.dateLike"/>
-            </choice>
-            <zeroOrMore>
-              <ref name="respStmt"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <choice>
+            <ref name="model.imprintPart"/>
+            <ref name="model.dateLike"/>
+          </choice>
+          <zeroOrMore>
+            <ref name="respStmt"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -5609,12 +5595,10 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           <ref name="analytic"/>
         </zeroOrMore>
         <oneOrMore>
-          <group>
-            <ref name="monogr"/>
-            <zeroOrMore>
-              <ref name="series"/>
-            </zeroOrMore>
-          </group>
+          <ref name="monogr"/>
+          <zeroOrMore>
+            <ref name="series"/>
+          </zeroOrMore>
         </oneOrMore>
         <zeroOrMore>
           <choice>
@@ -5649,16 +5633,14 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </choice>
         </zeroOrMore>
         <oneOrMore>
-          <group>
-            <oneOrMore>
-              <ref name="model.biblLike"/>
-            </oneOrMore>
-            <zeroOrMore>
-              <choice>
-                <ref name="model.milestoneLike"/>
-              </choice>
-            </zeroOrMore>
-          </group>
+          <oneOrMore>
+            <ref name="model.biblLike"/>
+          </oneOrMore>
+          <zeroOrMore>
+            <choice>
+              <ref name="model.milestoneLike"/>
+            </choice>
+          </zeroOrMore>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -5751,12 +5733,10 @@ relatedItem element must be empty</sch:report>
           </choice>
         </zeroOrMore>
         <zeroOrMore>
-          <group>
-            <ref name="model.divBottom"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.divBottom"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </zeroOrMore>
       </group>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-atleast1oflggapl-constraint-assert-11">
@@ -5786,31 +5766,29 @@ relatedItem element must be empty</sch:report>
         <zeroOrMore>
           <ref name="model.global"/>
         </zeroOrMore>
-        <optional>
-          <group>
-            <ref name="speaker"/>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="speaker"/>
+            <rng:zeroOrMore>
+              <rng:ref name="model.global"/>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
+        <oneOrMore>
+          <choice>
+            <ref name="lg"/>
+            <ref name="model.lLike"/>
+            <ref name="model.pLike"/>
+            <ref name="model.listLike"/>
+            <ref name="model.stageLike"/>
+            <ref name="model.attributable"/>
+          </choice>
+          <choice>
             <zeroOrMore>
               <ref name="model.global"/>
             </zeroOrMore>
-          </group>
-        </optional>
-        <oneOrMore>
-          <group>
-            <choice>
-              <ref name="lg"/>
-              <ref name="model.lLike"/>
-              <ref name="model.pLike"/>
-              <ref name="model.listLike"/>
-              <ref name="model.stageLike"/>
-              <ref name="model.attributable"/>
-            </choice>
-            <choice>
-              <zeroOrMore>
-                <ref name="model.global"/>
-              </zeroOrMore>
-              <ref name="q"/>
-            </choice>
-          </group>
+            <ref name="q"/>
+          </choice>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -6104,12 +6082,10 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(publication statement) groups information concerning the publication or distribution of an electronic or other text. [2.2.4. Publication, Distribution, Licensing, etc. 2.2. The File Description]</a:documentation>
       <choice>
         <oneOrMore>
-          <group>
-            <ref name="model.publicationStmtPart.agency"/>
-            <zeroOrMore>
-              <ref name="model.publicationStmtPart.detail"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.publicationStmtPart.agency"/>
+          <zeroOrMore>
+            <ref name="model.publicationStmtPart.detail"/>
+          </zeroOrMore>
         </oneOrMore>
         <oneOrMore>
           <ref name="model.pLike"/>
@@ -7548,18 +7524,16 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
           </choice>
         </zeroOrMore>
         <zeroOrMore>
-          <group>
-            <choice>
-              <ref name="zone"/>
-              <ref name="line"/>
-              <ref name="path"/>
-              <ref name="surface"/>
-              <ref name="surfaceGrp"/>
-            </choice>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <choice>
+            <ref name="zone"/>
+            <ref name="line"/>
+            <ref name="path"/>
+            <ref name="surface"/>
+            <ref name="surfaceGrp"/>
+          </choice>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </zeroOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -8143,49 +8117,41 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
     <element name="graph">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graph) encodes a graph, which is a collection of nodes, and arcs which connect the nodes. [19.1. Graphs and Digraphs]</a:documentation>
       <group>
-        <optional>
-          <group>
-            <ref name="label"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
-        </optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="label"/>
+            <rng:zeroOrMore>
+              <rng:ref name="model.global"/>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
         <choice>
           <group>
             <oneOrMore>
-              <group>
-                <ref name="node"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <ref name="node"/>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
             </oneOrMore>
             <zeroOrMore>
-              <group>
-                <ref name="arc"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <ref name="arc"/>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
             </zeroOrMore>
           </group>
           <group>
             <oneOrMore>
-              <group>
-                <ref name="arc"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <ref name="arc"/>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
             </oneOrMore>
             <oneOrMore>
-              <group>
-                <ref name="node"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <ref name="node"/>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
             </oneOrMore>
           </group>
         </choice>
@@ -8229,14 +8195,14 @@ Suggested values include: 1] undirected; 2] directed; 3] transitionNetwork; 4] t
   <define name="node">
     <element name="node">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(node) encodes a node, a possibly labeled point in a graph. [19.1. Graphs and Digraphs]</a:documentation>
-      <optional>
-        <group>
-          <ref name="label"/>
+      <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+        <rng:group>
+          <rng:ref name="label"/>
           <optional>
-            <ref name="label"/>
+            <rng:ref name="label"/>
           </optional>
-        </group>
-      </optional>
+        </rng:group>
+      </rng:optional>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
       <optional>
@@ -8322,14 +8288,14 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   <define name="arc">
     <element name="arc">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arc) encodes an arc, the connection from one node to another in a graph. [19.1. Graphs and Digraphs]</a:documentation>
-      <optional>
-        <group>
-          <ref name="label"/>
+      <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+        <rng:group>
+          <rng:ref name="label"/>
           <optional>
-            <ref name="label"/>
+            <rng:ref name="label"/>
           </optional>
-        </group>
-      </optional>
+        </rng:group>
+      </rng:optional>
       <ref name="att.global.attributes"/>
       <attribute name="from">
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">gives the identifier of the node which is adjacent from this arc.</a:documentation>
@@ -8705,14 +8671,14 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         <zeroOrMore>
           <ref name="model.global"/>
         </zeroOrMore>
-        <optional>
-          <group>
-            <ref name="front"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
-        </optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="front"/>
+            <rng:zeroOrMore>
+              <rng:ref name="model.global"/>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
         <choice>
           <ref name="body"/>
           <ref name="group"/>
@@ -8720,14 +8686,14 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         <zeroOrMore>
           <ref name="model.global"/>
         </zeroOrMore>
-        <optional>
-          <group>
-            <ref name="back"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
-        </optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="back"/>
+            <rng:zeroOrMore>
+              <rng:ref name="model.global"/>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -8743,97 +8709,85 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         <zeroOrMore>
           <ref name="model.global"/>
         </zeroOrMore>
-        <optional>
-          <group>
-            <ref name="model.divTop"/>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="model.divTop"/>
+            <rng:zeroOrMore>
+              <rng:choice>
+                <rng:ref name="model.global"/>
+                <rng:ref name="model.divTop"/>
+              </rng:choice>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="model.divGenLike"/>
+            <rng:zeroOrMore>
+              <rng:choice>
+                <rng:ref name="model.global"/>
+                <rng:ref name="model.divGenLike"/>
+              </rng:choice>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
+        <choice>
+          <oneOrMore>
+            <ref name="model.divLike"/>
             <zeroOrMore>
               <choice>
                 <ref name="model.global"/>
-                <ref name="model.divTop"/>
+                <ref name="model.divGenLike"/>
               </choice>
             </zeroOrMore>
-          </group>
-        </optional>
-        <optional>
-          <group>
-            <ref name="model.divGenLike"/>
+          </oneOrMore>
+          <oneOrMore>
+            <ref name="model.div1Like"/>
             <zeroOrMore>
               <choice>
                 <ref name="model.global"/>
                 <ref name="model.divGenLike"/>
               </choice>
             </zeroOrMore>
-          </group>
-        </optional>
-        <choice>
-          <oneOrMore>
-            <group>
-              <ref name="model.divLike"/>
-              <zeroOrMore>
-                <choice>
-                  <ref name="model.global"/>
-                  <ref name="model.divGenLike"/>
-                </choice>
-              </zeroOrMore>
-            </group>
-          </oneOrMore>
-          <oneOrMore>
-            <group>
-              <ref name="model.div1Like"/>
-              <zeroOrMore>
-                <choice>
-                  <ref name="model.global"/>
-                  <ref name="model.divGenLike"/>
-                </choice>
-              </zeroOrMore>
-            </group>
           </oneOrMore>
           <group>
             <oneOrMore>
-              <group>
-                <choice>
-                  <ref name="model.common"/>
-                </choice>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <choice>
+                <ref name="model.common"/>
+              </choice>
+              <zeroOrMore>
+                <ref name="model.global"/>
+              </zeroOrMore>
             </oneOrMore>
             <optional>
               <choice>
                 <oneOrMore>
-                  <group>
-                    <ref name="model.divLike"/>
-                    <zeroOrMore>
-                      <choice>
-                        <ref name="model.global"/>
-                        <ref name="model.divGenLike"/>
-                      </choice>
-                    </zeroOrMore>
-                  </group>
+                  <ref name="model.divLike"/>
+                  <zeroOrMore>
+                    <choice>
+                      <ref name="model.global"/>
+                      <ref name="model.divGenLike"/>
+                    </choice>
+                  </zeroOrMore>
                 </oneOrMore>
                 <oneOrMore>
-                  <group>
-                    <ref name="model.div1Like"/>
-                    <zeroOrMore>
-                      <choice>
-                        <ref name="model.global"/>
-                        <ref name="model.divGenLike"/>
-                      </choice>
-                    </zeroOrMore>
-                  </group>
+                  <ref name="model.div1Like"/>
+                  <zeroOrMore>
+                    <choice>
+                      <ref name="model.global"/>
+                      <ref name="model.divGenLike"/>
+                    </choice>
+                  </zeroOrMore>
                 </oneOrMore>
               </choice>
             </optional>
           </group>
         </choice>
         <zeroOrMore>
-          <group>
-            <ref name="model.divBottom"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.divBottom"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </zeroOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -8881,14 +8835,14 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         <zeroOrMore>
           <ref name="model.global"/>
         </zeroOrMore>
-        <optional>
-          <group>
-            <ref name="front"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
-        </optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="front"/>
+            <rng:zeroOrMore>
+              <rng:ref name="model.global"/>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
         <choice>
           <ref name="body"/>
           <ref name="group"/>
@@ -8896,14 +8850,14 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         <zeroOrMore>
           <ref name="model.global"/>
         </zeroOrMore>
-        <optional>
-          <group>
-            <ref name="back"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
-        </optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="back"/>
+            <rng:zeroOrMore>
+              <rng:ref name="model.global"/>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -8921,54 +8875,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.divLike"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.divLike"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.divLike"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
-              </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.divLike"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-report-17">
         <rule context="tei:div">
@@ -9002,54 +8946,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.div2Like"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.div2Like"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.div2Like"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div2Like"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9068,54 +9002,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.div3Like"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.div3Like"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.div3Like"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
-              </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div3Like"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9134,54 +9058,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.div4Like"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.div4Like"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.div4Like"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div4Like"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9200,54 +9114,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.div5Like"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.div5Like"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.div5Like"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div5Like"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9266,54 +9170,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.div6Like"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.div6Like"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.div6Like"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div6Like"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9332,54 +9226,44 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <oneOrMore>
-                <group>
-                  <choice>
-                    <ref name="model.div7Like"/>
-                    <ref name="model.divGenLike"/>
-                  </choice>
-                  <zeroOrMore>
-                    <ref name="model.global"/>
-                  </zeroOrMore>
-                </group>
+                <rng:choice>
+                  <rng:ref name="model.div7Like"/>
+                  <rng:ref name="model.divGenLike"/>
+                </rng:choice>
+                <rng:zeroOrMore>
+                  <rng:ref name="model.global"/>
+                </rng:zeroOrMore>
               </oneOrMore>
               <group>
                 <oneOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.common"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
+                  <rng:ref name="model.common"/>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
                 </oneOrMore>
-                <zeroOrMore>
-                  <group>
-                    <choice>
-                      <ref name="model.div7Like"/>
-                      <ref name="model.divGenLike"/>
-                    </choice>
-                    <zeroOrMore>
-                      <ref name="model.global"/>
-                    </zeroOrMore>
-                  </group>
-                </zeroOrMore>
-              </group>
-            </choice>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div7Like"/>
+                    <rng:ref name="model.divGenLike"/>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                    <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+                </rng:zeroOrMore>
               </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            </rng:choice>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9398,28 +9282,22 @@ Suggested values include: 1] initial; 2] final</a:documentation>
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
             <oneOrMore>
-              <group>
-                <choice>
-                  <ref name="model.common"/>
-                </choice>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
+              <rng:ref name="model.common"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
             </oneOrMore>
-            <zeroOrMore>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <ref name="model.global"/>
-                </zeroOrMore>
-              </group>
-            </zeroOrMore>
-          </group>
-        </optional>
+            <rng:zeroOrMore>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:ref name="model.global"/>
+              </rng:zeroOrMore>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -9492,12 +9370,10 @@ Suggested values include: 1] initial; 2] final</a:documentation>
           </choice>
         </zeroOrMore>
         <oneOrMore>
-          <group>
-            <ref name="model.common"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.common"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -9594,12 +9470,10 @@ Suggested values include: 1] initial; 2] final</a:documentation>
           </choice>
         </zeroOrMore>
         <zeroOrMore>
-          <group>
-            <ref name="model.divBottomPart"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="model.divBottomPart"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </zeroOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -9643,12 +9517,10 @@ Suggested values include: 1] initial; 2] final</a:documentation>
           <ref name="model.global"/>
         </zeroOrMore>
         <oneOrMore>
-          <group>
-            <ref name="titlePart"/>
-            <zeroOrMore>
-              <ref name="model.global"/>
-            </zeroOrMore>
-          </group>
+          <ref name="titlePart"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
@@ -9764,43 +9636,41 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
             <ref name="model.global"/>
           </choice>
         </zeroOrMore>
-        <optional>
-          <group>
-            <choice>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:choice>
               <group>
-                <ref name="model.div1Like"/>
-                <zeroOrMore>
-                  <choice>
-                    <ref name="model.div1Like"/>
-                    <ref name="model.frontPart"/>
-                    <ref name="model.global"/>
-                  </choice>
-                </zeroOrMore>
+                <rng:ref name="model.div1Like"/>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.div1Like"/>
+                    <rng:ref name="model.frontPart"/>
+                    <rng:ref name="model.global"/>
+                  </rng:choice>
+                </rng:zeroOrMore>
               </group>
               <group>
-                <ref name="model.divLike"/>
-                <zeroOrMore>
-                  <choice>
-                    <ref name="model.divLike"/>
-                    <ref name="model.frontPart"/>
-                    <ref name="model.global"/>
-                  </choice>
-                </zeroOrMore>
+                <rng:ref name="model.divLike"/>
+                <rng:zeroOrMore>
+                  <rng:choice>
+                    <rng:ref name="model.divLike"/>
+                    <rng:ref name="model.frontPart"/>
+                    <rng:ref name="model.global"/>
+                  </rng:choice>
+                </rng:zeroOrMore>
               </group>
-            </choice>
+            </rng:choice>
             <optional>
-              <group>
-                <ref name="model.divBottom"/>
-                <zeroOrMore>
-                  <choice>
-                    <ref name="model.divBottom"/>
-                    <ref name="model.global"/>
-                  </choice>
-                </zeroOrMore>
-              </group>
+              <rng:ref name="model.divBottom"/>
+              <rng:zeroOrMore>
+                <rng:choice>
+                  <rng:ref name="model.divBottom"/>
+                  <rng:ref name="model.global"/>
+                </rng:choice>
+              </rng:zeroOrMore>
             </optional>
-          </group>
-        </optional>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -9844,17 +9714,17 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
             </group>
           </choice>
         </optional>
-        <optional>
-          <group>
-            <ref name="model.divBottomPart"/>
-            <zeroOrMore>
-              <choice>
-                <ref name="model.divBottomPart"/>
-                <ref name="model.global"/>
-              </choice>
-            </zeroOrMore>
-          </group>
-        </optional>
+        <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+          <rng:group>
+            <rng:ref name="model.divBottomPart"/>
+            <rng:zeroOrMore>
+              <rng:choice>
+                <rng:ref name="model.divBottomPart"/>
+                <rng:ref name="model.global"/>
+              </rng:choice>
+            </rng:zeroOrMore>
+          </rng:group>
+        </rng:optional>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -11390,29 +11260,23 @@ Suggested values include: 1] label; 2] data</a:documentation>
         </zeroOrMore>
         <choice>
           <oneOrMore>
-            <group>
-              <ref name="row"/>
-              <zeroOrMore>
-                <ref name="model.global"/>
-              </zeroOrMore>
-            </group>
+            <ref name="row"/>
+            <zeroOrMore>
+              <ref name="model.global"/>
+            </zeroOrMore>
           </oneOrMore>
           <oneOrMore>
-            <group>
-              <ref name="model.graphicLike"/>
-              <zeroOrMore>
-                <ref name="model.global"/>
-              </zeroOrMore>
-            </group>
-          </oneOrMore>
-        </choice>
-        <zeroOrMore>
-          <group>
-            <ref name="model.divBottom"/>
+            <ref name="model.graphicLike"/>
             <zeroOrMore>
               <ref name="model.global"/>
             </zeroOrMore>
-          </group>
+          </oneOrMore>
+        </choice>
+        <zeroOrMore>
+          <ref name="model.divBottom"/>
+          <zeroOrMore>
+            <ref name="model.global"/>
+          </zeroOrMore>
         </zeroOrMore>
       </group>
       <ref name="att.global.attributes"/>
diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html
index 1f538641c..8ee89feea 100644
--- a/Test/expected-results/test15.odd.html
+++ b/Test/expected-results/test15.odd.html
@@ -688,24 +688,26 @@ <h2>
 <a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a> )*,
       (
          (
-            ( ( 
+            (
+               ( ( ( 
 <a class="link_ref" itemprop="ref" href="#TEI.model.divLike" title="model.divLike agrupa los elementos usados para representar divisiones estructurales recursivamente.">model.divLike</a> | 
 <a class="link_ref" itemprop="ref" href="#TEI.model.divGenLike" title="model.divGenLike agrupa elementos usados para representar divisiones estructurales que se generan explícitamente porque estan p...">model.divGenLike</a> ), 
-<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )+
-          | (
-               ( ( schemaSpec | 
+<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )+ )
+             | (
+                  ( ( ( schemaSpec | 
 <a class="link_ref" itemprop="ref" href="#TEI.model.common" title="model.common agrupa elementos comunes a nivel de fragmentos de texto o internivel. [1.3. The TEI Class System]">model.common</a> ), 
-<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )+,
-               ( ( 
+<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )+ ),
+                  ( ( ( 
 <a class="link_ref" itemprop="ref" href="#TEI.model.divLike" title="model.divLike agrupa los elementos usados para representar divisiones estructurales recursivamente.">model.divLike</a> | 
 <a class="link_ref" itemprop="ref" href="#TEI.model.divGenLike" title="model.divGenLike agrupa elementos usados para representar divisiones estructurales que se generan explícitamente porque estan p...">model.divGenLike</a> ), 
-<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )*
-            )
-         ),
-         ( 
+<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )* )
+               )
+            ),
+            ( ( 
 <a class="link_ref" itemprop="ref" href="#TEI.model.divBottom" title="model.divBottom agrupa elementos que pueden aparecer sólo al final de una división textual p.ej. un tráiler. [4.2. Elements Com...">model.divBottom</a>, 
-<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )*
-      )?
+<a class="link_ref" itemprop="ref" href="#TEI.model.global" title="model.global agrupa elementos vacíos que pueden aparecer en cualquier punto de un texto TEI [1.3. The TEI Class System]">model.global</a>* )* )
+         )?
+      )
    )
 }
 <a href="#index.xml-eg-d33e1077" class="anchorlink">⚓</a>
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index ccb3157f8..c318ee2d8 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -4744,7 +4744,7 @@ floatingText =
   element div {
     ((model.divTop | model.global)*,
      ((((model.divLike | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.divLike | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
@@ -4809,7 +4809,7 @@ div1 =
   element div1 {
     ((model.divTop | model.global)*,
      ((((model.div2Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div2Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -4824,7 +4824,7 @@ div2 =
   element div2 {
     ((model.divTop | model.global)*,
      ((((model.div3Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div3Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -4839,7 +4839,7 @@ div3 =
   element div3 {
     ((model.divTop | model.global)*,
      ((((model.div4Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div4Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -4854,7 +4854,7 @@ div4 =
   element div4 {
     ((model.divTop | model.global)*,
      ((((model.div5Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div5Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -4869,7 +4869,7 @@ div5 =
   element div5 {
     ((model.divTop | model.global)*,
      ((((model.div6Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div6Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -4884,7 +4884,7 @@ div6 =
   element div6 {
     ((model.divTop | model.global)*,
      ((((model.div7Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div7Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -4898,7 +4898,7 @@ div7 =
   ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions]
   element div7 {
     ((model.divTop | model.global)*,
-     (((model.common), model.global*)+,
+     ((model.common, model.global*)+,
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
     att.divLike.attributes,
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index ca2539cca..6c5b5d4ca 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -8866,7 +8866,7 @@ group =
   element div {
     ((model.divTop | model.global)*,
      ((((model.divLike | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.divLike | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
@@ -8929,7 +8929,7 @@ div1 =
   element div1 {
     ((model.divTop | model.global)*,
      ((((model.div2Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div2Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -8944,7 +8944,7 @@ div2 =
   element div2 {
     ((model.divTop | model.global)*,
      ((((model.div3Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div3Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -8959,7 +8959,7 @@ div3 =
   element div3 {
     ((model.divTop | model.global)*,
      ((((model.div4Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div4Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -8974,7 +8974,7 @@ div4 =
   element div4 {
     ((model.divTop | model.global)*,
      ((((model.div5Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div5Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -8989,7 +8989,7 @@ div5 =
   element div5 {
     ((model.divTop | model.global)*,
      ((((model.div6Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div6Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -9004,7 +9004,7 @@ div6 =
   element div6 {
     ((model.divTop | model.global)*,
      ((((model.div7Like | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.div7Like | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
@@ -9018,7 +9018,7 @@ div7 =
   ## ( division du texte de niveau 7) contient la plus petite subdivision possible dans le texte préliminaire, dans le corps d’un texte ou dans le texte postliminaire, plus grande néanmoins qu’un paragraphe. [4.1.2. Numbered Divisions]
   element div7 {
     ((model.divTop | model.global)*,
-     (((model.common), model.global*)+,
+     ((model.common, model.global*)+,
       (model.divBottom, model.global*)*)?),
     att.global.attributes,
     att.divLike.attributes,
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index 98941a8ab..3393d7460 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -7869,7 +7869,7 @@ Tdiv =
   element div {
     ((Tmodel.divTop | Tmodel.global)*,
      ((((Tmodel.divLike | Tmodel.divGenLike), Tmodel.global*)+
-       | (((Tmodel.common), Tmodel.global*)+,
+       | ((Tmodel.common, Tmodel.global*)+,
           ((Tmodel.divLike | Tmodel.divGenLike), Tmodel.global*)*)),
       (Tmodel.divBottom, Tmodel.global*)*)?)
     >> sch:pattern [
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index 38fa83a57..2aec291f3 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -4975,7 +4975,7 @@ tei_div =
   element tei:div {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.divLike | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.divLike | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?)
@@ -5036,7 +5036,7 @@ tei_div1 =
   element tei:div1 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div2Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5052,7 +5052,7 @@ tei_div2 =
   element tei:div2 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div3Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5068,7 +5068,7 @@ tei_div3 =
   element tei:div3 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div4Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5084,7 +5084,7 @@ tei_div4 =
   element tei:div4 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div5Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5100,7 +5100,7 @@ tei_div5 =
   element tei:div5 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div6Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5116,7 +5116,7 @@ tei_div6 =
   element tei:div6 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div7Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5131,7 +5131,7 @@ tei_div7 =
   ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions]
   element tei:div7 {
     ((tei_model.divTop | tei_model.global)*,
-     (((tei_model.common), tei_model.global*)+,
+     ((tei_model.common, tei_model.global*)+,
       (tei_model.divBottom, tei_model.global*)*)?),
     tei_att.global.attributes,
     tei_att.divLike.attributes,
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index d5449e88f..06db0f3d6 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -4978,7 +4978,7 @@ tei_div =
   element div {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.divLike | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.divLike | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?)
@@ -5039,7 +5039,7 @@ tei_div1 =
   element div1 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div2Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5055,7 +5055,7 @@ tei_div2 =
   element div2 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div3Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5071,7 +5071,7 @@ tei_div3 =
   element div3 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div4Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5087,7 +5087,7 @@ tei_div4 =
   element div4 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div5Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5103,7 +5103,7 @@ tei_div5 =
   element div5 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div6Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5119,7 +5119,7 @@ tei_div6 =
   element div6 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div7Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5134,7 +5134,7 @@ tei_div7 =
   ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions]
   element div7 {
     ((tei_model.divTop | tei_model.global)*,
-     (((tei_model.common), tei_model.global*)+,
+     ((tei_model.common, tei_model.global*)+,
       (tei_model.divBottom, tei_model.global*)*)?),
     tei_att.global.attributes,
     tei_att.divLike.attributes,
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index 5e1fdc73b..76a544508 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -4956,7 +4956,7 @@ tei_div =
   element tei:div {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.divLike | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.divLike | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?)
@@ -5017,7 +5017,7 @@ tei_div1 =
   element tei:div1 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div2Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div2Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5033,7 +5033,7 @@ tei_div2 =
   element tei:div2 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div3Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div3Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5049,7 +5049,7 @@ tei_div3 =
   element tei:div3 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div4Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div4Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5065,7 +5065,7 @@ tei_div4 =
   element tei:div4 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div5Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div5Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5081,7 +5081,7 @@ tei_div5 =
   element tei:div5 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div6Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div6Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5097,7 +5097,7 @@ tei_div6 =
   element tei:div6 {
     ((tei_model.divTop | tei_model.global)*,
      ((((tei_model.div7Like | tei_model.divGenLike), tei_model.global*)+
-       | (((tei_model.common), tei_model.global*)+,
+       | ((tei_model.common, tei_model.global*)+,
           ((tei_model.div7Like | tei_model.divGenLike),
            tei_model.global*)*)),
       (tei_model.divBottom, tei_model.global*)*)?),
@@ -5112,7 +5112,7 @@ tei_div7 =
   ## (level-7 text division) contains the smallest possible subdivision of the front, body or back of a text, larger than a paragraph. [4.1.2. Numbered Divisions]
   element tei:div7 {
     ((tei_model.divTop | tei_model.global)*,
-     (((tei_model.common), tei_model.global*)+,
+     ((tei_model.common, tei_model.global*)+,
       (tei_model.divBottom, tei_model.global*)*)?),
     tei_att.global.attributes,
     tei_att.divLike.attributes,
diff --git a/Test/expected-results/testClass.rnc b/Test/expected-results/testClass.rnc
index 5a3d22e98..ddaff567d 100644
--- a/Test/expected-results/testClass.rnc
+++ b/Test/expected-results/testClass.rnc
@@ -610,7 +610,7 @@ model.divGenLike = notAllowed
   element div {
     ((model.divTop | model.global)*,
      ((((model.divLike | model.divGenLike), model.global*)+
-       | (((model.common), model.global*)+,
+       | ((model.common, model.global*)+,
           ((model.divLike | model.divGenLike), model.global*)*)),
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index b77f5f1aa..e0d048bc1 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -5222,12 +5222,14 @@ relatedItem element must be empty</sch:report>
             <zeroOrMore>
                <ref name="model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="speaker"/>
-               <zeroOrMore>
-                  <ref name="model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="speaker"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <oneOrMore>
                <choice>
                   <ref name="lg"/>
@@ -6889,12 +6891,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <zeroOrMore>
                <ref name="model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="front"/>
-               <zeroOrMore>
-                  <ref name="model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="front"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <choice>
                <ref name="body"/>
                <ref name="group"/>
@@ -6902,12 +6906,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <zeroOrMore>
                <ref name="model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="back"/>
-               <zeroOrMore>
-                  <ref name="model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="back"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
@@ -6923,24 +6929,28 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <zeroOrMore>
                <ref name="model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="model.divTop"/>
-               <zeroOrMore>
-                  <choice>
-                     <ref name="model.global"/>
-                     <ref name="model.divTop"/>
-                  </choice>
-               </zeroOrMore>
-            </optional>
-            <optional>
-               <ref name="model.divGenLike"/>
-               <zeroOrMore>
-                  <choice>
-                     <ref name="model.global"/>
-                     <ref name="model.divGenLike"/>
-                  </choice>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="model.divTop"/>
+                  <rng:zeroOrMore>
+                     <rng:choice>
+                        <rng:ref name="model.global"/>
+                        <rng:ref name="model.divTop"/>
+                     </rng:choice>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="model.divGenLike"/>
+                  <rng:zeroOrMore>
+                     <rng:choice>
+                        <rng:ref name="model.global"/>
+                        <rng:ref name="model.divGenLike"/>
+                     </rng:choice>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <choice>
                <oneOrMore>
                   <ref name="model.divLike"/>
@@ -7045,12 +7055,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <zeroOrMore>
                <ref name="model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="front"/>
-               <zeroOrMore>
-                  <ref name="model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="front"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <choice>
                <ref name="body"/>
                <ref name="group"/>
@@ -7058,12 +7070,14 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <zeroOrMore>
                <ref name="model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="back"/>
-               <zeroOrMore>
-                  <ref name="model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="back"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
@@ -7081,44 +7095,44 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                   <ref name="model.global"/>
                </choice>
             </zeroOrMore>
-            <optional>
-               <choice>
-                  <oneOrMore>
-                     <choice>
-                        <ref name="model.divLike"/>
-                        <ref name="model.divGenLike"/>
-                     </choice>
-                     <zeroOrMore>
-                        <ref name="model.global"/>
-                     </zeroOrMore>
-                  </oneOrMore>
-                  <group>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:choice>
                      <oneOrMore>
-                        <choice>
-                           <ref name="model.common"/>
-                        </choice>
-                        <zeroOrMore>
-                           <ref name="model.global"/>
-                        </zeroOrMore>
+                        <rng:choice>
+                           <rng:ref name="model.divLike"/>
+                           <rng:ref name="model.divGenLike"/>
+                        </rng:choice>
+                        <rng:zeroOrMore>
+                           <rng:ref name="model.global"/>
+                        </rng:zeroOrMore>
                      </oneOrMore>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="model.divLike"/>
-                           <ref name="model.divGenLike"/>
-                        </choice>
-                        <zeroOrMore>
-                           <ref name="model.global"/>
-                        </zeroOrMore>
-                     </zeroOrMore>
-                  </group>
-               </choice>
-               <zeroOrMore>
-                  <ref name="model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="model.global"/>
-                  </zeroOrMore>
-               </zeroOrMore>
-            </optional>
+                     <group>
+                        <oneOrMore>
+                           <rng:ref name="model.common"/>
+                           <rng:zeroOrMore>
+                              <rng:ref name="model.global"/>
+                           </rng:zeroOrMore>
+                        </oneOrMore>
+                        <rng:zeroOrMore>
+                           <rng:choice>
+                              <rng:ref name="model.divLike"/>
+                              <rng:ref name="model.divGenLike"/>
+                           </rng:choice>
+                           <rng:zeroOrMore>
+                              <rng:ref name="model.global"/>
+                           </rng:zeroOrMore>
+                        </rng:zeroOrMore>
+                     </group>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                     <rng:ref name="model.divBottom"/>
+                     <rng:zeroOrMore>
+                        <rng:ref name="model.global"/>
+                     </rng:zeroOrMore>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -7482,39 +7496,41 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                   <ref name="model.global"/>
                </choice>
             </zeroOrMore>
-            <optional>
-               <choice>
-                  <group>
-                     <ref name="model.div1Like"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="model.div1Like"/>
-                           <ref name="model.frontPart"/>
-                           <ref name="model.global"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
-                  <group>
-                     <ref name="model.divLike"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="model.divLike"/>
-                           <ref name="model.frontPart"/>
-                           <ref name="model.global"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
-               </choice>
-               <optional>
-                  <ref name="model.divBottom"/>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="model.divBottom"/>
-                        <ref name="model.global"/>
-                     </choice>
-                  </zeroOrMore>
-               </optional>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:choice>
+                     <group>
+                        <rng:ref name="model.div1Like"/>
+                        <rng:zeroOrMore>
+                           <rng:choice>
+                              <rng:ref name="model.div1Like"/>
+                              <rng:ref name="model.frontPart"/>
+                              <rng:ref name="model.global"/>
+                           </rng:choice>
+                        </rng:zeroOrMore>
+                     </group>
+                     <group>
+                        <rng:ref name="model.divLike"/>
+                        <rng:zeroOrMore>
+                           <rng:choice>
+                              <rng:ref name="model.divLike"/>
+                              <rng:ref name="model.frontPart"/>
+                              <rng:ref name="model.global"/>
+                           </rng:choice>
+                        </rng:zeroOrMore>
+                     </group>
+                  </rng:choice>
+                  <optional>
+                     <rng:ref name="model.divBottom"/>
+                     <rng:zeroOrMore>
+                        <rng:choice>
+                           <rng:ref name="model.divBottom"/>
+                           <rng:ref name="model.global"/>
+                        </rng:choice>
+                     </rng:zeroOrMore>
+                  </optional>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
@@ -7558,15 +7574,17 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                   </group>
                </choice>
             </optional>
-            <optional>
-               <ref name="model.divBottomPart"/>
-               <zeroOrMore>
-                  <choice>
-                     <ref name="model.divBottomPart"/>
-                     <ref name="model.global"/>
-                  </choice>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="model.divBottomPart"/>
+                  <rng:zeroOrMore>
+                     <rng:choice>
+                        <rng:ref name="model.divBottomPart"/>
+                        <rng:ref name="model.global"/>
+                     </rng:choice>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index aadb94daf..70cacb603 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -6053,12 +6053,14 @@ relatedItem element must be empty</sch:report>
             <zeroOrMore>
                <ref name="t_model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="t_speaker"/>
-               <zeroOrMore>
-                  <ref name="t_model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_speaker"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="t_model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <oneOrMore>
                <choice>
                   <ref name="t_lg"/>
@@ -6487,11 +6489,13 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       <element name="seriesStmt">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(series statement)  [2.2.5. The Series Statement 2.2. The File Description]</a:documentation>
          <choice>
-            <optional>
-               <ref name="t_label"/>
-               <ref name="t_said"/>
-               <ref name="t_pc"/>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_label"/>
+                  <rng:ref name="t_said"/>
+                  <rng:ref name="t_pc"/>
+               </rng:group>
+            </rng:optional>
             <group>
                <optional>
                   <ref name="t_label"/>
@@ -8974,12 +8978,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <zeroOrMore>
                <ref name="t_model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="t_front"/>
-               <zeroOrMore>
-                  <ref name="t_model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_front"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="t_model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <choice>
                <ref name="t_body"/>
                <ref name="t_group"/>
@@ -8987,12 +8993,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <zeroOrMore>
                <ref name="t_model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="t_back"/>
-               <zeroOrMore>
-                  <ref name="t_model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_back"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="t_model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
@@ -9008,24 +9016,28 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <zeroOrMore>
                <ref name="t_model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="t_model.divTop"/>
-               <zeroOrMore>
-                  <choice>
-                     <ref name="t_model.global"/>
-                     <ref name="t_model.divTop"/>
-                  </choice>
-               </zeroOrMore>
-            </optional>
-            <optional>
-               <ref name="t_model.divGenLike"/>
-               <zeroOrMore>
-                  <choice>
-                     <ref name="t_model.global"/>
-                     <ref name="t_model.divGenLike"/>
-                  </choice>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_model.divTop"/>
+                  <rng:zeroOrMore>
+                     <rng:choice>
+                        <rng:ref name="t_model.global"/>
+                        <rng:ref name="t_model.divTop"/>
+                     </rng:choice>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_model.divGenLike"/>
+                  <rng:zeroOrMore>
+                     <rng:choice>
+                        <rng:ref name="t_model.global"/>
+                        <rng:ref name="t_model.divGenLike"/>
+                     </rng:choice>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <choice>
                <oneOrMore>
                   <ref name="t_model.divLike"/>
@@ -9130,12 +9142,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <zeroOrMore>
                <ref name="t_model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="t_front"/>
-               <zeroOrMore>
-                  <ref name="t_model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_front"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="t_model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
             <choice>
                <ref name="t_body"/>
                <ref name="t_group"/>
@@ -9143,12 +9157,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <zeroOrMore>
                <ref name="t_model.global"/>
             </zeroOrMore>
-            <optional>
-               <ref name="t_back"/>
-               <zeroOrMore>
-                  <ref name="t_model.global"/>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_back"/>
+                  <rng:zeroOrMore>
+                     <rng:ref name="t_model.global"/>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
@@ -9166,44 +9182,44 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                   <ref name="t_model.global"/>
                </choice>
             </zeroOrMore>
-            <optional>
-               <choice>
-                  <oneOrMore>
-                     <choice>
-                        <ref name="t_model.divLike"/>
-                        <ref name="t_model.divGenLike"/>
-                     </choice>
-                     <zeroOrMore>
-                        <ref name="t_model.global"/>
-                     </zeroOrMore>
-                  </oneOrMore>
-                  <group>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:choice>
                      <oneOrMore>
-                        <choice>
-                           <ref name="t_model.common"/>
-                        </choice>
-                        <zeroOrMore>
-                           <ref name="t_model.global"/>
-                        </zeroOrMore>
+                        <rng:choice>
+                           <rng:ref name="t_model.divLike"/>
+                           <rng:ref name="t_model.divGenLike"/>
+                        </rng:choice>
+                        <rng:zeroOrMore>
+                           <rng:ref name="t_model.global"/>
+                        </rng:zeroOrMore>
                      </oneOrMore>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="t_model.divLike"/>
-                           <ref name="t_model.divGenLike"/>
-                        </choice>
-                        <zeroOrMore>
-                           <ref name="t_model.global"/>
-                        </zeroOrMore>
-                     </zeroOrMore>
-                  </group>
-               </choice>
-               <zeroOrMore>
-                  <ref name="t_model.divBottom"/>
-                  <zeroOrMore>
-                     <ref name="t_model.global"/>
-                  </zeroOrMore>
-               </zeroOrMore>
-            </optional>
+                     <group>
+                        <oneOrMore>
+                           <rng:ref name="t_model.common"/>
+                           <rng:zeroOrMore>
+                              <rng:ref name="t_model.global"/>
+                           </rng:zeroOrMore>
+                        </oneOrMore>
+                        <rng:zeroOrMore>
+                           <rng:choice>
+                              <rng:ref name="t_model.divLike"/>
+                              <rng:ref name="t_model.divGenLike"/>
+                           </rng:choice>
+                           <rng:zeroOrMore>
+                              <rng:ref name="t_model.global"/>
+                           </rng:zeroOrMore>
+                        </rng:zeroOrMore>
+                     </group>
+                  </rng:choice>
+                  <rng:zeroOrMore>
+                     <rng:ref name="t_model.divBottom"/>
+                     <rng:zeroOrMore>
+                        <rng:ref name="t_model.global"/>
+                     </rng:zeroOrMore>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -9565,39 +9581,41 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                   <ref name="t_model.global"/>
                </choice>
             </zeroOrMore>
-            <optional>
-               <choice>
-                  <group>
-                     <ref name="t_model.div1Like"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="t_model.div1Like"/>
-                           <ref name="t_model.frontPart"/>
-                           <ref name="t_model.global"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
-                  <group>
-                     <ref name="t_model.divLike"/>
-                     <zeroOrMore>
-                        <choice>
-                           <ref name="t_model.divLike"/>
-                           <ref name="t_model.frontPart"/>
-                           <ref name="t_model.global"/>
-                        </choice>
-                     </zeroOrMore>
-                  </group>
-               </choice>
-               <optional>
-                  <ref name="t_model.divBottom"/>
-                  <zeroOrMore>
-                     <choice>
-                        <ref name="t_model.divBottom"/>
-                        <ref name="t_model.global"/>
-                     </choice>
-                  </zeroOrMore>
-               </optional>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:choice>
+                     <group>
+                        <rng:ref name="t_model.div1Like"/>
+                        <rng:zeroOrMore>
+                           <rng:choice>
+                              <rng:ref name="t_model.div1Like"/>
+                              <rng:ref name="t_model.frontPart"/>
+                              <rng:ref name="t_model.global"/>
+                           </rng:choice>
+                        </rng:zeroOrMore>
+                     </group>
+                     <group>
+                        <rng:ref name="t_model.divLike"/>
+                        <rng:zeroOrMore>
+                           <rng:choice>
+                              <rng:ref name="t_model.divLike"/>
+                              <rng:ref name="t_model.frontPart"/>
+                              <rng:ref name="t_model.global"/>
+                           </rng:choice>
+                        </rng:zeroOrMore>
+                     </group>
+                  </rng:choice>
+                  <optional>
+                     <rng:ref name="t_model.divBottom"/>
+                     <rng:zeroOrMore>
+                        <rng:choice>
+                           <rng:ref name="t_model.divBottom"/>
+                           <rng:ref name="t_model.global"/>
+                        </rng:choice>
+                     </rng:zeroOrMore>
+                  </optional>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
@@ -9641,15 +9659,17 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
                   </group>
                </choice>
             </optional>
-            <optional>
-               <ref name="t_model.divBottomPart"/>
-               <zeroOrMore>
-                  <choice>
-                     <ref name="t_model.divBottomPart"/>
-                     <ref name="t_model.global"/>
-                  </choice>
-               </zeroOrMore>
-            </optional>
+            <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
+               <rng:group>
+                  <rng:ref name="t_model.divBottomPart"/>
+                  <rng:zeroOrMore>
+                     <rng:choice>
+                        <rng:ref name="t_model.divBottomPart"/>
+                        <rng:ref name="t_model.global"/>
+                     </rng:choice>
+                  </rng:zeroOrMore>
+               </rng:group>
+            </rng:optional>
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index d2f5291e4..f0ee58533 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -64,6 +64,11 @@ of this software, even if advised of the possibility of such damage.
   <xsl:key name="REFED" match="rng:ref" use="@name"/>
   <xsl:key name="DEFED" match="rng:define" use="@name"/>
   <xsl:key name="EDEF" match="rng:define[rng:element]" use="1"/>
+  <!-- BREAK-by-debugging, when true(), puts the results of *all*
+       passes into the output RELAX NG. This is great if you want to
+       poke at exactly what each pass is doing, but of course ruins
+       the RELAX NG output itself -->
+  <xsl:param name="BREAK-by-debugging" select="false()" as="xs:boolean"/>
   <xsl:param name="verbose"/>
   <xsl:param name="outputDir"/>
   <xsl:param name="appendixWords"/>
@@ -169,86 +174,95 @@ of this software, even if advised of the possibility of such damage.
   <xsl:template name="schemaSpecBody">
     <xsl:variable name="original" select="."/>
     <xsl:variable name="pass1">
-      <root>
-        <xsl:if test="$verbose='true'">
-          <xsl:message>start importing moduleRef components</xsl:message>
-        </xsl:if>
-        <xsl:apply-templates mode="tangle" select="tei:moduleRef"/>
-        <xsl:for-each select="tei:macroSpec|tei:dataSpec">
-          <xsl:apply-templates mode="tangle" select="."/>
-        </xsl:for-each>
-        <xsl:for-each select=".//tei:anyElement">
-          <xsl:call-template name="anyElement"/>
-        </xsl:for-each>
-        <xsl:apply-templates mode="tangle" select="tei:elementSpec|tei:classSpec"/>
-        <xsl:choose>
-          <xsl:when test="@start and @start=''"/>
-          <xsl:when test="@start">
-            <start xmlns="http://relaxng.org/ns/structure/1.0">
-              <choice>
-                <xsl:for-each select="tokenize(@start,' ')">
-                  <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{.}"/>
-                </xsl:for-each>
-              </choice>
-            </start>
-          </xsl:when>
-          <xsl:when test="key('IDENTS','teiCorpus')">
-            <start xmlns="http://relaxng.org/ns/structure/1.0">
-              <choice>
-                <ref name="{$generalPrefix}TEI"/>
-                <ref name="{$generalPrefix}teiCorpus"/>
-              </choice>
-            </start>
-          </xsl:when>
-          <xsl:otherwise>
-            <start xmlns="http://relaxng.org/ns/structure/1.0">
+      <xsl:if test="$verbose='true'">
+        <xsl:message>start importing moduleRef components</xsl:message>
+      </xsl:if>
+      <xsl:apply-templates mode="tangle" select="tei:moduleRef"/>
+      <xsl:for-each select="tei:macroSpec|tei:dataSpec">
+        <xsl:apply-templates mode="tangle" select="."/>
+      </xsl:for-each>
+      <xsl:for-each select=".//tei:anyElement">
+        <xsl:call-template name="anyElement"/>
+      </xsl:for-each>
+      <xsl:apply-templates mode="tangle" select="tei:elementSpec|tei:classSpec"/>
+      <xsl:choose>
+        <xsl:when test="@start and @start=''"/>
+        <xsl:when test="@start">
+          <start xmlns="http://relaxng.org/ns/structure/1.0">
+            <choice>
+              <xsl:for-each select="tokenize(@start,' ')">
+                <ref xmlns="http://relaxng.org/ns/structure/1.0" name="{.}"/>
+              </xsl:for-each>
+            </choice>
+          </start>
+        </xsl:when>
+        <xsl:when test="key('IDENTS','teiCorpus')">
+          <start xmlns="http://relaxng.org/ns/structure/1.0">
+            <choice>
               <ref name="{$generalPrefix}TEI"/>
-            </start>
-          </xsl:otherwise>
-        </xsl:choose>
-      </root>
+              <ref name="{$generalPrefix}teiCorpus"/>
+            </choice>
+          </start>
+        </xsl:when>
+        <xsl:otherwise>
+          <start xmlns="http://relaxng.org/ns/structure/1.0">
+            <ref name="{$generalPrefix}TEI"/>
+          </start>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:variable>
     
-    <!-- in 2nd and 3rd  passes, throw away any RNG <define> elements
-      which do not have a <ref>, any <ref> which has no <define>
-      to point to, and any empty <choice> -->
+    <!-- In 2nd and 4th passes, throw away any RNG <define> elements
+         which do not have a <ref>, any <ref> which has no <define> to
+         point to, and any empty <choice>. 3rd pass just cleans up
+         result of 2nd pass (by reversing rng:group/rng:optional to
+         become rng:optional/rng:group) so that 4th pass can grok
+         it. (See
+         https://github.com/TEIC/Stylesheets/pull/633#issuecomment-1763517464.)
+         -->
     <xsl:variable name="pass2">
-      <xsl:for-each select="$pass1/root">
-        <root>
-          <xsl:apply-templates mode="pass2"/>
-        </root>
-      </xsl:for-each>
+      <xsl:apply-templates mode="pass2" select="$pass1"/>
     </xsl:variable>
     <xsl:variable name="pass3">
-      <xsl:for-each select="$pass2/root">
-        <xsl:apply-templates mode="pass3"/>
-      </xsl:for-each>
+      <xsl:apply-templates mode="pass3" select="$pass2"/>
     </xsl:variable>
-    <!-- The variable $pass3 is not really needed, but is left here to
+    <xsl:variable name="pass4">
+      <xsl:apply-templates mode="pass4" select="$pass3"/>
+    </xsl:variable>
+    <!-- The variable $pass4 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
+         ($pass4). 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:sequence select="$pass4"/>
+
+    <xsl:if test="$BREAK-by-debugging">
+      <!-- DEBUGGING ONLY output — If this output is generated, the
+           resulting schema will be useful for debugging, but will be
+           BROKEN! -->
+      <a:documentation> ========= above is pass4, next is pass3 ========= </a:documentation>
+      <rng:div xml:id="pass3">
+        <xsl:copy-of select="$pass3"/>
+      </rng:div>
+      <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:if>
 </xsl:template>
 
   <xsl:template match="tei:moduleSpec">
@@ -501,7 +515,7 @@ of this software, even if advised of the possibility of such damage.
     <xsl:copy-of select="."/>
   </xsl:template>
 
-<!-- pass 2, clean up unused elements -->
+  <!-- pass 2, clean up unused elements -->
   <xsl:template  match="rng:anyName[parent::rng:define]"
                  mode='pass2'>
     <zeroOrMore xmlns="http://relaxng.org/ns/structure/1.0">
@@ -513,11 +527,7 @@ of this software, even if advised of the possibility of such damage.
     </zeroOrMore>
   </xsl:template>
 
-  <xsl:template match="processing-instruction()" mode="pass2">
-    <xsl:copy-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="@*|text()|comment()" mode="pass2">
+  <xsl:template match="@*|text()|comment()|processing-instruction()" mode="pass2">
       <xsl:copy-of select="."/>
   </xsl:template>
     
@@ -532,9 +542,8 @@ of this software, even if advised of the possibility of such damage.
       <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="@*" mode="pass2"/>
+          <xsl:apply-templates  select="*|processing-instruction()|comment()|text()" mode="pass2"/>
         </define>
       </xsl:when>
       <xsl:otherwise>
@@ -570,14 +579,35 @@ of this software, even if advised of the possibility of such damage.
     </xsl:choose>
   </xsl:template>
 
-  <!-- and again -->
+
+  <!-- pass3: just swap rng:group/rng:optional to become rng:optional/rng:group -->
+
+  <xsl:template match="@*|text()|comment()|processing-instruction()" mode="pass3">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+    
+  <xsl:template match="*" mode="pass3">
+    <xsl:copy>
+      <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass3"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="rng:group[ count(*) eq 1  and  rng:optional ]" mode="pass3">
+    <rng:optional>
+      <rng:group>
+        <xsl:apply-templates select="rng:optional/node()"/>
+      </rng:group>
+    </rng:optional>
+  </xsl:template>
+
+
+  <!-- pass4: another round of cleanup -->
   
-  <xsl:template match="rng:list|rng:element" mode="pass3">
+  <xsl:template match="rng:list|rng:element" mode="pass4">
     <xsl:element name="{name()}" namespace="http://relaxng.org/ns/structure/1.0">
-      <xsl:apply-templates  select="@*"  mode="pass3"/>
+      <xsl:apply-templates  select="@*" mode="pass4"/>
       <xsl:variable name="Contents">
-        <xsl:apply-templates  select="*|processing-instruction()|comment()|text()"
-                              mode="pass3"/>
+        <xsl:apply-templates  select="*|processing-instruction()|comment()|text()" mode="pass4"/>
       </xsl:variable>
       <xsl:choose>
         <xsl:when test="$Contents//rng:text or $Contents//rng:ref or
@@ -594,15 +624,15 @@ of this software, even if advised of the possibility of such damage.
     </xsl:element>
   </xsl:template>
   
-  <xsl:template match="rng:group[count(*)=1]" mode="pass3">
-    <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass3"/>
+  <xsl:template match="rng:group[count(*) eq 1]" mode="pass4">
+    <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
   </xsl:template>
 
-  <xsl:template match="rng:choice|rng:group" mode="pass3">
+  <xsl:template match="rng:choice|rng:group" mode="pass4">
     <xsl:choose>
       <xsl:when test="rng:value|rng:name|.//rng:ref|.//rng:text|.//rng:data">
         <xsl:element name="{name()}" namespace="http://relaxng.org/ns/structure/1.0">
-          <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass3"/>
+          <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
         </xsl:element>
       </xsl:when>
       <xsl:otherwise>
@@ -614,12 +644,11 @@ of this software, even if advised of the possibility of such damage.
     </xsl:choose>                          
   </xsl:template>
 
-  <xsl:template match="rng:optional|rng:zeroOrMore|rng:oneOrMore"
-    mode="pass3">
+  <xsl:template match="rng:optional|rng:zeroOrMore|rng:oneOrMore" mode="pass4">
     <xsl:choose>
       <xsl:when test="not(*)"/>
-      <xsl:when test="count(*)=1 and rng:empty"/>
-      <xsl:when test="count(*)=1">
+      <xsl:when test="count(*) eq 1 and rng:empty"/>
+      <xsl:when test="count(*) eq 1">
         <xsl:variable name="what" select="rng:ref/@name"/>
         <xsl:choose>
           <xsl:when test="$what=following-sibling::*[1][count(*)=1]/rng:*/rng:ref/@name">
@@ -631,31 +660,27 @@ of this software, even if advised of the possibility of such damage.
               select="(ancestor::rng:element/@name,rng:ref/@name)"/> because it's repeated in following rule</xsl:message></xsl:if>
           </xsl:when>
           <xsl:when test="rng:zeroOrMore">
-            <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass3"/>
+            <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
           </xsl:when>
           <xsl:when test="rng:group[count(*)=1 and rng:zeroOrMore]">
-            <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass3"/>
+            <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:element name="{name()}" namespace="http://relaxng.org/ns/structure/1.0">
-              <xsl:apply-templates
-                select="*|@*|processing-instruction()|comment()|text()"
-                mode="pass3"/>
+              <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
             </xsl:element>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
         <xsl:element name="{name()}" namespace="http://relaxng.org/ns/structure/1.0">
-          <xsl:apply-templates
-            select="*|@*|processing-instruction()|comment()|text()"
-            mode="pass3"/>
+          <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
         </xsl:element>
       </xsl:otherwise>
     </xsl:choose>                          
   </xsl:template>
 
-  <xsl:template match="processing-instruction()" mode="pass3">
+  <xsl:template match="processing-instruction()" mode="pass4">
     <xsl:choose>
       <xsl:when test="name()='NameList'">
         <xsl:if test="$verbose='true'">
@@ -671,7 +696,7 @@ of this software, even if advised of the possibility of such damage.
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="rng:start/rng:choice" mode="pass3">
+  <xsl:template match="rng:start/rng:choice" mode="pass4">
     <!-- look at start patterns and see if they need prepending with
     prefix -->
     <choice xmlns="http://relaxng.org/ns/structure/1.0">
@@ -687,13 +712,13 @@ of this software, even if advised of the possibility of such damage.
     </choice>
   </xsl:template>
 
-  <xsl:template match="rng:define" mode="pass3">
+  <xsl:template match="rng:define" mode="pass4">
     <xsl:choose>
       <xsl:when test="key('REFED',@name) or key('XPATTERNS',@name)">
         <xsl:choose>
           <xsl:when test="count(key('DEFED',@name))=1 or @combine='choice'">
             <xsl:copy>
-              <xsl:apply-templates select="@*|node()" mode="pass3"/>
+              <xsl:apply-templates select="@*|node()" mode="pass4"/>
             </xsl:copy>
           </xsl:when>
           <xsl:otherwise>
@@ -702,9 +727,9 @@ of this software, even if advised of the possibility of such damage.
                 <n><xsl:value-of select="count(ancestor::rng:div)"/></n>
               </xsl:for-each>
             </xsl:variable>
-            <xsl:if test="count(ancestor::rng:div)     &lt; max($others/*)">
+            <xsl:if test="count(ancestor::rng:div) lt max($others/*)">
               <xsl:copy>
-                <xsl:apply-templates select="@*|node()" mode="pass3"/>
+                <xsl:apply-templates select="@*|node()" mode="pass4"/>
               </xsl:copy>
             </xsl:if>
           </xsl:otherwise>
@@ -718,13 +743,13 @@ of this software, even if advised of the possibility of such damage.
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="@*|text()|comment()" mode="pass3">
+  <xsl:template match="@*|text()|comment()" mode="pass4">
       <xsl:copy-of select="."/>
   </xsl:template>
     
-  <xsl:template match="*" mode="pass3">
+  <xsl:template match="*" mode="pass4">
       <xsl:copy>
-         <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass3"/>
+         <xsl:apply-templates select="*|@*|processing-instruction()|comment()|text()" mode="pass4"/>
       </xsl:copy>
   </xsl:template>
 
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 646067c58..a206bf40a 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -827,7 +827,6 @@ of this software, even if advised of the possibility of such damage.
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <!--  -->
     <xsl:choose>
       <xsl:when test="$suffix='' or $suffix='NULL'">
         <rng:ref name="{$localprefix}{@ident}"/>

From 6d3b39d3497d74fed767e58b65c481bff5868f13 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Mon, 13 Nov 2023 06:04:21 +1000
Subject: [PATCH 12/50] misc: fix spelling

---
 Documentation/teixsl.xml                  |  2 +-
 README.md                                 |  2 +-
 Test/expected-results/test38.xml          | 12 ++++++------
 Test/test38.htm                           | 12 ++++++------
 Test2/expected-results/testHtmlInput1.xml | 12 ++++++------
 Test2/inputFiles/testHtmlInput1.html      | 12 ++++++------
 odds/RngToRnc.xsl                         |  2 +-
 odds/odd2relax.xsl                        |  6 +++---
 odds/teiodds.xsl                          |  2 +-
 tools/ex1.xml                             |  2 +-
 10 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/Documentation/teixsl.xml b/Documentation/teixsl.xml
index c9d0b6a10..a159dc80b 100644
--- a/Documentation/teixsl.xml
+++ b/Documentation/teixsl.xml
@@ -66,7 +66,7 @@ the <ref target="mailto:info@tei-c.org">TEI Consortium</ref>.
         <p>This is a family of XSLT 2.0 stylesheets to transform TEI
         XML documents to various textual formats formats, including
         XHTML, LaTeX, XSL Formatting Objects, ePub, plain text, RDF,
-        and JSON; and to/from Word OOXML (docx) and OpenOfice (odt).
+        and JSON; and to/from Word OOXML (docx) and OpenOffice (odt).
         They concentrate on the core TEI modules which are used for
         simple transcription and <q>born digital</q> writing. It is
         important to understand that they do <hi>not</hi>:
diff --git a/README.md b/README.md
index e5dfe29e1..549bc63b9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 TEI XSL Stylesheets
 
-This is a family of XSLT 2.0 stylesheets to transform TEI XML documents to various formats, including XHTML, LaTeX, XSL Formatting Objects, ePub, plain text, RDF, JSON; and to/from Word OOXML (docx) and OpenOfice (odt).  They concentrate on the core TEI modules which are used for simple transcription and "born digital" writing. It is important to understand that they do _not_:
+This is a family of XSLT 2.0 stylesheets to transform TEI XML documents to various formats, including XHTML, LaTeX, XSL Formatting Objects, ePub, plain text, RDF, JSON; and to/from Word OOXML (docx) and OpenOffice (odt).  They concentrate on the core TEI modules which are used for simple transcription and "born digital" writing. It is important to understand that they do _not_:
 
 *   cover all TEI elements and possible attribute values
 *   attempt to define a standard TEI processing or rendering model
diff --git a/Test/expected-results/test38.xml b/Test/expected-results/test38.xml
index 7434f9f6e..98f08f984 100644
--- a/Test/expected-results/test38.xml
+++ b/Test/expected-results/test38.xml
@@ -70,22 +70,22 @@
       </div>
       <div>
         <head>Header 1 &lt;h1&gt;</head>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <div>
           <head>Header 2 &lt;h2&gt;</head>
-          <p>This is an example paragrah used within this article for this document.</p>
+          <p>This is an example paragraph used within this article for this document.</p>
           <div>
             <head>Header 3 &lt;h3&gt;</head>
-            <p>This is an example paragrah used within this article for this document.</p>
+            <p>This is an example paragraph used within this article for this document.</p>
             <div>
               <head>Header 1 &lt;h4&gt;</head>
-              <p>This is an example paragrah used within this article for this document.</p>
+              <p>This is an example paragraph used within this article for this document.</p>
               <div>
                 <head>Header &lt;h5&gt;</head>
-                <p>This is an example paragrah used within this article for this document.</p>
+                <p>This is an example paragraph used within this article for this document.</p>
                 <div>
                   <head>Header &lt;h6&gt;</head>
-                  <p>This is an example paragrah used within this article for this document.</p>
+                  <p>This is an example paragraph used within this article for this document.</p>
                 </div>
               </div>
             </div>
diff --git a/Test/test38.htm b/Test/test38.htm
index 378820610..610854ca2 100644
--- a/Test/test38.htm
+++ b/Test/test38.htm
@@ -104,17 +104,17 @@ <h4>Purpose of this document:</h4>
         <p><span>Note:</span> This is only a guide - a starting point - if you will.</p>
         <hr/>
         <h1>Header 1 &lt;h1&gt;</h1>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h2>Header 2 &lt;h2&gt;</h2>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h3>Header 3 &lt;h3&gt;</h3>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h4>Header 1 &lt;h4&gt;</h4>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h5>Header &lt;h5&gt;</h5>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h6>Header &lt;h6&gt;</h6>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <hr/>
         <h4>Unordered list</h4>
         <ul>
diff --git a/Test2/expected-results/testHtmlInput1.xml b/Test2/expected-results/testHtmlInput1.xml
index 001933802..a13730766 100644
--- a/Test2/expected-results/testHtmlInput1.xml
+++ b/Test2/expected-results/testHtmlInput1.xml
@@ -61,22 +61,22 @@
          </div>
          <div>
             <head>Header 1 &lt;h1&gt;</head>
-            <p>This is an example paragrah used within this article for this document.</p>
+            <p>This is an example paragraph used within this article for this document.</p>
             <div>
                <head>Header 2 &lt;h2&gt;</head>
-               <p>This is an example paragrah used within this article for this document.</p>
+               <p>This is an example paragraph used within this article for this document.</p>
                <div>
                   <head>Header 3 &lt;h3&gt;</head>
-                  <p>This is an example paragrah used within this article for this document.</p>
+                  <p>This is an example paragraph used within this article for this document.</p>
                   <div>
                      <head>Header 1 &lt;h4&gt;</head>
-                     <p>This is an example paragrah used within this article for this document.</p>
+                     <p>This is an example paragraph used within this article for this document.</p>
                      <div>
                         <head>Header &lt;h5&gt;</head>
-                        <p>This is an example paragrah used within this article for this document.</p>
+                        <p>This is an example paragraph used within this article for this document.</p>
                         <div>
                            <head>Header &lt;h6&gt;</head>
-                           <p>This is an example paragrah used within this article for this document.</p>
+                           <p>This is an example paragraph used within this article for this document.</p>
                         </div>
                      </div>
                   </div>
diff --git a/Test2/inputFiles/testHtmlInput1.html b/Test2/inputFiles/testHtmlInput1.html
index c7afc0552..96ef20bad 100644
--- a/Test2/inputFiles/testHtmlInput1.html
+++ b/Test2/inputFiles/testHtmlInput1.html
@@ -105,17 +105,17 @@ <h4>Purpose of this document:</h4>
         <p><span>Note:</span> This is only a guide - a starting point - if you will.</p>
         <hr/>
         <h1>Header 1 &lt;h1&gt;</h1>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h2>Header 2 &lt;h2&gt;</h2>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h3>Header 3 &lt;h3&gt;</h3>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h4>Header 1 &lt;h4&gt;</h4>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h5>Header &lt;h5&gt;</h5>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <h6>Header &lt;h6&gt;</h6>
-        <p>This is an example paragrah used within this article for this document.</p>
+        <p>This is an example paragraph used within this article for this document.</p>
         <hr/>
         <h4>Unordered list</h4>
         <ul>
diff --git a/odds/RngToRnc.xsl b/odds/RngToRnc.xsl
index c9a871452..91d869828 100644
--- a/odds/RngToRnc.xsl
+++ b/odds/RngToRnc.xsl
@@ -80,7 +80,7 @@
 <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 <!-- collapse-lines:
      If true, output constructs spanning multiple lines will be
-     groupd into a single line unless it exceeds $line-width chars. -->
+     grouped into a single line unless it exceeds $line-width chars. -->
   <xsl:param name="collapse-lines" select="true ()"/>
    <!-- indent-width:
      The number of characters to indent at each indentation level -->
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index aedd995da..d4cc079ea 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -229,8 +229,8 @@ of this software, even if advised of the possibility of such damage.
          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 &
+         is called from within a variable definition. You can get
+         around this by outputting 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
@@ -346,7 +346,7 @@ of this software, even if advised of the possibility of such damage.
     <xsl:for-each select="key('ELEMENTDOCS',1)">
       <xsl:sort select="@ident"/>
       <xsl:if test="@ident ne 'anyElement'">
-        <!-- Don't auto-generate a defition for an <anyElement>, those
+        <!-- Don't auto-generate a definition 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. -->
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index cab8c09f8..70cd0ba72 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -1681,7 +1681,7 @@ select="$makeDecls"/></xsl:message>
     </xsl:variable>
     <xsl:variable name="glossAndDesc">
       <!-- This variable will hold the string value of the <gloss> and -->
-      <!-- <desc> of the constrcut we are currently dealing with, in   -->
+      <!-- <desc> of the construct we are currently dealing with, in   -->
       <!-- the language we are currently dealing with, so as to put it -->
       <!-- on the title= attribute when we output its name in an <a>.  -->
       <xsl:choose>
diff --git a/tools/ex1.xml b/tools/ex1.xml
index 42cebcd26..0d79137ec 100644
--- a/tools/ex1.xml
+++ b/tools/ex1.xml
@@ -58,7 +58,7 @@
                         mm between ruled lines, and with a double vertical bounding line ruled to
                         provide space for litterae notabiliores. On occasion the gap between lines
                         is not regular, for example on fol. 180.</p>
-                    <p>paragrah</p>
+                    <p>paragraph</p>
                 </div>
                 <div type="subsection">
                     <head>Ink</head>

From 72163e422c69c032141cfc58f79282af2d3902fb Mon Sep 17 00:00:00 2001
From: "Hugh A. Cayless" <philomousos@gmail.com>
Date: Thu, 16 Nov 2023 11:08:19 -0500
Subject: [PATCH 13/50] Fix another test.

---
 Test/expected-results/test-indexes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Test/expected-results/test-indexes.xml b/Test/expected-results/test-indexes.xml
index b40780ce8..3f46f478f 100644
--- a/Test/expected-results/test-indexes.xml
+++ b/Test/expected-results/test-indexes.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

From f02c0e1c08c3765c5b1ac87039afa71fada13511 Mon Sep 17 00:00:00 2001
From: "Hugh A. Cayless" <philomousos@gmail.com>
Date: Thu, 16 Nov 2023 11:15:13 -0500
Subject: [PATCH 14/50] Fix version number.

---
 Test/expected-results/hyperlinktest.xml | 2 +-
 Test/expected-results/test-rtf2tei.xml  | 2 +-
 Test/expected-results/test11.xml        | 2 +-
 Test/expected-results/test11a.xml       | 2 +-
 Test/expected-results/test18.xml        | 2 +-
 Test/expected-results/test19.xml        | 2 +-
 Test/expected-results/test29.xml        | 2 +-
 Test/expected-results/test37.xml        | 2 +-
 Test/expected-results/test39.xml        | 2 +-
 Test/expected-results/test40.xml        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Test/expected-results/hyperlinktest.xml b/Test/expected-results/hyperlinktest.xml
index 41c15525a..3e430da83 100644
--- a/Test/expected-results/hyperlinktest.xml
+++ b/Test/expected-results/hyperlinktest.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test-rtf2tei.xml b/Test/expected-results/test-rtf2tei.xml
index 633694d3d..c10f1d1ae 100644
--- a/Test/expected-results/test-rtf2tei.xml
+++ b/Test/expected-results/test-rtf2tei.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test11.xml b/Test/expected-results/test11.xml
index 10b51baa2..51d443d18 100644
--- a/Test/expected-results/test11.xml
+++ b/Test/expected-results/test11.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test11a.xml b/Test/expected-results/test11a.xml
index bb2053bcd..be2e7d04e 100644
--- a/Test/expected-results/test11a.xml
+++ b/Test/expected-results/test11a.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test18.xml b/Test/expected-results/test18.xml
index da5808b81..dba50a2be 100644
--- a/Test/expected-results/test18.xml
+++ b/Test/expected-results/test18.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test19.xml b/Test/expected-results/test19.xml
index bf506cea7..2e828a3be 100644
--- a/Test/expected-results/test19.xml
+++ b/Test/expected-results/test19.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test29.xml b/Test/expected-results/test29.xml
index a56aa8560..91a25f357 100644
--- a/Test/expected-results/test29.xml
+++ b/Test/expected-results/test29.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test37.xml b/Test/expected-results/test37.xml
index bc070773e..21b786d32 100644
--- a/Test/expected-results/test37.xml
+++ b/Test/expected-results/test37.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test39.xml b/Test/expected-results/test39.xml
index 2def36d88..cba272342 100644
--- a/Test/expected-results/test39.xml
+++ b/Test/expected-results/test39.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test40.xml b/Test/expected-results/test40.xml
index 56b6162ab..b3c2e2621 100644
--- a/Test/expected-results/test40.xml
+++ b/Test/expected-results/test40.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>

From 68661373c611062fcd3fac8644ef8b8066ccc96a Mon Sep 17 00:00:00 2001
From: "Hugh A. Cayless" <philomousos@gmail.com>
Date: Thu, 16 Nov 2023 15:18:05 -0500
Subject: [PATCH 15/50] Fix weird merge issue.

---
 xlsx/xlsxtotei.xsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xlsx/xlsxtotei.xsl b/xlsx/xlsxtotei.xsl
index bcede0579..7f64f82de 100644
--- a/xlsx/xlsxtotei.xsl
+++ b/xlsx/xlsxtotei.xsl
@@ -101,7 +101,8 @@
     <xsl:variable name="doc"
       select="concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument']/@Target)"/>
     <xsl:variable name="office-document" select="document($doc)"/>
-    <xsl:variable name="core-properties"><xsl:if test="fn:doc-available(concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties']/@Target))"><xsl:sequence select="document(concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties']/@Target))/cp:coreProperties"></xsl:sequence></xsl:if></xsl:variable>
+    <xsl:variable name="core-properties"
+      select="document(concat($workDir,'/',/rels:Relationships/rels:Relationship[@Type='http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties']/@Target))/cp:coreProperties"/>
     <!-- Let's make sure this looks like a spreadsheet -->
     <xsl:if test="not($office-document/sml:workbook)">
       <xsl:message terminate="yes">This does not look like an Office OpenXML workbook. The root

From 48fdb3c0bdb77701466b2d6f40a173f54874140a Mon Sep 17 00:00:00 2001
From: raffazizzi <raffaeleviglianti@gmail.com>
Date: Thu, 16 Nov 2023 16:28:49 -0500
Subject: [PATCH 16/50] upped version

---
 VERSION | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 7c6760b5e..1fd592fad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1,2 @@
-7.56.0
+7.57.0a
+

From bdbef59360dbbd3285edde3000090fe525a13213 Mon Sep 17 00:00:00 2001
From: raffazizzi <raffaeleviglianti@gmail.com>
Date: Thu, 16 Nov 2023 16:53:19 -0500
Subject: [PATCH 17/50] updated expected results

---
 Test/expected-results/hyperlinktest.xml         | 2 +-
 Test/expected-results/test-indexes.xml          | 2 +-
 Test/expected-results/test-rtf2tei.xml          | 2 +-
 Test/expected-results/test11.xml                | 2 +-
 Test/expected-results/test11a.xml               | 2 +-
 Test/expected-results/test18.xml                | 2 +-
 Test/expected-results/test19.xml                | 2 +-
 Test/expected-results/test29.xml                | 2 +-
 Test/expected-results/test37.xml                | 2 +-
 Test/expected-results/test39.xml                | 2 +-
 Test/expected-results/test40.xml                | 2 +-
 Test2/expected-results/testDocxIndexes1.xml     | 2 +-
 Test2/expected-results/testDocxListsTables1.xml | 2 +-
 Test2/expected-results/testNotes2.xml           | 2 +-
 Test2/expected-results/testShelfmarkMs.xml      | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Test/expected-results/hyperlinktest.xml b/Test/expected-results/hyperlinktest.xml
index 3e430da83..332d4b844 100644
--- a/Test/expected-results/hyperlinktest.xml
+++ b/Test/expected-results/hyperlinktest.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test-indexes.xml b/Test/expected-results/test-indexes.xml
index 3f46f478f..6261ae688 100644
--- a/Test/expected-results/test-indexes.xml
+++ b/Test/expected-results/test-indexes.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test-rtf2tei.xml b/Test/expected-results/test-rtf2tei.xml
index c10f1d1ae..2a985ddad 100644
--- a/Test/expected-results/test-rtf2tei.xml
+++ b/Test/expected-results/test-rtf2tei.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test11.xml b/Test/expected-results/test11.xml
index 51d443d18..1a9ea462b 100644
--- a/Test/expected-results/test11.xml
+++ b/Test/expected-results/test11.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test11a.xml b/Test/expected-results/test11a.xml
index be2e7d04e..c1f022f6a 100644
--- a/Test/expected-results/test11a.xml
+++ b/Test/expected-results/test11a.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test18.xml b/Test/expected-results/test18.xml
index dba50a2be..6747e0a01 100644
--- a/Test/expected-results/test18.xml
+++ b/Test/expected-results/test18.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test19.xml b/Test/expected-results/test19.xml
index 2e828a3be..612383d06 100644
--- a/Test/expected-results/test19.xml
+++ b/Test/expected-results/test19.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test29.xml b/Test/expected-results/test29.xml
index 91a25f357..ad429bba2 100644
--- a/Test/expected-results/test29.xml
+++ b/Test/expected-results/test29.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test37.xml b/Test/expected-results/test37.xml
index 21b786d32..48c8ee2fe 100644
--- a/Test/expected-results/test37.xml
+++ b/Test/expected-results/test37.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test39.xml b/Test/expected-results/test39.xml
index cba272342..145cf3565 100644
--- a/Test/expected-results/test39.xml
+++ b/Test/expected-results/test39.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test40.xml b/Test/expected-results/test40.xml
index b3c2e2621..b5ccec7be 100644
--- a/Test/expected-results/test40.xml
+++ b/Test/expected-results/test40.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test2/expected-results/testDocxIndexes1.xml b/Test2/expected-results/testDocxIndexes1.xml
index bf4b69132..e450d2f10 100644
--- a/Test2/expected-results/testDocxIndexes1.xml
+++ b/Test2/expected-results/testDocxIndexes1.xml
@@ -19,7 +19,7 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/Test2/expected-results/testDocxListsTables1.xml b/Test2/expected-results/testDocxListsTables1.xml
index 4faea9048..c13431c07 100644
--- a/Test2/expected-results/testDocxListsTables1.xml
+++ b/Test2/expected-results/testDocxListsTables1.xml
@@ -19,7 +19,7 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/Test2/expected-results/testNotes2.xml b/Test2/expected-results/testNotes2.xml
index c5f5db0a3..0b4aca3cb 100644
--- a/Test2/expected-results/testNotes2.xml
+++ b/Test2/expected-results/testNotes2.xml
@@ -19,7 +19,7 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/Test2/expected-results/testShelfmarkMs.xml b/Test2/expected-results/testShelfmarkMs.xml
index 6a37e303c..1acd54972 100644
--- a/Test2/expected-results/testShelfmarkMs.xml
+++ b/Test2/expected-results/testShelfmarkMs.xml
@@ -19,7 +19,7 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.56.0">
+            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>

From f9b07d378922975886a01719ec15319b999f3517 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Mon, 20 Nov 2023 15:31:39 -0500
Subject: [PATCH 18/50] =?UTF-8?q?All=20XSLT=202.0=20=E2=87=92=203.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Documentation/param.xsl                       |   2 +-
 Documentation/paramform.xsl                   |   4 +-
 Documentation/xsltdoc.xsl                     |   2 +-
 Test/checklinks.xsl                           |   2 +-
 Test/formatexamples.xsl                       |   2 +-
 Test/poem.xsl                                 |   2 +-
 Test2/cleanForDiff.xsl                        |   2 +-
 bibtex/convertbib.xsl                         |   2 +-
 bibtex/teitobib.xsl                           |   2 +-
 cocoa/cocoa-to-tei.xsl                        |   2 +-
 common/common.xsl                             |   2 +-
 common/common_core.xsl                        |   2 +-
 common/common_figures.xsl                     |   2 +-
 common/common_gaiji.xsl                       |   2 +-
 common/common_header.xsl                      |   2 +-
 common/common_linking.xsl                     |   2 +-
 common/common_makeTEIStructure.xsl            |   2 +-
 common/common_msdescription.xsl               |   2 +-
 common/common_param.xsl                       |   2 +-
 common/common_tagdocs.xsl                     |   2 +-
 common/common_textcrit.xsl                    |   2 +-
 common/common_textstructure.xsl               |   2 +-
 common/functions.xsl                          |   2 +-
 common/i18n.xsl                               |   2 +-
 common/identity.xsl                           |   2 +-
 common/jsonlib.xsl                            |   2 +-
 common/verbatim.xsl                           |   2 +-
 docbook/docbooktotei.xsl                      |   2 +-
 docbook/teitodocbook.xsl                      |   2 +-
 docx/from/docxtotei.xsl                       |   2 +-
 .../dynamic/tests/xspec/test-toc-scenario.xsl |   2 +-
 docx/from/fields.xsl                          |   2 +-
 docx/from/functions.xsl                       |   2 +-
 docx/from/graphics.xsl                        |   2 +-
 docx/from/lists.xsl                           |   2 +-
 docx/from/marginals.xsl                       |   2 +-
 docx/from/maths.xsl                           |   2 +-
 docx/from/omml2mml.xsl                        |   2 +-
 docx/from/paragraphs.xsl                      |   2 +-
 docx/from/pass0.xsl                           |   2 +-
 docx/from/pass2.xsl                           |   2 +-
 docx/from/tables.xsl                          |   2 +-
 docx/from/textruns.xsl                        |   2 +-
 docx/from/toc.xsl                             |   2 +-
 docx/from/wordsections.xsl                    |   2 +-
 docx/misc/check-docx-and-annotate.xsl         |   2 +-
 docx/misc/checkword.xsl                       |   2 +-
 docx/to/application.xsl                       |   2 +-
 docx/to/comments.xsl                          |   2 +-
 docx/to/content-types.xsl                     |   2 +-
 docx/to/drama.xsl                             |   2 +-
 docx/to/dynamic.xsl                           |   2 +-
 docx/to/endnotes.xsl                          |   2 +-
 docx/to/footers.xsl                           |   2 +-
 docx/to/footnotes.xsl                         |   2 +-
 docx/to/functions.xsl                         |   2 +-
 docx/to/graphics.xsl                          |   2 +-
 docx/to/headers.xsl                           |   2 +-
 docx/to/lists.xsl                             |   2 +-
 docx/to/maths.xsl                             |   2 +-
 docx/to/mml2omml.xsl                          |   2 +-
 docx/to/numbering-definition.xsl              |   2 +-
 docx/to/placeholders.xsl                      |   2 +-
 docx/to/relationships.xsl                     |   2 +-
 docx/to/settings.xsl                          |   2 +-
 docx/to/tagdocs.xsl                           |   2 +-
 docx/to/tei-docx-verbatim.xsl                 |   2 +-
 docx/to/teitodocx.xsl                         |   2 +-
 docx/to/wordsections.xsl                      |   2 +-
 docx/tools/fixdocprop.xsl                     |   2 +-
 docx/tools/fixdotrels.xsl                     |   2 +-
 docx/tools/fixgraphics.xsl                    |   2 +-
 docx/tools/fixstyle.xsl                       |   2 +-
 docx/tools/listgraphics.xsl                   |   2 +-
 docx/variables.xsl                            |   2 +-
 epub/epub-common.xsl                          |   2 +-
 epub/epub-preflight.xsl                       |   2 +-
 epub/tei-to-epub.xsl                          |   2 +-
 epub3/tei-to-epub3.xsl                        |   2 +-
 fo/fo.xsl                                     |   2 +-
 fo/fo_core.xsl                                |   2 +-
 fo/fo_corpus.xsl                              |   2 +-
 fo/fo_drama.xsl                               |   2 +-
 fo/fo_figures.xsl                             |   2 +-
 fo/fo_header.xsl                              |   2 +-
 fo/fo_linking.xsl                             |   2 +-
 fo/fo_namesdates.xsl                          |   2 +-
 fo/fo_param.xsl                               |   2 +-
 fo/fo_tagdocs.xsl                             |   2 +-
 fo/fo_textcrit.xsl                            |   2 +-
 fo/fo_textstructure.xsl                       |   2 +-
 fo/fo_transcr.xsl                             |   2 +-
 fo/fo_verse.xsl                               |   2 +-
 html/html.xsl                                 |   2 +-
 html/html2tei.xsl                             |   2 +-
 html/html_core.xsl                            |   2 +-
 html/html_corpus.xsl                          |   2 +-
 html/html_dictionaries.xsl                    |   2 +-
 html/html_drama.xsl                           |   2 +-
 html/html_figures.xsl                         |   2 +-
 html/html_header.xsl                          |   2 +-
 html/html_linking.xsl                         |   2 +-
 html/html_namesdates.xsl                      |   2 +-
 html/html_nets.xsl                            |   2 +-
 html/html_oddprocessing.xsl                   |   2 +-
 html/html_param.xsl                           |   2 +-
 html/html_tagdocs.xsl                         |   2 +-
 html/html_textcrit.xsl                        |   2 +-
 html/html_textstructure.xsl                   |   2 +-
 html/html_textstructure_id.xsl                |   2 +-
 html/html_transcr.xsl                         |   2 +-
 html/html_verse.xsl                           |   2 +-
 html/microdata.xsl                            |   2 +-
 html/post-process-ids.xsl                     |   2 +-
 icml/tei2icml.xsl                             |   2 +-
 json/jsonlib.xsl                              |   2 +-
 json/makejson.xsl                             |   2 +-
 json/teitojson.xsl                            |   2 +-
 latex/latex.xsl                               |   2 +-
 latex/latex_core.xsl                          |   2 +-
 latex/latex_corpus.xsl                        |   2 +-
 latex/latex_drama.xsl                         |   2 +-
 latex/latex_figures.xsl                       |   2 +-
 latex/latex_header.xsl                        |   2 +-
 latex/latex_linking.xsl                       |   2 +-
 latex/latex_namesdates.xsl                    |   2 +-
 latex/latex_nets.xsl                          |   2 +-
 latex/latex_param.xsl                         |   2 +-
 latex/latex_tagdocs.xsl                       |   2 +-
 latex/latex_textcrit.xsl                      |   2 +-
 latex/latex_textstructure.xsl                 |   2 +-
 latex/latex_transcr.xsl                       |   2 +-
 latex/latex_verse.xsl                         |   2 +-
 markdown/markdown-to-tei.xsl                  |   2 +-
 markdown/tei-to-markdown.xsl                  |   2 +-
 mediawiki/mediawiki-to-tei.xsl                |   2 +-
 nlm/nlm_3_to_nlm_2.3.xsl                      |   2 +-
 nlm/tei_to_nlm.xsl                            |   2 +-
 odds/RngToRnc.xsl                             |   2 +-
 odds/classatts.xsl                            |   2 +-
 odds/extract-isosch.xsl                       |   2 +-
 odds/extract-sch.xsl                          |   2 +-
 odds/extract-schemaSpec-ident.xsl             |   2 +-
 odds/guidelines.xsl                           |   2 +-
 odds/odd2dtd.xsl                              |   2 +-
 odds/odd2html.xsl                             |   2 +-
 odds/odd2lite.xsl                             |   2 +-
 odds/odd2odd.xsl                              |   2 +-
 odds/odd2relax.xsl                            |   2 +-
 odds/odd2xslstripspace.xsl                    |   2 +-
 odds/table2list.xsl                           |   2 +-
 odds/teiodds.xsl                              |   2 +-
 odds/translate-odd.xsl                        |   2 +-
 odt/expandxsl.xsl                             |   2 +-
 odt/fixgraphics.xsl                           |   2 +-
 odt/grouping.xsl                              |   2 +-
 odt/listgraphics.xsl                          |   2 +-
 odt/odttotei.xsl                              |   2 +-
 odt/teitoodt.xsl                              |   2 +-
 profiles/acm/latex/to.xsl                     |   2 +-
 profiles/acm/pdf/to.xsl                       |   2 +-
 profiles/adams/docx/from.xsl                  |   2 +-
 profiles/agora/docx/default-functions.xsl     |   2 +-
 profiles/agora/docx/from-orig.xsl             |   2 +-
 profiles/agora/docx/from-post.xsl             |   2 +-
 profiles/agora/docx/from.xsl                  |   2 +-
 profiles/agora/docx/old-to.xsl                |   2 +-
 profiles/agora/docx/to.xsl                    |   2 +-
 profiles/agora/html/from.xsl                  |   2 +-
 profiles/agora/html/to.xsl                    |   2 +-
 profiles/agora/html5/to.xsl                   | 168 +++++++++++++++++-
 profiles/agora/latex/to.xsl                   |   2 +-
 profiles/default/bibtex/to.xsl                |   2 +-
 profiles/default/cocoa/from.xsl               |   2 +-
 profiles/default/csv/from.xsl                 |   2 +-
 profiles/default/csv/to.xsl                   |   2 +-
 profiles/default/docbook/from.xsl             |   2 +-
 profiles/default/docbook/to.xsl               |   2 +-
 profiles/default/docx/from.xsl                |   2 +-
 profiles/default/docx/to.xsl                  |   2 +-
 profiles/default/dtd/to.xsl                   |   2 +-
 profiles/default/epub/to.xsl                  |   2 +-
 profiles/default/epub3/to.xsl                 |   2 +-
 profiles/default/fo/to.xsl                    |   2 +-
 profiles/default/html/from.xsl                |   2 +-
 profiles/default/html/oddhtml.xsl             |   2 +-
 profiles/default/html/to.xsl                  |   2 +-
 profiles/default/html5/to.xsl                 |   2 +-
 profiles/default/ibooks/to.xsl                |   2 +-
 profiles/default/json/to.xsl                  |   2 +-
 profiles/default/latex/to.xsl                 |   2 +-
 profiles/default/lite/to.xsl                  |   2 +-
 profiles/default/markdown/from.xsl            |   2 +-
 profiles/default/markdown/to.xsl              |   2 +-
 profiles/default/nlm/to.xsl                   |   2 +-
 profiles/default/odd/to.xsl                   |   2 +-
 profiles/default/oddhtml/to.xsl               |   2 +-
 profiles/default/oddjson/to.xsl               |   2 +-
 profiles/default/odt/from.xsl                 |   2 +-
 profiles/default/odt/to.xsl                   |   2 +-
 profiles/default/p4/from.xsl                  |   2 +-
 profiles/default/pdf/to.xsl                   |   2 +-
 profiles/default/rdf/to.xsl                   |   2 +-
 profiles/default/rng/to.xsl                   |   2 +-
 profiles/default/schematron/to.xsl            |   2 +-
 profiles/default/simple/to.xsl                |   2 +-
 profiles/default/slides/to.xsl                |   2 +-
 profiles/default/tcp/from.xsl                 |   2 +-
 profiles/default/tei-fo.xsl                   |   2 +-
 profiles/default/txt/to.xsl                   |   2 +-
 profiles/default/verbatimxml/to.xsl           |   2 +-
 profiles/default/wordpress/from.xsl           |   2 +-
 profiles/default/xlsx/from.xsl                |   2 +-
 profiles/default/xml/to.xsl                   |   2 +-
 profiles/dhconvalidator/docx/from.xsl         |   2 +-
 profiles/dhconvalidator/html/to.xsl           |   2 +-
 profiles/dhconvalidator/odt/from.xsl          |   2 +-
 profiles/dhoxss/html/to.xsl                   |   2 +-
 profiles/dhoxss/slides/to.xsl                 |   2 +-
 profiles/enrich/docx/from.xsl                 |   2 +-
 profiles/enrich/docx/to.xsl                   |   2 +-
 profiles/enrich/fo/to.xsl                     |   2 +-
 profiles/enrich/html/to.xsl                   |   2 +-
 profiles/enrich/latex/to.xsl                  |   2 +-
 profiles/iso/check-docx.xsl                   |   2 +-
 profiles/iso/docx/addisometa.xsl              |   2 +-
 profiles/iso/docx/fixdotrels.xsl              |   2 +-
 profiles/iso/docx/fixstyle.xsl                |   2 +-
 profiles/iso/docx/from-pass2.xsl              |   2 +-
 profiles/iso/docx/from-pass3.xsl              |   2 +-
 profiles/iso/docx/from.xsl                    |   2 +-
 profiles/iso/docx/iso-functions.xsl           |   2 +-
 profiles/iso/docx/iso-variables.xsl           |   2 +-
 profiles/iso/docx/makecoverpages.xsl          |   2 +-
 profiles/iso/docx/makecoverpages2.xsl         |   2 +-
 profiles/iso/docx/metadatamerge.xsl           |   2 +-
 profiles/iso/docx/tbx.xsl                     |   2 +-
 profiles/iso/docx/to.xsl                      |   2 +-
 profiles/iso/epub/to.xsl                      |   2 +-
 profiles/iso/fo/to.xsl                        |   2 +-
 profiles/iso/html/cals.xsl                    |   2 +-
 profiles/iso/html/tbx.xsl                     |   2 +-
 profiles/iso/html/to.xsl                      |   2 +-
 profiles/iso/html/web.xsl                     |   2 +-
 profiles/iso/iso2changes.xsl                  |   2 +-
 profiles/iso/iso2meta.xsl                     |   2 +-
 profiles/iso/iso2rss.xsl                      |   2 +-
 profiles/iso/iso2terms.xsl                    |   2 +-
 profiles/iso/iso2toc.xsl                      |   2 +-
 profiles/iso/isotei-schema.xsl                |   2 +-
 profiles/iso/isoutils.xsl                     |   2 +-
 profiles/iso/latex/to.xsl                     |   2 +-
 profiles/iso/removechanges.xsl                |   2 +-
 profiles/iso/schema/isotei-lite.xsl           |   2 +-
 profiles/iso/schema/isotei-odd.xsl            |   2 +-
 profiles/iso/schema/isotei.xsl                |   2 +-
 profiles/iso/schema/test.xsl                  |   2 +-
 profiles/iso/schema/test2.xsl                 |   2 +-
 profiles/iso/schema/test3.xsl                 |   2 +-
 profiles/iso/tbx/to.xsl                       |   2 +-
 profiles/iso/validate.xsl                     |   2 +-
 profiles/jsi/docx/from.xsl                    |   2 +-
 profiles/jsi/html/to.xsl                      |   2 +-
 profiles/jtei/i18n.xsl                        |   2 +-
 profiles/jtei/jtei.common.xsl                 |   2 +-
 profiles/jtei/odt/odt.common.xsl              |   2 +-
 profiles/jtei/odt/to.xsl                      |   2 +-
 profiles/jtei/openedition/to.xsl              |   2 +-
 profiles/jtei/pdf/to.xsl                      |   2 +-
 profiles/oepack/epub/to.xsl                   |   2 +-
 profiles/oepack/html/from.xsl                 |   2 +-
 profiles/oepack/html/to.xsl                   |   2 +-
 profiles/ota/docx/to.xsl                      |   2 +-
 profiles/ota/epub/to.xsl                      |   2 +-
 profiles/ota/epub3/to.xsl                     |   2 +-
 profiles/ota/html/from.xsl                    |   2 +-
 profiles/ota/html/to.xsl                      |   2 +-
 profiles/ota/tcp/from.xsl                     |   2 +-
 profiles/otapages/epub/to.xsl                 |   2 +-
 profiles/otapages/epub3/to.xsl                |   2 +-
 profiles/oucscourses/docx/from.xsl            |   2 +-
 profiles/oucscourses/docx/to.xsl              |   2 +-
 profiles/oulipo/docx/from.xsl                 |   2 +-
 profiles/oulipo/docx/to.xsl                   |   2 +-
 profiles/oulipo/from_common.xsl               |   2 +-
 profiles/oulipo/html/to.xsl                   |   2 +-
 profiles/oulipo/latex/to.xsl                  |   2 +-
 profiles/oulipo/odt/from.xsl                  |   2 +-
 profiles/oulipo/pdf/to.xsl                    |   2 +-
 profiles/oulipo/slides/to.xsl                 |   2 +-
 profiles/oxford/docx/from.xsl                 |   2 +-
 profiles/oxford/docx/to.xsl                   |   2 +-
 profiles/oxford/epub/to.xsl                   |   2 +-
 profiles/oxford/html/to.xsl                   |   2 +-
 profiles/oxford/latex/to.xsl                  |   2 +-
 profiles/oxford/p4/from.xsl                   |   2 +-
 profiles/oxford/pdf/to.xsl                    |   2 +-
 profiles/oxford/slides/to.xsl                 |   2 +-
 profiles/readme/html/to.xsl                   |   2 +-
 profiles/readme/txt/to.xsl                    |   2 +-
 profiles/saxonce/html/to.xsl                  |   2 +-
 profiles/sciencejournal/docx/from.xsl         |   2 +-
 profiles/sciencejournal/docx/to.xsl           |   2 +-
 profiles/sciencejournal/epub/to.xsl           |   2 +-
 profiles/sciencejournal/html/to.xsl           |   2 +-
 profiles/sciencejournal/latex/to.xsl          |   2 +-
 profiles/simple/docx/from.xsl                 |   2 +-
 profiles/tcp/epub/to.xsl                      |   2 +-
 profiles/tcp/html/to.xsl                      |   2 +-
 profiles/tcp/html5/to.xsl                     | 154 +++++++++++++++-
 profiles/tei/docx/from.xsl                    |   2 +-
 profiles/tei/docx/to.xsl                      |   2 +-
 profiles/tei/dtd/to.xsl                       |   2 +-
 profiles/tei/epub/to.xsl                      |   2 +-
 profiles/tei/epub3/to.xsl                     |   2 +-
 profiles/tei/fo/to.xsl                        |   2 +-
 profiles/tei/html/to.xsl                      |   2 +-
 profiles/tei/html5/to.xsl                     | 100 ++++++++++-
 profiles/tei/latex/to.xsl                     |   2 +-
 profiles/tei/odt/from.xsl                     |   2 +-
 profiles/tei/odt/to.xsl                       |   2 +-
 profiles/tei/rdf/to.xsl                       |   2 +-
 profiles/tei/rng/to.xsl                       |   2 +-
 profiles/tei/slides/to.xsl                    |   2 +-
 profiles/teikindle/epub/to.xsl                |   2 +-
 profiles/transcription/docx/from.xsl          |   2 +-
 profiles/transcription/docx/to.xsl            |   2 +-
 rdf/crm.xsl                                   |   2 +-
 rdf/dc.xsl                                    |   2 +-
 rdf/make-acdc.xsl                             |   4 +-
 rdf/tei2rdf.xsl                               |   2 +-
 simple/mapatts.xsl                            |   2 +-
 simple/teitosimple.xsl                        |   2 +-
 slides/slides.xsl                             |   2 +-
 slides/teihtml-slides.xsl                     |   2 +-
 slides/teilatex-slides.xsl                    |   2 +-
 tbx/teitotbx.xsl                              |   2 +-
 tcp/tcp2tei.xsl                               |   2 +-
 tite/tite-to-tei.xsl                          |   2 +-
 tools/getfiles.xsl                            |   2 +-
 tools/getnames.xsl                            |   2 +-
 tools/iden.xsl                                |   2 +-
 tools/makegraphicsanttask.xsl                 |   2 +-
 tools/odd-to-csv.xsl                          |   2 +-
 tools/odd-to-tree.xsl                         |   2 +-
 tools/odd2nuodd.xsl                           |   2 +-
 tools/oddbyexample.xsl                        |   2 +-
 tools/processpb.xsl                           |   2 +-
 tools/tei-to-tree.xsl                         |   2 +-
 tools/timing-profile.xsl                      |   2 +-
 txt/tei-to-text.xsl                           |   2 +-
 verbatimxml/teitoverbatim.xsl                 |   2 +-
 wordpress/wordpress-to-tei.xsl                |   2 +-
 xlsx/xlsxtotei.xsl                            |   2 +-
 xsd/postprocess.xsl                           |   2 +-
 355 files changed, 773 insertions(+), 357 deletions(-)
 mode change 120000 => 100644 profiles/agora/html5/to.xsl
 mode change 120000 => 100644 profiles/tcp/html5/to.xsl
 mode change 120000 => 100644 profiles/tei/html5/to.xsl

diff --git a/Documentation/param.xsl b/Documentation/param.xsl
index 3fb02df1f..9d1968475 100644
--- a/Documentation/param.xsl
+++ b/Documentation/param.xsl
@@ -9,7 +9,7 @@
     exclude-result-prefixes="XSL xd xsi sch tei m" 
     xmlns="http://www.tei-c.org/ns/1.0"
     xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
-    version="2.0">
+    version="3.0">
 
 <doc scope="stylesheet" xmlns="http://www.oxygenxml.com/ns/doc/xsl">
     <desc>
diff --git a/Documentation/paramform.xsl b/Documentation/paramform.xsl
index 40c09be3e..e5a158e01 100644
--- a/Documentation/paramform.xsl
+++ b/Documentation/paramform.xsl
@@ -5,7 +5,7 @@
     exclude-result-prefixes="XSL xd" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     xmlns:XSL="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0">
+    version="3.0">
 
 <xsl:import href="../html/html.xsl"/>
 
@@ -98,7 +98,7 @@ print &lt;&lt;END;
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei xsl"
-    version="2.0">
+    version="3.0">
 &lt;!-- XSLT stylesheet to generate HTML version of TEI document.
 Written by the TEI XSL generator (Sebastian Rahtz, sebastian.rahtz\@it.ox.ac.uk)
 Created on $today-->
diff --git a/Documentation/xsltdoc.xsl b/Documentation/xsltdoc.xsl
index fa9e32523..273cfd746 100644
--- a/Documentation/xsltdoc.xsl
+++ b/Documentation/xsltdoc.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xdt="http://www.pnp-software.com/XSLTdocTemplate" xmlns:util="http://www.pnp-software.com/util" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xd="http://www.pnp-software.com/XSLTdoc" exclude-result-prefixes="xdt util xd" version="2.0">
+<xsl:stylesheet xmlns:xdt="http://www.pnp-software.com/XSLTdocTemplate" xmlns:util="http://www.pnp-software.com/util" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xd="http://www.pnp-software.com/XSLTdoc" exclude-result-prefixes="xdt util xd" version="3.0">
   <xsl:import href="../xsltdoc/xsl/core.xsl"/>
   <xsl:include href="../xsltdoc/xsl/properties/author.xsl"/>
   <xsl:include href="../xsltdoc/xsl/properties/cvsId.xsl"/>
diff --git a/Test/checklinks.xsl b/Test/checklinks.xsl
index a1173c430..0b858e6f1 100644
--- a/Test/checklinks.xsl
+++ b/Test/checklinks.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns="http://www.tei-c.org/ns/1.0"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:html="http://www.w3.org/1999/xhtml"
-		version="2.0">
+		version="3.0">
   <xsl:output method="xml" omit-xml-declaration="yes"/>
   <xsl:key name="IDS" use="@id" match="*"/>
   <xsl:template match="/">
diff --git a/Test/formatexamples.xsl b/Test/formatexamples.xsl
index 888f8fcec..b49029168 100644
--- a/Test/formatexamples.xsl
+++ b/Test/formatexamples.xsl
@@ -5,7 +5,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
   <!-- import base conversion style -->
 
   <xsl:import href="/usr/share/xml/tei/stylesheet/common/verbatim.xsl"/>
diff --git a/Test/poem.xsl b/Test/poem.xsl
index 8383d7fac..c5d651bea 100644
--- a/Test/poem.xsl
+++ b/Test/poem.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xpath-default-namespace="http://www.tei-c.org/ns/1.0"
 		xmlns="http://www.tei-c.org/ns/1.0"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="2.0">
+		version="3.0">
 <!--
 This software is dual-licensed:
 
diff --git a/Test2/cleanForDiff.xsl b/Test2/cleanForDiff.xsl
index 525545fc2..a23772d67 100644
--- a/Test2/cleanForDiff.xsl
+++ b/Test2/cleanForDiff.xsl
@@ -10,7 +10,7 @@
     xmlns:dcterms="http://purl.org/dc/terms/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
     <xd:doc scope="stylesheet">
         <xd:desc>
             <xd:p><xd:b>Created on:</xd:b> Jan 2, 2017</xd:p>
diff --git a/bibtex/convertbib.xsl b/bibtex/convertbib.xsl
index 5b7101b2b..cd6ae8d52 100644
--- a/bibtex/convertbib.xsl
+++ b/bibtex/convertbib.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xpath-default-namespace="http://www.tei-c.org/ns/1.0"
-                version="2.0">
+                version="3.0">
   <xsl:output method="text"/>
 
 
diff --git a/bibtex/teitobib.xsl b/bibtex/teitobib.xsl
index 012920d78..b0f6b8d44 100644
--- a/bibtex/teitobib.xsl
+++ b/bibtex/teitobib.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xpath-default-namespace="http://www.tei-c.org/ns/1.0"
-                version="2.0">
+                version="3.0">
   <xsl:import href="convertbib.xsl"/>
   <xsl:output method="text"/>
   <xsl:strip-space elements="*"/>
diff --git a/cocoa/cocoa-to-tei.xsl b/cocoa/cocoa-to-tei.xsl
index 2ec211378..c65302596 100644
--- a/cocoa/cocoa-to-tei.xsl
+++ b/cocoa/cocoa-to-tei.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xpath-default-namespace="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" exclude-result-prefixes="xs">
+<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xpath-default-namespace="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" exclude-result-prefixes="xs">
   <xsl:output indent="yes" omit-xml-declaration="yes"/>
   <xsl:strip-space elements="body"/>
   <!-- This script is used to convert COCOA to TEI in three passes:
diff --git a/common/common.xsl b/common/common.xsl
index 7a18b5811..2594e974b 100644
--- a/common/common.xsl
+++ b/common/common.xsl
@@ -6,7 +6,7 @@
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei fotex xsi sch fo"
-                version="2.0">
+                version="3.0">
   <xsl:import href="common_param.xsl"/>
   <xsl:import href="common_core.xsl"/>
   <xsl:import href="common_textstructure.xsl"/>
diff --git a/common/common_core.xsl b/common/common_core.xsl
index 97a201229..fa901fc2b 100644
--- a/common/common_core.xsl
+++ b/common/common_core.xsl
@@ -3,7 +3,7 @@
 		xmlns:tite="http://www.tei-c.org/ns/tite/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei tite"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/common/common_figures.xsl b/common/common_figures.xsl
index 0fa7721f8..92598a7b1 100644
--- a/common/common_figures.xsl
+++ b/common/common_figures.xsl
@@ -4,7 +4,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the figures module. </p>
diff --git a/common/common_gaiji.xsl b/common/common_gaiji.xsl
index 69ca310da..9cb3c3e99 100644
--- a/common/common_gaiji.xsl
+++ b/common/common_gaiji.xsl
@@ -3,7 +3,7 @@
 		xmlns:tite="http://www.tei-c.org/ns/tite/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei tite"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/common/common_header.xsl b/common/common_header.xsl
index c14a6c278..903f47926 100644
--- a/common/common_header.xsl
+++ b/common/common_header.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/common/common_linking.xsl b/common/common_linking.xsl
index 5e3c200a6..1cdd2f58f 100644
--- a/common/common_linking.xsl
+++ b/common/common_linking.xsl
@@ -3,7 +3,7 @@
 		xmlns:xs="http://www.w3.org/2001/XMLSchema"                
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei xs"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the linking module. </p>
diff --git a/common/common_makeTEIStructure.xsl b/common/common_makeTEIStructure.xsl
index c50a152a6..862a7d187 100644
--- a/common/common_makeTEIStructure.xsl
+++ b/common/common_makeTEIStructure.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="a rng tei teix xs" version="2.0">
+<xsl:stylesheet xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="a rng tei teix xs" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet dealing with converting other vocabularies to TEI </p>
diff --git a/common/common_msdescription.xsl b/common/common_msdescription.xsl
index 939915d02..d79bbd2c9 100644
--- a/common/common_msdescription.xsl
+++ b/common/common_msdescription.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="tei" version="2.0">
+<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="tei" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet dealing with elements from the msdescription module. </p>
diff --git a/common/common_param.xsl b/common/common_param.xsl
index 86e705fb3..1578a1b30 100644
--- a/common/common_param.xsl
+++ b/common/common_param.xsl
@@ -7,7 +7,7 @@
 		xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		    exclude-result-prefixes="#all"
- version="2.0">
+ version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p>TEI stylesheet customization module, common for all output
diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl
index fe71fa67d..a86e69744 100644
--- a/common/common_tagdocs.xsl
+++ b/common/common_tagdocs.xsl
@@ -8,7 +8,7 @@
   xmlns:sch="http://purl.oclc.org/dsdl/schematron"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="fo a tei html rng teix xs sch" version="2.0">
+  exclude-result-prefixes="fo a tei html rng teix xs sch" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet"
     type="stylesheet">
     <desc>
diff --git a/common/common_textcrit.xsl b/common/common_textcrit.xsl
index 8cf2dcb7b..33bd24eba 100644
--- a/common/common_textcrit.xsl
+++ b/common/common_textcrit.xsl
@@ -6,7 +6,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/common/common_textstructure.xsl b/common/common_textstructure.xsl
index f8262dc0e..d7e0d88a6 100644
--- a/common/common_textstructure.xsl
+++ b/common/common_textstructure.xsl
@@ -3,7 +3,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the textstructure
diff --git a/common/functions.xsl b/common/functions.xsl
index 6f5d3e4ae..d23c982db 100644
--- a/common/functions.xsl
+++ b/common/functions.xsl
@@ -21,7 +21,7 @@
     xmlns:mml="http://www.w3.org/1998/Math/MathML"
     xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
     xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
-    xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" version="2.0"
+    xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" version="3.0"
     exclude-result-prefixes="#all"
     >
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/common/i18n.xsl b/common/i18n.xsl
index 55aeefa85..5e24e7f72 100644
--- a/common/i18n.xsl
+++ b/common/i18n.xsl
@@ -12,7 +12,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet definitions common for all of HTML, FO and LaTeX
diff --git a/common/identity.xsl b/common/identity.xsl
index d8de7257e..71ac6c5a9 100644
--- a/common/identity.xsl
+++ b/common/identity.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/common/jsonlib.xsl b/common/jsonlib.xsl
index 5de44bd75..a9b806686 100644
--- a/common/jsonlib.xsl
+++ b/common/jsonlib.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xpath-default-namespace="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="tei xs" version="2.0">
+<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xpath-default-namespace="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="tei xs" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI Utility stylesheet defining functions for use in
diff --git a/common/verbatim.xsl b/common/verbatim.xsl
index 50f1d8ac8..e6ac54043 100644
--- a/common/verbatim.xsl
+++ b/common/verbatim.xsl
@@ -17,7 +17,7 @@
     xmlns:xhtml="http://www.w3.org/1999/xhtml"
     xmlns:dbk="http://docbook.org/ns/docbook"
     exclude-result-prefixes="a fo html i rng sch tei teix xi xs xsl m atom xlink xhtml dbk"
-    version="2.0">
+    version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/docbook/docbooktotei.xsl b/docbook/docbooktotei.xsl
index 04044b892..7d4648861 100644
--- a/docbook/docbooktotei.xsl
+++ b/docbook/docbooktotei.xsl
@@ -3,7 +3,7 @@
     xpath-default-namespace="http://docbook.org/ns/docbook"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     xmlns:tei="http://www.tei-c.org/ns/1.0"
-    version="2.0">
+    version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>This software is dual-licensed:
diff --git a/docbook/teitodocbook.xsl b/docbook/teitodocbook.xsl
index 03c932fe7..ca36a38ce 100644
--- a/docbook/teitodocbook.xsl
+++ b/docbook/teitodocbook.xsl
@@ -7,7 +7,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     xmlns:mml="http://www.w3.org/1998/Math/MathML"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
 <xsl:import href="../common/verbatim.xsl"/>
 <xsl:import href="../common/functions.xsl"/>
 
diff --git a/docx/from/docxtotei.xsl b/docx/from/docxtotei.xsl
index 959145f26..1d8314095 100644
--- a/docx/from/docxtotei.xsl
+++ b/docx/from/docxtotei.xsl
@@ -28,7 +28,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
 
   <xsl:import href="../../common/functions.xsl"/>
diff --git a/docx/from/dynamic/tests/xspec/test-toc-scenario.xsl b/docx/from/dynamic/tests/xspec/test-toc-scenario.xsl
index abd016f8c..dcb8d2a47 100644
--- a/docx/from/dynamic/tests/xspec/test-toc-scenario.xsl
+++ b/docx/from/dynamic/tests/xspec/test-toc-scenario.xsl
@@ -7,7 +7,7 @@
                 xmlns:x="http://www.jenitennison.com/xslt/xspec"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0">
+                version="3.0">
    <xsl:import href="file:/usr/local/bin/xspec-v0.1/generate-tests-utils.xsl"/>
    <xsl:import href="file:/Users/amittelbach/EDV%20Dienstleistungen/Kunden/OUCS/TEIISO/workspace/Stylesheets/docx/from/dynamic/toc.xsl"/>
    <xsl:namespace-alias stylesheet-prefix="o" result-prefix="xsl"/>
diff --git a/docx/from/fields.xsl b/docx/from/fields.xsl
index 4f8a11fa6..86414d0ee 100644
--- a/docx/from/fields.xsl
+++ b/docx/from/fields.xsl
@@ -27,7 +27,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
         
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/docx/from/functions.xsl b/docx/from/functions.xsl
index 71dfc6b6d..cee001981 100644
--- a/docx/from/functions.xsl
+++ b/docx/from/functions.xsl
@@ -18,7 +18,7 @@
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
     
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/docx/from/graphics.xsl b/docx/from/graphics.xsl
index addc24c7a..6cb840d7e 100644
--- a/docx/from/graphics.xsl
+++ b/docx/from/graphics.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:prop="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:rel="http://schemas.openxmlformats.org/package/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
+<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:prop="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:rel="http://schemas.openxmlformats.org/package/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet for converting Word docx files to TEI </p>
diff --git a/docx/from/lists.xsl b/docx/from/lists.xsl
index 83fbc4679..2fac7190b 100644
--- a/docx/from/lists.xsl
+++ b/docx/from/lists.xsl
@@ -27,7 +27,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
     
     
diff --git a/docx/from/marginals.xsl b/docx/from/marginals.xsl
index 770dff034..09e2c99e8 100644
--- a/docx/from/marginals.xsl
+++ b/docx/from/marginals.xsl
@@ -28,7 +28,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     
     
diff --git a/docx/from/maths.xsl b/docx/from/maths.xsl
index 31ca6963d..0b4699e80 100644
--- a/docx/from/maths.xsl
+++ b/docx/from/maths.xsl
@@ -27,7 +27,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
     
     
diff --git a/docx/from/omml2mml.xsl b/docx/from/omml2mml.xsl
index 8431b240b..93dcad310 100644
--- a/docx/from/omml2mml.xsl
+++ b/docx/from/omml2mml.xsl
@@ -4,7 +4,7 @@
 		xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
 		xmlns="http://www.w3.org/1998/Math/MathML"
 		xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
-		version="2.0"
+		version="3.0"
                 exclude-result-prefixes="m w">
 	<!-- %% Global Definitions -->
 
diff --git a/docx/from/paragraphs.xsl b/docx/from/paragraphs.xsl
index 4fa9c2e20..a49b6dc2c 100644
--- a/docx/from/paragraphs.xsl
+++ b/docx/from/paragraphs.xsl
@@ -27,7 +27,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a cp dc dcterms dcmitype fn prop iso m mml mo mv o pic r rel tbx tei teidocx v xs ve w10 w wne wp">
     
     
diff --git a/docx/from/pass0.xsl b/docx/from/pass0.xsl
index b45cc039a..be168949b 100644
--- a/docx/from/pass0.xsl
+++ b/docx/from/pass0.xsl
@@ -14,7 +14,7 @@
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml
 					 tei tbx">
 
diff --git a/docx/from/pass2.xsl b/docx/from/pass2.xsl
index a2f6f4c8f..f88cf27fd 100644
--- a/docx/from/pass2.xsl
+++ b/docx/from/pass2.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:prop="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:rel="http://schemas.openxmlformats.org/package/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="#all">
+<xsl:stylesheet xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:prop="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:mo="http://schemas.microsoft.com/office/mac/office/2008/main" xmlns:mv="urn:schemas-microsoft-com:mac:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:rel="http://schemas.openxmlformats.org/package/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="#all">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet for converting Word docx files to TEI </p>
diff --git a/docx/from/tables.xsl b/docx/from/tables.xsl
index d29214736..e99c2dfe8 100644
--- a/docx/from/tables.xsl
+++ b/docx/from/tables.xsl
@@ -28,7 +28,7 @@
                 xmlns:html="http://www.w3.org/1999/xhtml"                
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     
     
diff --git a/docx/from/textruns.xsl b/docx/from/textruns.xsl
index 5f3d51879..19e375618 100644
--- a/docx/from/textruns.xsl
+++ b/docx/from/textruns.xsl
@@ -27,7 +27,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     
     
diff --git a/docx/from/toc.xsl b/docx/from/toc.xsl
index 86137c812..b0525ad3d 100644
--- a/docx/from/toc.xsl
+++ b/docx/from/toc.xsl
@@ -27,7 +27,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
     
     
diff --git a/docx/from/wordsections.xsl b/docx/from/wordsections.xsl
index 853cb6bf5..984cd37e5 100644
--- a/docx/from/wordsections.xsl
+++ b/docx/from/wordsections.xsl
@@ -27,7 +27,7 @@
                 xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
                 
                 xmlns="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a cp dc dcterms dcmitype prop     iso m mml mo mv o pic r rel     tbx tei teidocx v xs ve w10 w wne wp">
     
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/docx/misc/check-docx-and-annotate.xsl b/docx/misc/check-docx-and-annotate.xsl
index a1afff46a..38f3e083d 100644
--- a/docx/misc/check-docx-and-annotate.xsl
+++ b/docx/misc/check-docx-and-annotate.xsl
@@ -24,7 +24,7 @@
                 xmlns:con="http://schemas.openxmlformats.org/package/2006/content-types"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp con ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn xsi dc dcterms dcmitype">
     
     <xsl:output method="xml" version="1.0" encoding="UTF-8"/>
diff --git a/docx/misc/checkword.xsl b/docx/misc/checkword.xsl
index 0438f8901..8a5849c40 100644
--- a/docx/misc/checkword.xsl
+++ b/docx/misc/checkword.xsl
@@ -13,7 +13,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx">
 
   <xsl:key name="RIDS" match="*[@r:id]" use="1"/>
diff --git a/docx/to/application.xsl b/docx/to/application.xsl
index 6e1a1f56a..f0a88549c 100644
--- a/docx/to/application.xsl
+++ b/docx/to/application.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ep ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
 
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/docx/to/comments.xsl b/docx/to/comments.xsl
index 42cd33fa0..4cf66592b 100644
--- a/docx/to/comments.xsl
+++ b/docx/to/comments.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso     tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/docx/to/content-types.xsl b/docx/to/content-types.xsl
index ed8f11c87..a5b3d00e0 100644
--- a/docx/to/content-types.xsl
+++ b/docx/to/content-types.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     
     
diff --git a/docx/to/drama.xsl b/docx/to/drama.xsl
index dbd4a811a..b6a0af8da 100644
--- a/docx/to/drama.xsl
+++ b/docx/to/drama.xsl
@@ -29,7 +29,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne
 					 mml tbx iso tei a xs
 					 pic fn xsi dc dcterms
diff --git a/docx/to/dynamic.xsl b/docx/to/dynamic.xsl
index b1d3f6987..b5cadf9be 100644
--- a/docx/to/dynamic.xsl
+++ b/docx/to/dynamic.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso     tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/endnotes.xsl b/docx/to/endnotes.xsl
index 849bbdd80..8aac5c54f 100644
--- a/docx/to/endnotes.xsl
+++ b/docx/to/endnotes.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/footers.xsl b/docx/to/footers.xsl
index d8a9a7a71..caaad9803 100644
--- a/docx/to/footers.xsl
+++ b/docx/to/footers.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/footnotes.xsl b/docx/to/footnotes.xsl
index 7032916f2..6ba28dae9 100644
--- a/docx/to/footnotes.xsl
+++ b/docx/to/footnotes.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/functions.xsl b/docx/to/functions.xsl
index eb7af272d..70c52f8bc 100644
--- a/docx/to/functions.xsl
+++ b/docx/to/functions.xsl
@@ -19,7 +19,7 @@
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
 		xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/docx/to/graphics.xsl b/docx/to/graphics.xsl
index 9877d2afe..e4777b394 100644
--- a/docx/to/graphics.xsl
+++ b/docx/to/graphics.xsl
@@ -29,7 +29,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne
 					 mml tbx iso  tei a xs
 					 pic fn xsi dc dcterms
diff --git a/docx/to/headers.xsl b/docx/to/headers.xsl
index 41359d438..ac248d981 100644
--- a/docx/to/headers.xsl
+++ b/docx/to/headers.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/lists.xsl b/docx/to/lists.xsl
index bd9559aea..2db0a0071 100644
--- a/docx/to/lists.xsl
+++ b/docx/to/lists.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
 
 
diff --git a/docx/to/maths.xsl b/docx/to/maths.xsl
index 7ce04bb80..a4c1220c1 100644
--- a/docx/to/maths.xsl
+++ b/docx/to/maths.xsl
@@ -29,7 +29,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso   rel  tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/mml2omml.xsl b/docx/to/mml2omml.xsl
index 4ca7e6926..74f10ef77 100644
--- a/docx/to/mml2omml.xsl
+++ b/docx/to/mml2omml.xsl
@@ -4,7 +4,7 @@
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns="http://schemas.openxmlformats.org/officeDocument/2006/math"
                 xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="mml m w">
   <xsl:output method="xml" encoding="UTF-8"/>
 
diff --git a/docx/to/numbering-definition.xsl b/docx/to/numbering-definition.xsl
index 9935c8fa4..518286318 100644
--- a/docx/to/numbering-definition.xsl
+++ b/docx/to/numbering-definition.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/placeholders.xsl b/docx/to/placeholders.xsl
index 315b241d2..739fcdddf 100644
--- a/docx/to/placeholders.xsl
+++ b/docx/to/placeholders.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
 
diff --git a/docx/to/relationships.xsl b/docx/to/relationships.xsl
index 4df10fedc..0b1c389ff 100644
--- a/docx/to/relationships.xsl
+++ b/docx/to/relationships.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:contypes="http://schemas.openxmlformats.org/package/2006/content-types" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
+<xsl:stylesheet xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:contypes="http://schemas.openxmlformats.org/package/2006/content-types" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
   <xsl:key name="TARGETS" use="1" match="tei:ref[@target]|tei:ptr[@target]"/>
   <xsl:key name="GRAPHICS" use="1" match="tei:graphic[@url]|tei:media[@url]"/>
   <xsl:key name="OLEOBJECTS" use="1" match="o:OLEObject"/>
diff --git a/docx/to/settings.xsl b/docx/to/settings.xsl
index 539f6df3d..38334806b 100644
--- a/docx/to/settings.xsl
+++ b/docx/to/settings.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
     
     
diff --git a/docx/to/tagdocs.xsl b/docx/to/tagdocs.xsl
index 82d0ddf29..ce9531746 100644
--- a/docx/to/tagdocs.xsl
+++ b/docx/to/tagdocs.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cp ve o r m v wp w10 w wne mml tbx iso      tei a xs pic fn xsi dc dcterms dcmitype     contypes teidocx teix html cals">
 
 
diff --git a/docx/to/tei-docx-verbatim.xsl b/docx/to/tei-docx-verbatim.xsl
index edf3b4b8d..d5ee4e680 100644
--- a/docx/to/tei-docx-verbatim.xsl
+++ b/docx/to/tei-docx-verbatim.xsl
@@ -11,7 +11,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:iso="http://www.iso.org/ns/1.0"
 		xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xlink xhtml dbk iso rng m tei teix atom">
     
     <xsl:import href="../../common/verbatim.xsl"/>
diff --git a/docx/to/teitodocx.xsl b/docx/to/teitodocx.xsl
index 41b98db3f..66f0f6982 100644
--- a/docx/to/teitodocx.xsl
+++ b/docx/to/teitodocx.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:contypes="http://schemas.openxmlformats.org/package/2006/content-types" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:its="http://www.w3.org/2005/11/its" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" exclude-result-prefixes="#all">
+<xsl:stylesheet xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:contypes="http://schemas.openxmlformats.org/package/2006/content-types" xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:its="http://www.w3.org/2005/11/its" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" exclude-result-prefixes="#all">
   <xsl:import href="placeholders.xsl"/>
   <xsl:import href="../../common/common_header.xsl"/>
   <xsl:import href="../../common/i18n.xsl"/>
diff --git a/docx/to/wordsections.xsl b/docx/to/wordsections.xsl
index d67a852de..168ac4f28 100644
--- a/docx/to/wordsections.xsl
+++ b/docx/to/wordsections.xsl
@@ -28,7 +28,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     
     
diff --git a/docx/tools/fixdocprop.xsl b/docx/tools/fixdocprop.xsl
index 828f89545..70e0c55eb 100644
--- a/docx/tools/fixdocprop.xsl
+++ b/docx/tools/fixdocprop.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:p="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties" 
     xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"    
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/docx/tools/fixdotrels.xsl b/docx/tools/fixdotrels.xsl
index 40b50e30a..b6dbb537b 100644
--- a/docx/tools/fixdotrels.xsl
+++ b/docx/tools/fixdotrels.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:r="http://schemas.openxmlformats.org/package/2006/relationships"
     exclude-result-prefixes="r">
diff --git a/docx/tools/fixgraphics.xsl b/docx/tools/fixgraphics.xsl
index f81a3bce8..6bbb81d84 100644
--- a/docx/tools/fixgraphics.xsl
+++ b/docx/tools/fixgraphics.xsl
@@ -3,7 +3,7 @@
                 xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/docx/tools/fixstyle.xsl b/docx/tools/fixstyle.xsl
index fa7864fe8..0e726f22b 100644
--- a/docx/tools/fixstyle.xsl
+++ b/docx/tools/fixstyle.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
     exclude-result-prefixes="w">
diff --git a/docx/tools/listgraphics.xsl b/docx/tools/listgraphics.xsl
index 21c25f11d..f6fb467d3 100644
--- a/docx/tools/listgraphics.xsl
+++ b/docx/tools/listgraphics.xsl
@@ -6,7 +6,7 @@
                 xmlns:v="urn:schemas-microsoft-com:vml"
 		xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../../common/functions.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/docx/variables.xsl b/docx/variables.xsl
index 99ac528ac..87404bc50 100644
--- a/docx/variables.xsl
+++ b/docx/variables.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 
-                version="2.0">
+                version="3.0">
 	
 	  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/epub/epub-common.xsl b/epub/epub-common.xsl
index afb378ba1..668f1d6f2 100644
--- a/epub/epub-common.xsl
+++ b/epub/epub-common.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/" version="2.0" exclude-result-prefixes="iso tei teix dc html ncx">
+<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/" version="3.0" exclude-result-prefixes="iso tei teix dc html ncx">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p>
diff --git a/epub/epub-preflight.xsl b/epub/epub-preflight.xsl
index 6ba8ada8a..6fc53b32a 100644
--- a/epub/epub-preflight.xsl
+++ b/epub/epub-preflight.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/" version="2.0" exclude-result-prefixes="iso tei teix dc html ncx">
+<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/" version="3.0" exclude-result-prefixes="iso tei teix dc html ncx">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p>
diff --git a/epub/tei-to-epub.xsl b/epub/tei-to-epub.xsl
index d1ca90235..e1d10e0a5 100644
--- a/epub/tei-to-epub.xsl
+++ b/epub/tei-to-epub.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:smil="http://www.w3.org/ns/SMIL" xmlns:opf="http://www.idpf.org/2007/opf" xmlns:iso="http://www.iso.org/ns/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/" version="2.0" exclude-result-prefixes="#all">
+<xsl:stylesheet xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:smil="http://www.w3.org/ns/SMIL" xmlns:opf="http://www.idpf.org/2007/opf" xmlns:iso="http://www.iso.org/ns/1.0" xmlns="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/" version="3.0" exclude-result-prefixes="#all">
   <xsl:import href="../html/html.xsl"/>
   <xsl:import href="epub-common.xsl"/>
   <xsl:import href="epub-preflight.xsl"/>
diff --git a/epub3/tei-to-epub3.xsl b/epub3/tei-to-epub3.xsl
index c4230139f..7723585f9 100644
--- a/epub3/tei-to-epub3.xsl
+++ b/epub3/tei-to-epub3.xsl
@@ -8,7 +8,7 @@
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:ncx="http://www.daisy.org/z3986/2005/ncx/"
                 xmlns:m="http://www.w3.org/1998/Math/MathML"
-		version="2.0" exclude-result-prefixes="#all"
+		version="3.0" exclude-result-prefixes="#all"
 		xpath-default-namespace="http://www.tei-c.org/ns/1.0"
 >
   <xsl:import href="../html/html.xsl"/>
diff --git a/fo/fo.xsl b/fo/fo.xsl
index 6a694a1d8..4993de984 100644
--- a/fo/fo.xsl
+++ b/fo/fo.xsl
@@ -8,7 +8,7 @@
     xmlns="http://www.w3.org/1999/XSL/Format"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei fotex m xs fo"
-    version="2.0">
+    version="3.0">
   <xsl:import href="../common/common.xsl"/>
   <xsl:import href="../common/verbatim.xsl"/>
   <xsl:import href="fo_param.xsl"/>
diff --git a/fo/fo_core.xsl b/fo/fo_core.xsl
index 34656f90f..ac4141cd6 100644
--- a/fo/fo_core.xsl
+++ b/fo/fo_core.xsl
@@ -8,7 +8,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fotex rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_corpus.xsl b/fo/fo_corpus.xsl
index 947eeeab9..5d9c80a6e 100644
--- a/fo/fo_corpus.xsl
+++ b/fo/fo_corpus.xsl
@@ -7,7 +7,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_drama.xsl b/fo/fo_drama.xsl
index a0d2a9db3..00eabaf23 100644
--- a/fo/fo_drama.xsl
+++ b/fo/fo_drama.xsl
@@ -7,7 +7,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_figures.xsl b/fo/fo_figures.xsl
index f4879aea5..465093618 100644
--- a/fo/fo_figures.xsl
+++ b/fo/fo_figures.xsl
@@ -9,7 +9,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="m a fotex rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_header.xsl b/fo/fo_header.xsl
index 3d8e2822d..6b345ff16 100644
--- a/fo/fo_header.xsl
+++ b/fo/fo_header.xsl
@@ -7,7 +7,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_linking.xsl b/fo/fo_linking.xsl
index 376f2788c..b0761c5ed 100644
--- a/fo/fo_linking.xsl
+++ b/fo/fo_linking.xsl
@@ -8,7 +8,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix xs"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_namesdates.xsl b/fo/fo_namesdates.xsl
index 448f1e4a6..8ca62107c 100644
--- a/fo/fo_namesdates.xsl
+++ b/fo/fo_namesdates.xsl
@@ -7,7 +7,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes=" a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_param.xsl b/fo/fo_param.xsl
index 2ec7db4da..bcf278914 100644
--- a/fo/fo_param.xsl
+++ b/fo/fo_param.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_tagdocs.xsl b/fo/fo_tagdocs.xsl
index ecbb05ede..480de9502 100644
--- a/fo/fo_tagdocs.xsl
+++ b/fo/fo_tagdocs.xsl
@@ -7,7 +7,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes=" a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_textcrit.xsl b/fo/fo_textcrit.xsl
index 06bc3bf79..7df645ee4 100644
--- a/fo/fo_textcrit.xsl
+++ b/fo/fo_textcrit.xsl
@@ -8,7 +8,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fotex rng tei teix"
-                version="2.0">
+                version="3.0">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/fo/fo_textstructure.xsl b/fo/fo_textstructure.xsl
index e3bdb830f..00eb350c3 100644
--- a/fo/fo_textstructure.xsl
+++ b/fo/fo_textstructure.xsl
@@ -8,7 +8,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="fotex a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_transcr.xsl b/fo/fo_transcr.xsl
index eb5dbc9e9..8e5a0d353 100644
--- a/fo/fo_transcr.xsl
+++ b/fo/fo_transcr.xsl
@@ -8,7 +8,7 @@
                 xmlns:html="http://www.w3.org/1999/xhtml"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes=" a  rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/fo/fo_verse.xsl b/fo/fo_verse.xsl
index 855d01a9b..52bed96f3 100644
--- a/fo/fo_verse.xsl
+++ b/fo/fo_verse.xsl
@@ -7,7 +7,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes=" a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/html/html.xsl b/html/html.xsl
index e365cd926..7a7c32f26 100644
--- a/html/html.xsl
+++ b/html/html.xsl
@@ -11,7 +11,7 @@
                 xmlns:m="http://www.w3.org/1998/Math/MathML"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="#all"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../common/common.xsl"/>
   <xsl:import href="../common/verbatim.xsl"/>
   <xsl:import href="html_param.xsl"/>
diff --git a/html/html2tei.xsl b/html/html2tei.xsl
index 292638dcb..bb6c80e3d 100644
--- a/html/html2tei.xsl
+++ b/html/html2tei.xsl
@@ -4,7 +4,7 @@
 		xmlns="http://www.tei-c.org/ns/1.0" 
 		xmlns:tei="http://www.tei-c.org/ns/1.0" 
 		xmlns:m="http://www.w3.org/1998/Math/MathML"
-		exclude-result-prefixes="tei xs m" version="2.0" 
+		exclude-result-prefixes="tei xs m" version="3.0" 
 		xmlns:html="http://www.w3.org/1999/xhtml"
 		xpath-default-namespace="http://www.w3.org/1999/xhtml">
   <xsl:import href="../common/common_makeTEIStructure.xsl"/>
diff --git a/html/html_core.xsl b/html/html_core.xsl
index 4642845c3..521fb0a0b 100644
--- a/html/html_core.xsl
+++ b/html/html_core.xsl
@@ -11,7 +11,7 @@
 				xmlns:teix="http://www.tei-c.org/ns/Examples"
 				xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 				xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-				exclude-result-prefixes="#all" version="2.0">
+				exclude-result-prefixes="#all" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet dealing with elements from the core module, making
diff --git a/html/html_corpus.xsl b/html/html_corpus.xsl
index 5ad06b7a0..3e08feda9 100644
--- a/html/html_corpus.xsl
+++ b/html/html_corpus.xsl
@@ -10,7 +10,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the corpus module,
diff --git a/html/html_dictionaries.xsl b/html/html_dictionaries.xsl
index 77b7d5773..518fd4386 100644
--- a/html/html_dictionaries.xsl
+++ b/html/html_dictionaries.xsl
@@ -11,7 +11,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fo rng tei teix m"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the dictionaries
diff --git a/html/html_drama.xsl b/html/html_drama.xsl
index c4f6c6275..353a79657 100644
--- a/html/html_drama.xsl
+++ b/html/html_drama.xsl
@@ -8,7 +8,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"                
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes=" a fo rng tei teix html"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the drama module,
diff --git a/html/html_figures.xsl b/html/html_figures.xsl
index 20eb6d467..f45bae8a3 100644
--- a/html/html_figures.xsl
+++ b/html/html_figures.xsl
@@ -11,7 +11,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="svg a fo html rng tei teidocx teix m"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet dealing with elements from the figures
diff --git a/html/html_header.xsl b/html/html_header.xsl
index 8dcbd233e..d9e664ddf 100644
--- a/html/html_header.xsl
+++ b/html/html_header.xsl
@@ -9,7 +9,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a fo rng tei teix">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/html/html_linking.xsl b/html/html_linking.xsl
index 995bcd314..fe2bb1c07 100644
--- a/html/html_linking.xsl
+++ b/html/html_linking.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/html/html_namesdates.xsl b/html/html_namesdates.xsl
index 3928e7f9f..8e76536eb 100644
--- a/html/html_namesdates.xsl
+++ b/html/html_namesdates.xsl
@@ -10,7 +10,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the namesdates module,
diff --git a/html/html_nets.xsl b/html/html_nets.xsl
index 6667fb2c7..0d2043608 100644
--- a/html/html_nets.xsl
+++ b/html/html_nets.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:html="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="#all" version="2.0">
+<xsl:stylesheet xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:html="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="#all" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet dealing with elements from the nets module,
diff --git a/html/html_oddprocessing.xsl b/html/html_oddprocessing.xsl
index 9771f1de7..e4e62bd5c 100644
--- a/html/html_oddprocessing.xsl
+++ b/html/html_oddprocessing.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
   exclude-result-prefixes="#default html a fo rng tei teix"
   xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/html/html_param.xsl b/html/html_param.xsl
index 492212b11..e4e1fa7a9 100644
--- a/html/html_param.xsl
+++ b/html/html_param.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html xs"
-    version="2.0">
+    version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>     <p>
     TEI stylesheet customization module for HTML output.</p>
diff --git a/html/html_tagdocs.xsl b/html/html_tagdocs.xsl
index 021960b17..2fff74dcf 100644
--- a/html/html_tagdocs.xsl
+++ b/html/html_tagdocs.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet  xmlns="http://www.w3.org/1999/xhtml" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"                 xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="html a fo rng tei teix xs" version="2.0">
+<xsl:stylesheet  xmlns="http://www.w3.org/1999/xhtml" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"                 xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="html a fo rng tei teix xs" version="3.0">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/html/html_textcrit.xsl b/html/html_textcrit.xsl
index 7dfbc33ae..04b22bcff 100644
--- a/html/html_textcrit.xsl
+++ b/html/html_textcrit.xsl
@@ -12,7 +12,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fo dbk xlink xhtml rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the textcrit
diff --git a/html/html_textstructure.xsl b/html/html_textstructure.xsl
index 9b5358547..e817a6b9b 100644
--- a/html/html_textstructure.xsl
+++ b/html/html_textstructure.xsl
@@ -7,7 +7,7 @@
    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
    xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    exclude-result-prefixes="a fo dbk xlink rng tei html
-					 teix its teidocx" version="2.0">
+					 teix its teidocx" version="3.0">
    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the textstructure module, making HTML output. </p>
diff --git a/html/html_textstructure_id.xsl b/html/html_textstructure_id.xsl
index c236d253c..bef3bbd95 100644
--- a/html/html_textstructure_id.xsl
+++ b/html/html_textstructure_id.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0"
+    version="3.0"
     xmlns="http://www.w3.org/1999/xhtml"
     xpath-default-namespace="http://www.tei-c.org/ns/1.0">
 
diff --git a/html/html_transcr.xsl b/html/html_transcr.xsl
index 5ea5c0f9b..8010860d0 100644
--- a/html/html_transcr.xsl
+++ b/html/html_transcr.xsl
@@ -10,7 +10,7 @@
                 xmlns:html="http://www.w3.org/1999/xhtml"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fo rng tei teix html"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/html/html_verse.xsl b/html/html_verse.xsl
index b8fbff731..cfd95c5cf 100644
--- a/html/html_verse.xsl
+++ b/html/html_verse.xsl
@@ -10,7 +10,7 @@
                 xmlns:html="http://www.w3.org/1999/xhtml"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/html/microdata.xsl b/html/microdata.xsl
index e842a2bf9..b49e48403 100644
--- a/html/microdata.xsl
+++ b/html/microdata.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0"
+    version="3.0"
     xpath-default-namespace="http://www.tei-c.org/ns/1.0">
 
   <xsl:template name="microdata">
diff --git a/html/post-process-ids.xsl b/html/post-process-ids.xsl
index 641aa013b..634ac56de 100644
--- a/html/post-process-ids.xsl
+++ b/html/post-process-ids.xsl
@@ -3,7 +3,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
   exclude-result-prefixes="xs xd"
-  version="2.0"
+  version="3.0"
   xmlns="http://www.w3.org/1999/xhtml"
   xpath-default-namespace="http://www.w3.org/1999/xhtml">
   <xd:doc scope="stylesheet">
diff --git a/icml/tei2icml.xsl b/icml/tei2icml.xsl
index 32eab96e9..3b931d898 100644
--- a/icml/tei2icml.xsl
+++ b/icml/tei2icml.xsl
@@ -32,7 +32,7 @@ v0.4.3 - John's minor tweaks anf bugfixes: start para, ignored para, etc. some i
 -->
 <xsl:stylesheet xpath-default-namespace="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                version="2.0">
+                version="3.0">
 
   <xsl:param name="table-width">540</xsl:param>
 
diff --git a/json/jsonlib.xsl b/json/jsonlib.xsl
index c46a0a36c..13993822e 100644
--- a/json/jsonlib.xsl
+++ b/json/jsonlib.xsl
@@ -5,7 +5,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"                
     exclude-result-prefixes="tei xs"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0"
+    version="3.0"
     >
 <xsl:strip-space elements="*"/>
 <xsl:output method="text" encoding="utf-8" />
diff --git a/json/makejson.xsl b/json/makejson.xsl
index 31852e139..444d5cc84 100644
--- a/json/makejson.xsl
+++ b/json/makejson.xsl
@@ -5,7 +5,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"                
     exclude-result-prefixes="tei xs"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0"
+    version="3.0"
     >
 <xsl:include href="jsonlib.xsl"/>
 
diff --git a/json/teitojson.xsl b/json/teitojson.xsl
index b36bfbc17..00d3fc884 100644
--- a/json/teitojson.xsl
+++ b/json/teitojson.xsl
@@ -1,7 +1,7 @@
 <xsl:stylesheet
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0"
+    version="3.0"
     >
 <!-- cf http://www.bramstein.com/projects/xsltjson/ for better
 coverage -->
diff --git a/latex/latex.xsl b/latex/latex.xsl
index 487ccee7d..3bc1e29c4 100644
--- a/latex/latex.xsl
+++ b/latex/latex.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="xs tei"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../common/common.xsl"/>
   <xsl:import href="../common/verbatim.xsl"/>
   <xsl:import href="latex_core.xsl"/>
diff --git a/latex/latex_core.xsl b/latex/latex_core.xsl
index ed35de0a1..9ef29ab75 100644
--- a/latex/latex_core.xsl
+++ b/latex/latex_core.xsl
@@ -6,7 +6,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module, making
diff --git a/latex/latex_corpus.xsl b/latex/latex_corpus.xsl
index 018f92f3e..b2c5fa2f3 100644
--- a/latex/latex_corpus.xsl
+++ b/latex/latex_corpus.xsl
@@ -6,7 +6,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the corpus module,
diff --git a/latex/latex_drama.xsl b/latex/latex_drama.xsl
index f31c24bc8..168a613db 100644
--- a/latex/latex_drama.xsl
+++ b/latex/latex_drama.xsl
@@ -6,7 +6,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the drama module,
diff --git a/latex/latex_figures.xsl b/latex/latex_figures.xsl
index 2dfc5e897..5da9642f5 100644
--- a/latex/latex_figures.xsl
+++ b/latex/latex_figures.xsl
@@ -6,7 +6,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/latex/latex_header.xsl b/latex/latex_header.xsl
index 90c441ccd..4951f5ba4 100644
--- a/latex/latex_header.xsl
+++ b/latex/latex_header.xsl
@@ -6,7 +6,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the header module,
diff --git a/latex/latex_linking.xsl b/latex/latex_linking.xsl
index c0d1384f9..865a5c7af 100644
--- a/latex/latex_linking.xsl
+++ b/latex/latex_linking.xsl
@@ -6,7 +6,7 @@
 		xmlns:xs="http://www.w3.org/2001/XMLSchema"                
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix xs"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the linking module,
diff --git a/latex/latex_namesdates.xsl b/latex/latex_namesdates.xsl
index e9f8317f7..87188332e 100644
--- a/latex/latex_namesdates.xsl
+++ b/latex/latex_namesdates.xsl
@@ -6,7 +6,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the namesdates module,
diff --git a/latex/latex_nets.xsl b/latex/latex_nets.xsl
index 3954ac240..c2c1f0108 100644
--- a/latex/latex_nets.xsl
+++ b/latex/latex_nets.xsl
@@ -6,7 +6,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/latex/latex_param.xsl b/latex/latex_param.xsl
index 42ae62975..cee69595c 100644
--- a/latex/latex_param.xsl
+++ b/latex/latex_param.xsl
@@ -6,7 +6,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
 
    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/latex/latex_tagdocs.xsl b/latex/latex_tagdocs.xsl
index 2c5d93b76..5e863beb2 100644
--- a/latex/latex_tagdocs.xsl
+++ b/latex/latex_tagdocs.xsl
@@ -6,7 +6,7 @@
                 
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the tagdocs module,
diff --git a/latex/latex_textcrit.xsl b/latex/latex_textcrit.xsl
index 675a94b25..3f9919b1c 100644
--- a/latex/latex_textcrit.xsl
+++ b/latex/latex_textcrit.xsl
@@ -6,7 +6,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/latex/latex_textstructure.xsl b/latex/latex_textstructure.xsl
index 678e04e76..0921a73c2 100644
--- a/latex/latex_textstructure.xsl
+++ b/latex/latex_textstructure.xsl
@@ -6,7 +6,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="#all"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/latex/latex_transcr.xsl b/latex/latex_transcr.xsl
index e557977aa..6e4a2a981 100644
--- a/latex/latex_transcr.xsl
+++ b/latex/latex_transcr.xsl
@@ -7,7 +7,7 @@
                 xmlns:html="http://www.w3.org/1999/xhtml"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/latex/latex_verse.xsl b/latex/latex_verse.xsl
index 225748308..192a6d725 100644
--- a/latex/latex_verse.xsl
+++ b/latex/latex_verse.xsl
@@ -6,7 +6,7 @@
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a rng tei teix"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>
diff --git a/markdown/markdown-to-tei.xsl b/markdown/markdown-to-tei.xsl
index 39abe8bc9..268e0890a 100644
--- a/markdown/markdown-to-tei.xsl
+++ b/markdown/markdown-to-tei.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/markdown/tei-to-markdown.xsl b/markdown/tei-to-markdown.xsl
index 42a39818b..900a26bfc 100644
--- a/markdown/tei-to-markdown.xsl
+++ b/markdown/tei-to-markdown.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet
-        version="2.0"
+        version="3.0"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
         xmlns:tei="http://www.tei-c.org/ns/1.0"
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/mediawiki/mediawiki-to-tei.xsl b/mediawiki/mediawiki-to-tei.xsl
index 4d44f4a25..4ce02eb4a 100644
--- a/mediawiki/mediawiki-to-tei.xsl
+++ b/mediawiki/mediawiki-to-tei.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/nlm/nlm_3_to_nlm_2.3.xsl b/nlm/nlm_3_to_nlm_2.3.xsl
index 68bd565d5..83f7637f9 100644
--- a/nlm/nlm_3_to_nlm_2.3.xsl
+++ b/nlm/nlm_3_to_nlm_2.3.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="#all">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="#all">
 
   <!--
         Written by Martin Holmes, University of Victoria Humanities Computing and 
diff --git a/nlm/tei_to_nlm.xsl b/nlm/tei_to_nlm.xsl
index 806ed46d4..ab5cc6d58 100644
--- a/nlm/tei_to_nlm.xsl
+++ b/nlm/tei_to_nlm.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<xsl:stylesheet version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+<xsl:stylesheet version="3.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exist="http://exist.sourceforge.net/NS/exist" xmlns="" xpath-default-namespace="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" exclude-result-prefixes="#all">
 
   <!--
diff --git a/odds/RngToRnc.xsl b/odds/RngToRnc.xsl
index 91d869828..06c919c87 100644
--- a/odds/RngToRnc.xsl
+++ b/odds/RngToRnc.xsl
@@ -72,7 +72,7 @@
                xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-               version="2.0"
+               version="3.0"
                exclude-result-prefixes="rng sch a">
   <xsl:param name="top"/>
 <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
diff --git a/odds/classatts.xsl b/odds/classatts.xsl
index 56611947b..d42e540f6 100644
--- a/odds/classatts.xsl
+++ b/odds/classatts.xsl
@@ -6,7 +6,7 @@
   xmlns:rng="http://relaxng.org/ns/structure/1.0"
   xpath-default-namespace="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0"
   xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" exclude-result-prefixes="#all">
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" exclude-result-prefixes="#all">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p> TEI stylesheet for processing overriding of class attributes in ODD</p>
diff --git a/odds/extract-isosch.xsl b/odds/extract-isosch.xsl
index 8e9866ac3..d54f68711 100644
--- a/odds/extract-isosch.xsl
+++ b/odds/extract-isosch.xsl
@@ -9,7 +9,7 @@
                 xmlns=     "http://purl.oclc.org/dsdl/schematron"
                 xmlns:xsl= "http://www.w3.org/1999/XSL/Transform"
                 xmlns:d=   "http://www.oxygenxml.com/ns/doc/xsl"
-                version="2.0"
+                version="3.0"
                 xpath-default-namespace="http://www.tei-c.org/ns/1.0"
                 exclude-result-prefixes="#all">
   <xsl:import href="../common/functions.xsl"/>
diff --git a/odds/extract-sch.xsl b/odds/extract-sch.xsl
index 32ed288c9..0717850e4 100644
--- a/odds/extract-sch.xsl
+++ b/odds/extract-sch.xsl
@@ -8,7 +8,7 @@
   xmlns="http://purl.oclc.org/dsdl/schematron"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="2.0"
+  version="3.0"
   exclude-result-prefixes="tei rng teix sch xi xs #default">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/odds/extract-schemaSpec-ident.xsl b/odds/extract-schemaSpec-ident.xsl
index bb7c968ac..2ac85eda0 100644
--- a/odds/extract-schemaSpec-ident.xsl
+++ b/odds/extract-schemaSpec-ident.xsl
@@ -17,7 +17,7 @@
 <!-- ********************************************************************** -->
 <xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:output encoding="utf8" method="text"/>
   <xsl:template match="/">
diff --git a/odds/guidelines.xsl b/odds/guidelines.xsl
index e32c7d00d..7557b84eb 100644
--- a/odds/guidelines.xsl
+++ b/odds/guidelines.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/odds/odd2dtd.xsl b/odds/odd2dtd.xsl
index 36ab98211..cfa35de75 100644
--- a/odds/odd2dtd.xsl
+++ b/odds/odd2dtd.xsl
@@ -8,7 +8,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a t tei fo rng xs"
-                version="2.0">
+                version="3.0">
   <xsl:import href="teiodds.xsl"/>
   <xsl:import href="classatts.xsl"/>
   <xsl:import href="../common/i18n.xsl"/>
diff --git a/odds/odd2html.xsl b/odds/odd2html.xsl
index 10c1f4b06..0b390c8ad 100644
--- a/odds/odd2html.xsl
+++ b/odds/odd2html.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dbk="http://docbook.org/ns/docbook" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" exclude-result-prefixes="xlink dbk rng tei teix xhtml sch a html xs xsl">
+<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dbk="http://docbook.org/ns/docbook" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0" exclude-result-prefixes="xlink dbk rng tei teix xhtml sch a html xs xsl">
   <xsl:import href="teiodds.xsl"/>
   <xsl:import href="classatts.xsl"/>
   <xsl:import href="../html/html.xsl"/>
diff --git a/odds/odd2lite.xsl b/odds/odd2lite.xsl
index 9a6d36d3d..2b6bc465b 100644
--- a/odds/odd2lite.xsl
+++ b/odds/odd2lite.xsl
@@ -13,7 +13,7 @@
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                 exclude-result-prefixes="fo a tei html rng sch xsi
 					 teix xs dcr"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../common/verbatim.xsl"/>
   <xsl:import href="teiodds.xsl"/> 
   <xsl:import href="classatts.xsl"/>
diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index b402db1e9..5046bdf6c 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -8,7 +8,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0" 
     xmlns:teix="http://www.tei-c.org/ns/Examples" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0" 
+    version="3.0" 
     exclude-result-prefixes="#all">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/odds/odd2relax.xsl b/odds/odd2relax.xsl
index d4cc079ea..045b81dfc 100644
--- a/odds/odd2relax.xsl
+++ b/odds/odd2relax.xsl
@@ -12,7 +12,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="a fo html i rng sch xi xs xsl"
-    version="2.0">
+    version="3.0">
   <xsl:import href="teiodds.xsl"/>
   <xsl:import href="classatts.xsl"/>
   <xsl:import href="../common/functions.xsl"/>
diff --git a/odds/odd2xslstripspace.xsl b/odds/odd2xslstripspace.xsl
index ed2f1e1e5..c6913578f 100644
--- a/odds/odd2xslstripspace.xsl
+++ b/odds/odd2xslstripspace.xsl
@@ -13,7 +13,7 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="a fo html i rng sch tei teix xi xs xsl" 
-    version="2.0">
+    version="3.0">
   <xsl:import href="teiodds.xsl"/>
   <xsl:import href="../common/i18n.xsl"/>
   <xsl:import href="../common/functions.xsl"/>
diff --git a/odds/table2list.xsl b/odds/table2list.xsl
index 5261e2a74..9c2d50bad 100644
--- a/odds/table2list.xsl
+++ b/odds/table2list.xsl
@@ -9,7 +9,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="a t tei fo rng xs"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 70cd0ba72..5b77e11e3 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -12,7 +12,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/odds/translate-odd.xsl b/odds/translate-odd.xsl
index 7733864e5..21fe45442 100644
--- a/odds/translate-odd.xsl
+++ b/odds/translate-odd.xsl
@@ -12,7 +12,7 @@ XSL stylesheet to process TEI documents using ODD markup
                 xmlns:teix="http://www.tei-c.org/ns/Examples"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
   <xsl:output method="xml" indent="yes" encoding="utf-8"/>
   <xsl:param name="verbose"/>
   <xsl:param name="lang">es</xsl:param>
diff --git a/odt/expandxsl.xsl b/odt/expandxsl.xsl
index 51ce4274f..97939ae5b 100644
--- a/odt/expandxsl.xsl
+++ b/odt/expandxsl.xsl
@@ -3,7 +3,7 @@
     xpath-default-namespace="http://www.w3.org/1999/XSL/Transform" 
     xmlns:doc="http://www.oxygenxml.com/ns/doc/xsl"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0"
+    version="3.0"
 >
 
 <!--This software is dual-licensed:
diff --git a/odt/fixgraphics.xsl b/odt/fixgraphics.xsl
index 2a92d1383..256f0aceb 100644
--- a/odt/fixgraphics.xsl
+++ b/odt/fixgraphics.xsl
@@ -3,7 +3,7 @@
                 xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/odt/grouping.xsl b/odt/grouping.xsl
index f7f7739d2..81eba50d3 100644
--- a/odt/grouping.xsl
+++ b/odt/grouping.xsl
@@ -3,7 +3,7 @@
  xmlns:xs="http://www.w3.org/2001/XMLSchema"
  xmlns:mf="http://example.com/mf"
  exclude-result-prefixes="xs mf"
- version="2.0">
+ version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/odt/listgraphics.xsl b/odt/listgraphics.xsl
index 67f6ceec3..465c488b7 100644
--- a/odt/listgraphics.xsl
+++ b/odt/listgraphics.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p> TEI stylesheet dealing with elements from the core module. </p>
diff --git a/odt/odttotei.xsl b/odt/odttotei.xsl
index 2061e86a9..f6652954a 100644
--- a/odt/odttotei.xsl
+++ b/odt/odttotei.xsl
@@ -3,7 +3,7 @@
   exclude-result-prefixes="office style text table draw fo xlink dc
 			   meta number tei svg chart dr3d math form
 			   script ooo ooow oooc dom xforms xs xsd xsi"
-  office:version="1.0" version="2.0" 
+  office:version="1.0" version="3.0" 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns="http://www.tei-c.org/ns/1.0"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/odt/teitoodt.xsl b/odt/teitoodt.xsl
index 7f649c42d..d25bb4689 100644
--- a/odt/teitoodt.xsl
+++ b/odt/teitoodt.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:estr="http://exslt.org/strings" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:dbk="http://docbook.org/ns/docbook" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" version="2.0" office:version="1.0">
+<xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:estr="http://exslt.org/strings" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:dbk="http://docbook.org/ns/docbook" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" version="3.0" office:version="1.0">
   <xsl:import href="../common/common.xsl"/>
   <xsl:import href="../common/verbatim.xsl"/>
   <xsl:param name="useFixedDate">false</xsl:param>
diff --git a/profiles/acm/latex/to.xsl b/profiles/acm/latex/to.xsl
index aba3ef6e0..eacde2f11 100644
--- a/profiles/acm/latex/to.xsl
+++ b/profiles/acm/latex/to.xsl
@@ -8,7 +8,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
   <!-- import base conversion style -->
 
   <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/acm/pdf/to.xsl b/profiles/acm/pdf/to.xsl
index bce3d3fe0..e696ca037 100644
--- a/profiles/acm/pdf/to.xsl
+++ b/profiles/acm/pdf/to.xsl
@@ -6,7 +6,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="#all"
-                version="2.0">
+                version="3.0">
 
     <xsl:import href="../latex/to.xsl"/>
 
diff --git a/profiles/adams/docx/from.xsl b/profiles/adams/docx/from.xsl
index d0dea35fc..11d639079 100644
--- a/profiles/adams/docx/from.xsl
+++ b/profiles/adams/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a         tei teidocx xs iso">
     <!-- import base conversion style -->
 
diff --git a/profiles/agora/docx/default-functions.xsl b/profiles/agora/docx/default-functions.xsl
index 07a1f4a35..ac521af6c 100644
--- a/profiles/agora/docx/default-functions.xsl
+++ b/profiles/agora/docx/default-functions.xsl
@@ -19,7 +19,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
 
     
diff --git a/profiles/agora/docx/from-orig.xsl b/profiles/agora/docx/from-orig.xsl
index 4e083c527..39c10361e 100644
--- a/profiles/agora/docx/from-orig.xsl
+++ b/profiles/agora/docx/from-orig.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0"
- xmlns:tei="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="tei">
+ xmlns:tei="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="tei">
 
  <xsl:import href="../../../docx/from/docxtotei.xsl"/>
 
diff --git a/profiles/agora/docx/from-post.xsl b/profiles/agora/docx/from-post.xsl
index 2738c0c4a..1ff369c83 100644
--- a/profiles/agora/docx/from-post.xsl
+++ b/profiles/agora/docx/from-post.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="tei">
     
 <xsl:output indent="yes"/>
diff --git a/profiles/agora/docx/from.xsl b/profiles/agora/docx/from.xsl
index 34b086f62..b6357be00 100644
--- a/profiles/agora/docx/from.xsl
+++ b/profiles/agora/docx/from.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0"
- xmlns:tei="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="tei">
+ xmlns:tei="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="tei">
 
  <xsl:import href="../../../docx/from/docxtotei.xsl"/>
 
diff --git a/profiles/agora/docx/old-to.xsl b/profiles/agora/docx/old-to.xsl
index 5e812680c..864a90310 100644
--- a/profiles/agora/docx/old-to.xsl
+++ b/profiles/agora/docx/old-to.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0"
- xmlns:tei="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="tei">
+ xmlns:tei="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="tei">
 
  <xsl:import href="../../../docx/to/docxtotei.xsl"/>
 
diff --git a/profiles/agora/docx/to.xsl b/profiles/agora/docx/to.xsl
index 5e812680c..864a90310 100644
--- a/profiles/agora/docx/to.xsl
+++ b/profiles/agora/docx/to.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0"
- xmlns:tei="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="tei">
+ xmlns:tei="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="tei">
 
  <xsl:import href="../../../docx/to/docxtotei.xsl"/>
 
diff --git a/profiles/agora/html/from.xsl b/profiles/agora/html/from.xsl
index 50f64ed58..b18686477 100644
--- a/profiles/agora/html/from.xsl
+++ b/profiles/agora/html/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../tools/html2tei.xsl"/>
diff --git a/profiles/agora/html/to.xsl b/profiles/agora/html/to.xsl
index 97b1e05e9..996e6abc4 100644
--- a/profiles/agora/html/to.xsl
+++ b/profiles/agora/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/agora/html5/to.xsl b/profiles/agora/html5/to.xsl
deleted file mode 120000
index d24029e0e..000000000
--- a/profiles/agora/html5/to.xsl
+++ /dev/null
@@ -1 +0,0 @@
-../html/to.xsl
\ No newline at end of file
diff --git a/profiles/agora/html5/to.xsl b/profiles/agora/html5/to.xsl
new file mode 100644
index 000000000..996e6abc4
--- /dev/null
+++ b/profiles/agora/html5/to.xsl
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet 
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns:tei="http://www.tei-c.org/ns/1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    exclude-result-prefixes="tei html"
+    version="3.0">
+    <!-- import base conversion style -->
+
+    <xsl:import href="../../../html/html.xsl"/>
+    <xsl:import href="../../../html/microdata.xsl"/>
+
+  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
+      <desc>
+
+         <p> This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public License as
+      published by the Free Software Foundation; either version 2.1 of the
+      License, or (at your option) any later version. This library is
+      distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+      without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+      PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+      details. You should have received a copy of the GNU Lesser General Public
+      License along with this library; if not, write to the Free Software
+      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA </p>
+         <p>Author: See AUTHORS</p>
+         <p>Id: $Id: to.xsl 12482 2013-07-28 18:39:41Z louburnard $</p>
+         <p>Copyright: 2013, TEI Consortium</p>
+      </desc>
+   </doc>
+
+   <xsl:output method="xhtml" omit-xml-declaration="yes"/>
+
+<!-- set stylesheet parameters -->
+   <xsl:param name="numberHeadings">false</xsl:param>
+  <xsl:param name="numberBackHeadings"></xsl:param>
+   <xsl:param name="numberFigures">false</xsl:param>
+   <xsl:param name="numberTables">false</xsl:param>
+  <xsl:param name="numberParagraphs">false</xsl:param>
+  <xsl:param name="generateParagraphIDs">true</xsl:param>
+  <xsl:param name="autoToc">true</xsl:param>
+  <xsl:param name="cssInlineFiles">../profiles/agora/html/tei-agora.css</xsl:param>
+  <xsl:param name="cssFile"/>
+  <xsl:param name="institution">AGORA Project</xsl:param>
+   <xsl:param name="bottomNavigationPanel">false</xsl:param>
+  <xsl:param name="linkPanel">false</xsl:param>
+   <xsl:param name="footnoteBackLink">true</xsl:param>
+   <xsl:param name="homeURL"></xsl:param>
+  <xsl:param name="feedbackURL"></xsl:param>
+   <xsl:param name="homeWords">AGORA</xsl:param>
+ 
+
+<!-- dont wrap quotes in quotes -->
+<xsl:param name="preQuote"/>
+<xsl:param name="postQuote"/>
+
+
+<xsl:template name="copyrightStatement">
+<xsl:value-of select="//tei:sourceDesc/tei:title[@level='a']"/>
+<xsl:text>This page is made available under the Creative Commons General Public License "Attribution, Non-Commercial, Share-Alike", version 3.0 (CCPL BY-NC-SA) </xsl:text>
+</xsl:template>
+
+
+<!-- number paragraphs -->
+  <xsl:template name="numberParagraph">
+    <xsl:if test="ancestor::tei:body">
+      <span class="numberParagraph">      
+	<xsl:number level="any" from="tei:body"/>
+      </span>
+    </xsl:if>
+  </xsl:template>
+
+<!-- suppress pb -->
+<xsl:template match="tei:pb"/>
+    
+<!-- deal with weird @rend values -->
+<xsl:template match="tei:hi[tei:match(@rend,'del')]">
+<s><xsl:apply-templates/></s>
+</xsl:template>
+<xsl:template match="tei:hi[tei:match(@rend,'ul2')]">
+<u style="border-bottom: 1px double #000"><xsl:apply-templates/></u>
+</xsl:template>
+
+<xsl:template match="tei:hi[tei:match(@rend,'ulw')]">
+<u style="border-bottom: 1px dotted #000"><xsl:apply-templates/></u>
+</xsl:template>
+
+<xsl:template match="tei:hi[tei:match(@rend,'shadow')]">
+<u style="background-color: gray"><xsl:apply-templates/></u>
+</xsl:template>
+
+<xsl:template match="tei:lb[tei:match(@rend,'indent')]">
+<br/><xsl:text>    </xsl:text>
+</xsl:template>
+
+<!-- also weird list types -->
+
+<xsl:template match="tei:list[@type='number']">
+<ol>
+          <xsl:apply-templates select="tei:item"/>
+</ol></xsl:template>
+
+<xsl:template match="tei:list[@type='simple']">
+<ul style="list-style:none">
+          <xsl:apply-templates select="tei:item"/>
+</ul></xsl:template>
+
+
+<!--
+<xsl:template match="tei:ref">
+  <span class="ref"><xsl:apply-templates/></span>
+  <span class="contextaRef"><xsl:value-of select="@cRef"/></span>
+</xsl:template>
+-->
+
+<!-- add a space in front of surname inside author -->
+
+<xsl:template
+    match="tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:author/tei:surname">
+<xsl:text> </xsl:text>
+<xsl:apply-templates/>
+</xsl:template>
+
+  <xsl:template match="tei:div[@type='bibliography']">
+    <div class="refs">
+      <xsl:if test='not(tei:head)'>
+	<h2><span class="head">References</span></h2>
+      </xsl:if>
+      <xsl:apply-templates/>
+    </div>  
+  </xsl:template>
+
+
+  <xsl:template match="tei:div[@type='abstract']">
+    <div class="abstract">
+      <xsl:if test='not(tei:head)'>
+	<h2><span class="head">Abstract</span></h2>
+      </xsl:if>
+      <xsl:apply-templates/>
+    </div>  
+  </xsl:template>
+
+<xsl:template match="tei:byLine">
+<xsl:message>suppressing and</xsl:message>
+<xsl:apply-templates/>
+</xsl:template>
+
+
+<!-- these seem to be inherited -->
+    <xsl:template match="html:*">
+      <xsl:element name="{local-name()}">
+	<xsl:copy-of select="@*"/>
+	<xsl:apply-templates/>
+      </xsl:element>
+    </xsl:template>
+    
+    <xsl:template match="html:*/comment()">
+      <xsl:copy-of select="."/>
+    </xsl:template>
+
+  <xsl:template match="tei:div[@type='frontispiece']">
+      <xsl:apply-templates/>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/profiles/agora/latex/to.xsl b/profiles/agora/latex/to.xsl
index e53868bfe..27ff00a65 100644
--- a/profiles/agora/latex/to.xsl
+++ b/profiles/agora/latex/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/default/bibtex/to.xsl b/profiles/default/bibtex/to.xsl
index 2ba9ef019..eb2c427d8 100644
--- a/profiles/default/bibtex/to.xsl
+++ b/profiles/default/bibtex/to.xsl
@@ -4,7 +4,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../bibtex/teitobib.xsl"/>
diff --git a/profiles/default/cocoa/from.xsl b/profiles/default/cocoa/from.xsl
index 77ac0ff38..039218809 100644
--- a/profiles/default/cocoa/from.xsl
+++ b/profiles/default/cocoa/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../cocoa/cocoa-to-tei.xsl"/>
 
diff --git a/profiles/default/csv/from.xsl b/profiles/default/csv/from.xsl
index 2b88bed20..5dc6db5b5 100644
--- a/profiles/default/csv/from.xsl
+++ b/profiles/default/csv/from.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/default/csv/to.xsl b/profiles/default/csv/to.xsl
index f13e343d9..6a1450d06 100644
--- a/profiles/default/csv/to.xsl
+++ b/profiles/default/csv/to.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:tei="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="xs tei">
diff --git a/profiles/default/docbook/from.xsl b/profiles/default/docbook/from.xsl
index 6f3317f2b..bd60ee71b 100644
--- a/profiles/default/docbook/from.xsl
+++ b/profiles/default/docbook/from.xsl
@@ -2,7 +2,7 @@
     xmlns="http://www.tei-c.org/ns/1.0"
     xpath-default-namespace="http://docbook.org/ns/docbook"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0">
+    version="3.0">
 
 
 <xsl:import href="../../../docbook/docbooktotei.xsl"/>
diff --git a/profiles/default/docbook/to.xsl b/profiles/default/docbook/to.xsl
index d79bbbbb7..24d8ea41c 100644
--- a/profiles/default/docbook/to.xsl
+++ b/profiles/default/docbook/to.xsl
@@ -3,7 +3,7 @@
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0">
+    version="3.0">
 
 
 <xsl:import href="../../../docbook/teitodocbook.xsl"/>
diff --git a/profiles/default/docx/from.xsl b/profiles/default/docx/from.xsl
index 7518f3ad8..f29b178d5 100644
--- a/profiles/default/docx/from.xsl
+++ b/profiles/default/docx/from.xsl
@@ -19,7 +19,7 @@
 		xmlns:html="http://www.w3.org/1999/xhtml"
 		xmlns:its="http://www.w3.org/2005/11/its"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     <!-- import base conversion style -->
 
diff --git a/profiles/default/docx/to.xsl b/profiles/default/docx/to.xsl
index 49bb192fe..a583576d9 100644
--- a/profiles/default/docx/to.xsl
+++ b/profiles/default/docx/to.xsl
@@ -19,7 +19,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
 
diff --git a/profiles/default/dtd/to.xsl b/profiles/default/dtd/to.xsl
index 4da72f85c..dc6f655ac 100644
--- a/profiles/default/dtd/to.xsl
+++ b/profiles/default/dtd/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../odds/odd2dtd.xsl"/>
diff --git a/profiles/default/epub/to.xsl b/profiles/default/epub/to.xsl
index f8999f10f..2e85b74bc 100644
--- a/profiles/default/epub/to.xsl
+++ b/profiles/default/epub/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="tei">
     <xsl:import href="../../../epub/tei-to-epub.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/default/epub3/to.xsl b/profiles/default/epub3/to.xsl
index bcbe9756e..cd4942242 100644
--- a/profiles/default/epub3/to.xsl
+++ b/profiles/default/epub3/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="tei">
     <xsl:import href="../../../epub3/tei-to-epub3.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/default/fo/to.xsl b/profiles/default/fo/to.xsl
index 66b64effc..0503fda6f 100644
--- a/profiles/default/fo/to.xsl
+++ b/profiles/default/fo/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../fo/fo.xsl"/>
diff --git a/profiles/default/html/from.xsl b/profiles/default/html/from.xsl
index 1b2b8a3ec..5c855ec10 100644
--- a/profiles/default/html/from.xsl
+++ b/profiles/default/html/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html2tei.xsl"/>
diff --git a/profiles/default/html/oddhtml.xsl b/profiles/default/html/oddhtml.xsl
index 096ca8d50..c4c848c3e 100644
--- a/profiles/default/html/oddhtml.xsl
+++ b/profiles/default/html/oddhtml.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../odds/odd2html.xsl"/>
diff --git a/profiles/default/html/to.xsl b/profiles/default/html/to.xsl
index 4cd0bd45e..8e14f67c6 100644
--- a/profiles/default/html/to.xsl
+++ b/profiles/default/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/default/html5/to.xsl b/profiles/default/html5/to.xsl
index 4742c2e2a..5433cbb00 100644
--- a/profiles/default/html5/to.xsl
+++ b/profiles/default/html5/to.xsl
@@ -3,7 +3,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei"
-    version="2.0">
+    version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/default/ibooks/to.xsl b/profiles/default/ibooks/to.xsl
index 56390ca16..0ca74a357 100644
--- a/profiles/default/ibooks/to.xsl
+++ b/profiles/default/ibooks/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="tei">
     <xsl:import href="../../../ibooks/tei-to-ibooks.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/default/json/to.xsl b/profiles/default/json/to.xsl
index 684346647..1e92274cf 100644
--- a/profiles/default/json/to.xsl
+++ b/profiles/default/json/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../json/teitojson.xsl"/>
diff --git a/profiles/default/latex/to.xsl b/profiles/default/latex/to.xsl
index 1d0e26079..d073d1198 100644
--- a/profiles/default/latex/to.xsl
+++ b/profiles/default/latex/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/default/lite/to.xsl b/profiles/default/lite/to.xsl
index 8cc66c21c..c346acae2 100644
--- a/profiles/default/lite/to.xsl
+++ b/profiles/default/lite/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/default/markdown/from.xsl b/profiles/default/markdown/from.xsl
index fdfd5386d..3cbbc3a5e 100644
--- a/profiles/default/markdown/from.xsl
+++ b/profiles/default/markdown/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../markdown/markdown-to-tei.xsl"/>
 
diff --git a/profiles/default/markdown/to.xsl b/profiles/default/markdown/to.xsl
index cf9cdd99b..33185b745 100644
--- a/profiles/default/markdown/to.xsl
+++ b/profiles/default/markdown/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../markdown/tei-to-markdown.xsl"/>
 
diff --git a/profiles/default/nlm/to.xsl b/profiles/default/nlm/to.xsl
index 2658039bc..785896748 100644
--- a/profiles/default/nlm/to.xsl
+++ b/profiles/default/nlm/to.xsl
@@ -3,7 +3,7 @@
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    version="2.0">
+    version="3.0">
 
 
 <xsl:import href="../../../nlm/tei_to_nlm.xsl"/>
diff --git a/profiles/default/odd/to.xsl b/profiles/default/odd/to.xsl
index b81b3ecc0..c1d5b35d3 100644
--- a/profiles/default/odd/to.xsl
+++ b/profiles/default/odd/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../odds/odd2odd.xsl"/>
 
diff --git a/profiles/default/oddhtml/to.xsl b/profiles/default/oddhtml/to.xsl
index a04bac628..6c5098973 100644
--- a/profiles/default/oddhtml/to.xsl
+++ b/profiles/default/oddhtml/to.xsl
@@ -12,7 +12,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="a fo html i rng sch tei teix xi xs xsl"
-                version="2.0">
+                version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/default/oddjson/to.xsl b/profiles/default/oddjson/to.xsl
index e7de1e2b9..c0d67bf9c 100644
--- a/profiles/default/oddjson/to.xsl
+++ b/profiles/default/oddjson/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../odds/odd2json.xsl"/>
diff --git a/profiles/default/odt/from.xsl b/profiles/default/odt/from.xsl
index 2be3096e3..c42118533 100644
--- a/profiles/default/odt/from.xsl
+++ b/profiles/default/odt/from.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
 		>
     <!-- import base conversion style -->
 
diff --git a/profiles/default/odt/to.xsl b/profiles/default/odt/to.xsl
index 5cfc4381b..d291aa31b 100644
--- a/profiles/default/odt/to.xsl
+++ b/profiles/default/odt/to.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
 		>
     <!-- import base conversion style -->
 
diff --git a/profiles/default/p4/from.xsl b/profiles/default/p4/from.xsl
index b67b2ef2c..ec0806ac2 100644
--- a/profiles/default/p4/from.xsl
+++ b/profiles/default/p4/from.xsl
@@ -4,7 +4,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0" 
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns="http://www.tei-c.org/ns/1.0"
-    version="2.0" exclude-result-prefixes="xs">
+    version="3.0" exclude-result-prefixes="xs">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/default/pdf/to.xsl b/profiles/default/pdf/to.xsl
index fea860357..a43cc2d94 100644
--- a/profiles/default/pdf/to.xsl
+++ b/profiles/default/pdf/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/default/rdf/to.xsl b/profiles/default/rdf/to.xsl
index 93c1487b9..b4c268600 100644
--- a/profiles/default/rdf/to.xsl
+++ b/profiles/default/rdf/to.xsl
@@ -4,7 +4,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../rdf/tei2rdf.xsl"/>
diff --git a/profiles/default/rng/to.xsl b/profiles/default/rng/to.xsl
index e7178b9dd..c6e237cdc 100644
--- a/profiles/default/rng/to.xsl
+++ b/profiles/default/rng/to.xsl
@@ -12,7 +12,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="a fo html i rng sch tei teix xi xs xsl"
-  version="2.0">
+  version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/default/schematron/to.xsl b/profiles/default/schematron/to.xsl
index 83063cc22..170b0bef3 100644
--- a/profiles/default/schematron/to.xsl
+++ b/profiles/default/schematron/to.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet 
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../odds/extract-isosch.xsl"/>
 
diff --git a/profiles/default/simple/to.xsl b/profiles/default/simple/to.xsl
index afab91fd9..c07d4fb4f 100644
--- a/profiles/default/simple/to.xsl
+++ b/profiles/default/simple/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/default/slides/to.xsl b/profiles/default/slides/to.xsl
index 4630f2e9d..963cb2fd8 100644
--- a/profiles/default/slides/to.xsl
+++ b/profiles/default/slides/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../slides/teilatex-slides.xsl"/>
diff --git a/profiles/default/tcp/from.xsl b/profiles/default/tcp/from.xsl
index 6eaab31f6..4acadd09d 100644
--- a/profiles/default/tcp/from.xsl
+++ b/profiles/default/tcp/from.xsl
@@ -3,7 +3,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns="http://www.tei-c.org/ns/1.0"
-    version="2.0"
+    version="3.0"
     exclude-result-prefixes="tei">
 
     <xsl:import href="../../../tcp/tcp2tei.xsl"/>
diff --git a/profiles/default/tei-fo.xsl b/profiles/default/tei-fo.xsl
index bece8d433..1931c532c 100644
--- a/profiles/default/tei-fo.xsl
+++ b/profiles/default/tei-fo.xsl
@@ -6,7 +6,7 @@
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei fotex fo m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../fo/fo.xsl"/>
diff --git a/profiles/default/txt/to.xsl b/profiles/default/txt/to.xsl
index 5d69a0cf9..b389b57fa 100644
--- a/profiles/default/txt/to.xsl
+++ b/profiles/default/txt/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../txt/tei-to-text.xsl"/>
 
diff --git a/profiles/default/verbatimxml/to.xsl b/profiles/default/verbatimxml/to.xsl
index 099afb9b0..b60d029c0 100644
--- a/profiles/default/verbatimxml/to.xsl
+++ b/profiles/default/verbatimxml/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../verbatimxml/teitoverbatim.xsl"/>
 
diff --git a/profiles/default/wordpress/from.xsl b/profiles/default/wordpress/from.xsl
index fdb859c1c..44f3e226f 100644
--- a/profiles/default/wordpress/from.xsl
+++ b/profiles/default/wordpress/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../wordpress/wordpress-to-tei.xsl"/>
 
diff --git a/profiles/default/xlsx/from.xsl b/profiles/default/xlsx/from.xsl
index 816657032..95c46cd3a 100644
--- a/profiles/default/xlsx/from.xsl
+++ b/profiles/default/xlsx/from.xsl
@@ -19,7 +19,7 @@
 		xmlns:html="http://www.w3.org/1999/xhtml"
 		xmlns:its="http://www.w3.org/2005/11/its"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp html its w10 w wne mml tbx iso">
     <!-- import base conversion style -->
 
diff --git a/profiles/default/xml/to.xsl b/profiles/default/xml/to.xsl
index 5d1d8c31f..a58d88a3b 100644
--- a/profiles/default/xml/to.xsl
+++ b/profiles/default/xml/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
          <p>This software is dual-licensed:
diff --git a/profiles/dhconvalidator/docx/from.xsl b/profiles/dhconvalidator/docx/from.xsl
index 127777bb6..951ffe1aa 100755
--- a/profiles/dhconvalidator/docx/from.xsl
+++ b/profiles/dhconvalidator/docx/from.xsl
@@ -22,7 +22,7 @@
                 xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
                 xmlns:dc="http://purl.org/dc/elements/1.1/"
                 xmlns:dcterms="http://purl.org/dc/terms/"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     <!-- import base conversion style -->
 
diff --git a/profiles/dhconvalidator/html/to.xsl b/profiles/dhconvalidator/html/to.xsl
index f6d4e6592..2c76ab1df 100755
--- a/profiles/dhconvalidator/html/to.xsl
+++ b/profiles/dhconvalidator/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/dhconvalidator/odt/from.xsl b/profiles/dhconvalidator/odt/from.xsl
index 0cd38af1b..1d34946c2 100755
--- a/profiles/dhconvalidator/odt/from.xsl
+++ b/profiles/dhconvalidator/odt/from.xsl
@@ -3,7 +3,7 @@
   exclude-result-prefixes="office style text table draw fo xlink dc
 			   meta number tei svg chart dr3d math form
 			   script ooo ooow oooc dom xforms xs xsd xsi"
-  office:version="1.0" version="2.0" 
+  office:version="1.0" version="3.0" 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns="http://www.tei-c.org/ns/1.0"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/dhoxss/html/to.xsl b/profiles/dhoxss/html/to.xsl
index 151ec8c2d..4c7e9b6c9 100644
--- a/profiles/dhoxss/html/to.xsl
+++ b/profiles/dhoxss/html/to.xsl
@@ -6,7 +6,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html xs"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/dhoxss/slides/to.xsl b/profiles/dhoxss/slides/to.xsl
index 52d0c3472..3d1bc25c4 100644
--- a/profiles/dhoxss/slides/to.xsl
+++ b/profiles/dhoxss/slides/to.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet
-    version="2.0"
+    version="3.0"
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:teix="http://www.tei-c.org/ns/Examples"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/enrich/docx/from.xsl b/profiles/enrich/docx/from.xsl
index a9ea91c5e..d430c8342 100644
--- a/profiles/enrich/docx/from.xsl
+++ b/profiles/enrich/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a         tei teidocx xs iso">
     
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/enrich/docx/to.xsl b/profiles/enrich/docx/to.xsl
index a8ede9f1e..6a75d9c03 100644
--- a/profiles/enrich/docx/to.xsl
+++ b/profiles/enrich/docx/to.xsl
@@ -19,7 +19,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
     <xsl:import href="../../default/docx/to.xsl"/>
diff --git a/profiles/enrich/fo/to.xsl b/profiles/enrich/fo/to.xsl
index 5d0438aca..479fe869e 100644
--- a/profiles/enrich/fo/to.xsl
+++ b/profiles/enrich/fo/to.xsl
@@ -12,7 +12,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="xlink dbk rng tei teix xhtml a html xs xsl"
-                version="2.0">
+                version="3.0">
    <xsl:import href="../../../fo/fo.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/profiles/enrich/html/to.xsl b/profiles/enrich/html/to.xsl
index 088b80b70..efbfae234 100644
--- a/profiles/enrich/html/to.xsl
+++ b/profiles/enrich/html/to.xsl
@@ -5,7 +5,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/enrich/latex/to.xsl b/profiles/enrich/latex/to.xsl
index fe535bff3..192265139 100644
--- a/profiles/enrich/latex/to.xsl
+++ b/profiles/enrich/latex/to.xsl
@@ -12,7 +12,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="xlink dbk rng tei teix xhtml a html xs xsl"
-                version="2.0">
+                version="3.0">
    <xsl:import href="../../../latex/latex.xsl"/>
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/check-docx.xsl b/profiles/iso/check-docx.xsl
index 9ecfd1bc1..0775cb471 100644
--- a/profiles/iso/check-docx.xsl
+++ b/profiles/iso/check-docx.xsl
@@ -18,7 +18,7 @@
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
     <xsl:import href="docx/iso-functions.xsl"/>
     <xsl:import href="../../docx/check-docx-and-annotate.xsl"/>
diff --git a/profiles/iso/docx/addisometa.xsl b/profiles/iso/docx/addisometa.xsl
index d0b534116..837f74404 100644
--- a/profiles/iso/docx/addisometa.xsl
+++ b/profiles/iso/docx/addisometa.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:iso="http://www.iso.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="tei iso">
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/docx/fixdotrels.xsl b/profiles/iso/docx/fixdotrels.xsl
index dac8711bf..451ef49c0 100644
--- a/profiles/iso/docx/fixdotrels.xsl
+++ b/profiles/iso/docx/fixdotrels.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:r="http://schemas.openxmlformats.org/package/2006/relationships"
     exclude-result-prefixes="r">
diff --git a/profiles/iso/docx/fixstyle.xsl b/profiles/iso/docx/fixstyle.xsl
index 5c33ed30a..a1a96638e 100644
--- a/profiles/iso/docx/fixstyle.xsl
+++ b/profiles/iso/docx/fixstyle.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet 
-    version="2.0"
+    version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
     exclude-result-prefixes="w">
diff --git a/profiles/iso/docx/from-pass2.xsl b/profiles/iso/docx/from-pass2.xsl
index 28188936b..ba714bb1a 100644
--- a/profiles/iso/docx/from-pass2.xsl
+++ b/profiles/iso/docx/from-pass2.xsl
@@ -22,7 +22,7 @@
                 xmlns:custprops="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
                 xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
                 xmlns:html="http://www.w3.org/1999/xhtml"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a pic rel ve o teidocx r m v wp w10 w wne mml vt cals tbx iso custprops">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/profiles/iso/docx/from-pass3.xsl b/profiles/iso/docx/from-pass3.xsl
index 6762494e0..22ad510d3 100644
--- a/profiles/iso/docx/from-pass3.xsl
+++ b/profiles/iso/docx/from-pass3.xsl
@@ -22,7 +22,7 @@
                 xmlns:custprops="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
                 xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
                 xmlns:html="http://www.w3.org/1999/xhtml"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a pic rel ve o teidocx r m v wp w10 w wne mml vt cals tbx iso custprops">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/profiles/iso/docx/from.xsl b/profiles/iso/docx/from.xsl
index 7e1652fd2..0276b6ecc 100644
--- a/profiles/iso/docx/from.xsl
+++ b/profiles/iso/docx/from.xsl
@@ -22,7 +22,7 @@
                 xmlns:custprops="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
                 xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
                 xmlns:html="http://www.w3.org/1999/xhtml"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="a pic rel ve o teidocx r m v wp w10 w wne mml vt cals tbx iso custprops">
 
     <!-- import conversion style -->
diff --git a/profiles/iso/docx/iso-functions.xsl b/profiles/iso/docx/iso-functions.xsl
index 74a5503ba..01c8f009f 100644
--- a/profiles/iso/docx/iso-functions.xsl
+++ b/profiles/iso/docx/iso-functions.xsl
@@ -19,7 +19,7 @@
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
     <xsl:import href="iso-variables.xsl"/>
     
diff --git a/profiles/iso/docx/iso-variables.xsl b/profiles/iso/docx/iso-variables.xsl
index e471cb132..7ed8e0ea9 100644
--- a/profiles/iso/docx/iso-variables.xsl
+++ b/profiles/iso/docx/iso-variables.xsl
@@ -20,7 +20,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
                 
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
 	
 	  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/docx/makecoverpages.xsl b/profiles/iso/docx/makecoverpages.xsl
index 775a039d7..f5ba9fb65 100644
--- a/profiles/iso/docx/makecoverpages.xsl
+++ b/profiles/iso/docx/makecoverpages.xsl
@@ -21,7 +21,7 @@
                 
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teidocx cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn its">
     <!-- import conversion style -->
     <xsl:import href="../../../docx/to/teitodocx.xsl"/>
diff --git a/profiles/iso/docx/makecoverpages2.xsl b/profiles/iso/docx/makecoverpages2.xsl
index 343e34a0d..049d7d4a3 100755
--- a/profiles/iso/docx/makecoverpages2.xsl
+++ b/profiles/iso/docx/makecoverpages2.xsl
@@ -21,7 +21,7 @@
                 
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teidocx cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn its">
 
 	  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/docx/metadatamerge.xsl b/profiles/iso/docx/metadatamerge.xsl
index 1be639597..ce606e235 100755
--- a/profiles/iso/docx/metadatamerge.xsl
+++ b/profiles/iso/docx/metadatamerge.xsl
@@ -21,7 +21,7 @@
                 
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teidocx cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn its">
 
 	  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/docx/tbx.xsl b/profiles/iso/docx/tbx.xsl
index 19adf753e..651703f76 100644
--- a/profiles/iso/docx/tbx.xsl
+++ b/profiles/iso/docx/tbx.xsl
@@ -21,7 +21,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:html="http://www.w3.org/1999/xhtml"                
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teidocx cals ve o r m v wp w10 w html wne mml tbx iso tei a xs pic fn its">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/profiles/iso/docx/to.xsl b/profiles/iso/docx/to.xsl
index cf73e8a16..68c0958de 100644
--- a/profiles/iso/docx/to.xsl
+++ b/profiles/iso/docx/to.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:its="http://www.w3.org/2005/11/its" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:o="urn:schemas-pmicrosoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:html="http://www.w3.org/1999/xhtml" version="2.0" exclude-result-prefixes="teidocx cals ve o r m v wp       w10 w html wne mml tbx iso       tei teix a xs pic fn its">
+<xsl:stylesheet xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:its="http://www.w3.org/2005/11/its" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:o="urn:schemas-pmicrosoft-com:office:office" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:html="http://www.w3.org/1999/xhtml" version="3.0" exclude-result-prefixes="teidocx cals ve o r m v wp       w10 w html wne mml tbx iso       tei teix a xs pic fn its">
   <!-- import conversion style -->
   <xsl:import href="../../../docx/to/teitodocx.xsl"/>
   <xsl:import href="tbx.xsl"/>
diff --git a/profiles/iso/epub/to.xsl b/profiles/iso/epub/to.xsl
index fb5a80048..e70f402fe 100644
--- a/profiles/iso/epub/to.xsl
+++ b/profiles/iso/epub/to.xsl
@@ -11,7 +11,7 @@
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 exclude-result-prefixes="tei html t a rng iso tbx cals teix"
-                version="2.0">
+                version="3.0">
    <xsl:import href="../../../html/html.xsl"/>
    <xsl:import href="../../../html/html_oddprocessing.xsl"/>
    <xsl:import href="../../../odds/teiodds.xsl"/>
diff --git a/profiles/iso/fo/to.xsl b/profiles/iso/fo/to.xsl
index 20f853070..eca20ac7b 100644
--- a/profiles/iso/fo/to.xsl
+++ b/profiles/iso/fo/to.xsl
@@ -12,7 +12,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="xlink dbk rng tei teix xhtml a html  xs xsl"
-                version="2.0">
+                version="3.0">
    <xsl:import href="../../../fo/fo.xsl"/>
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/html/cals.xsl b/profiles/iso/html/cals.xsl
index d1c14a314..e720afd2b 100644
--- a/profiles/iso/html/cals.xsl
+++ b/profiles/iso/html/cals.xsl
@@ -11,7 +11,7 @@
     xmlns:t="http://www.thaiopensource.com/ns/annotations"
     xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
     xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    exclude-result-prefixes="tei html t a rng iso tbx cals teix" version="2.0">
+    exclude-result-prefixes="tei html t a rng iso tbx cals teix" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
 
diff --git a/profiles/iso/html/tbx.xsl b/profiles/iso/html/tbx.xsl
index 09d2901ff..fa00100fd 100644
--- a/profiles/iso/html/tbx.xsl
+++ b/profiles/iso/html/tbx.xsl
@@ -11,7 +11,7 @@
 		xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
 		xmlns:rng="http://relaxng.org/ns/structure/1.0"
 		exclude-result-prefixes="tei html t a rng iso tbx
-					 cals teix" version="2.0">
+					 cals teix" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/html/to.xsl b/profiles/iso/html/to.xsl
index 838e7090a..485a55f37 100644
--- a/profiles/iso/html/to.xsl
+++ b/profiles/iso/html/to.xsl
@@ -12,7 +12,7 @@
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 exclude-result-prefixes="tei html t its a rng iso tbx cals teix"
-                version="2.0">
+                version="3.0">
    <xsl:import href="../../../html/html.xsl"/>
    <xsl:import href="../../../html/html_oddprocessing.xsl"/>
    <xsl:import href="../../../odds/teiodds.xsl"/>
diff --git a/profiles/iso/html/web.xsl b/profiles/iso/html/web.xsl
index 253844781..58b76c61a 100644
--- a/profiles/iso/html/web.xsl
+++ b/profiles/iso/html/web.xsl
@@ -15,7 +15,7 @@
 
                 exclude-result-prefixes="tei html t a rng iso tbx
 					 cals teix w"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/iso2changes.xsl b/profiles/iso/iso2changes.xsl
index 83fed3cd4..a2f53e572 100644
--- a/profiles/iso/iso2changes.xsl
+++ b/profiles/iso/iso2changes.xsl
@@ -9,7 +9,7 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:h="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="tei cals tbx"
-                version="2.0">
+                version="3.0">
    <xsl:import href="isoutils.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/profiles/iso/iso2meta.xsl b/profiles/iso/iso2meta.xsl
index 3ea247250..79d8c4f4d 100644
--- a/profiles/iso/iso2meta.xsl
+++ b/profiles/iso/iso2meta.xsl
@@ -3,7 +3,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="tei iso"
-                version="2.0">
+                version="3.0">
   <xsl:import href="isoutils.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/profiles/iso/iso2rss.xsl b/profiles/iso/iso2rss.xsl
index b0ea8cd85..a04d67d88 100644
--- a/profiles/iso/iso2rss.xsl
+++ b/profiles/iso/iso2rss.xsl
@@ -4,7 +4,7 @@
                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
                 xmlns="http://www.w3.org/2005/Atom"
                 exclude-result-prefixes="xhtml tei"
-                version="2.0">
+                version="3.0">
    <xsl:import href="isoutils.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/profiles/iso/iso2terms.xsl b/profiles/iso/iso2terms.xsl
index c7f995dce..4e1ccc089 100644
--- a/profiles/iso/iso2terms.xsl
+++ b/profiles/iso/iso2terms.xsl
@@ -4,7 +4,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
    <xsl:import href="isoutils.xsl"/>
    <xsl:import href="html/to.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/iso2toc.xsl b/profiles/iso/iso2toc.xsl
index c463d8e1c..5d8a741db 100644
--- a/profiles/iso/iso2toc.xsl
+++ b/profiles/iso/iso2toc.xsl
@@ -3,7 +3,7 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="tei"
-                version="2.0">
+                version="3.0">
    <xsl:import href="isoutils.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/profiles/iso/isotei-schema.xsl b/profiles/iso/isotei-schema.xsl
index febb1608d..d6e63d690 100644
--- a/profiles/iso/isotei-schema.xsl
+++ b/profiles/iso/isotei-schema.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:i="http://www.iso.org/ns/1.0"
-                version="2.0">
+                version="3.0">
    <xsl:template match="tei:list[@type='termlist']/tei:item" mode="checkSchematron">
       <xsl:if test="not(@n)">
          <xsl:call-template name="generateError">
diff --git a/profiles/iso/isoutils.xsl b/profiles/iso/isoutils.xsl
index 787773137..a484f5646 100644
--- a/profiles/iso/isoutils.xsl
+++ b/profiles/iso/isoutils.xsl
@@ -6,7 +6,7 @@
 		xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		exclude-result-prefixes="tei iso cals tbx w"
-		version="2.0">
+		version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/latex/to.xsl b/profiles/iso/latex/to.xsl
index 465fbe2d9..4006575db 100644
--- a/profiles/iso/latex/to.xsl
+++ b/profiles/iso/latex/to.xsl
@@ -12,7 +12,7 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="xlink dbk rng tei teix xhtml a html  xs xsl"
-                version="2.0">
+                version="3.0">
    <xsl:import href="../../../latex/latex.xsl"/>
    <xsl:import href="../isoutils.xsl"/>
 
diff --git a/profiles/iso/removechanges.xsl b/profiles/iso/removechanges.xsl
index 19358738d..04b29b949 100644
--- a/profiles/iso/removechanges.xsl
+++ b/profiles/iso/removechanges.xsl
@@ -22,7 +22,7 @@
                 xmlns:custprops="http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
                 xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
 		exclude-result-prefixes="a pic rel ve o teidocx r m v wp w10 w wne mml vt cals tbx iso custprops"
-		version="2.0">
+		version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/schema/isotei-lite.xsl b/profiles/iso/schema/isotei-lite.xsl
index 9c657d13a..efb79153a 100644
--- a/profiles/iso/schema/isotei-lite.xsl
+++ b/profiles/iso/schema/isotei-lite.xsl
@@ -6,7 +6,7 @@
                 xmlns:xj="http://xml.apache.org/xalan/java"
                 xmlns:loc="http://www.thaiopensource.com/ns/location"
                 xmlns:err="http://www.thaiopensource.com/ns/error"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/schema/isotei-odd.xsl b/profiles/iso/schema/isotei-odd.xsl
index 2ae393bf0..a83dd6a3c 100644
--- a/profiles/iso/schema/isotei-odd.xsl
+++ b/profiles/iso/schema/isotei-odd.xsl
@@ -6,7 +6,7 @@
                 xmlns:loc="http://www.thaiopensource.com/ns/location"
                 xmlns:err="http://www.thaiopensource.com/ns/error"
                 xmlns:i="http://www.iso.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 i:dummy-for-xmlns=""
                 tei:dummy-for-xmlns="">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/schema/isotei.xsl b/profiles/iso/schema/isotei.xsl
index 2c4069614..a5edaf8ed 100644
--- a/profiles/iso/schema/isotei.xsl
+++ b/profiles/iso/schema/isotei.xsl
@@ -7,7 +7,7 @@
                 xmlns:loc="http://www.thaiopensource.com/ns/location"
                 xmlns:err="http://www.thaiopensource.com/ns/error"
                 xmlns:i="http://www.iso.org/ns/1.0"
-                version="2.0"
+                version="3.0"
                 i:dummy-for-xmlns=""
                 tei:dummy-for-xmlns="">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/iso/schema/test.xsl b/profiles/iso/schema/test.xsl
index 78bc15242..25180a782 100644
--- a/profiles/iso/schema/test.xsl
+++ b/profiles/iso/schema/test.xsl
@@ -8,7 +8,7 @@
                 xmlns:i="http://www.iso.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/schema/test2.xsl b/profiles/iso/schema/test2.xsl
index cc33b2e5d..e2ad7ccbf 100644
--- a/profiles/iso/schema/test2.xsl
+++ b/profiles/iso/schema/test2.xsl
@@ -8,7 +8,7 @@
                 xmlns:i="http://www.iso.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/schema/test3.xsl b/profiles/iso/schema/test3.xsl
index a47e101af..ba88bc01f 100644
--- a/profiles/iso/schema/test3.xsl
+++ b/profiles/iso/schema/test3.xsl
@@ -8,7 +8,7 @@
                 xmlns:i="http://www.iso.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                version="2.0">
+                version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/iso/tbx/to.xsl b/profiles/iso/tbx/to.xsl
index 6523e6ae0..408b75bdf 100644
--- a/profiles/iso/tbx/to.xsl
+++ b/profiles/iso/tbx/to.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
+    version="3.0">
   <xsl:import href="../../../tbx/teitotbx.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/profiles/iso/validate.xsl b/profiles/iso/validate.xsl
index ed4dbbfe2..d4440e135 100644
--- a/profiles/iso/validate.xsl
+++ b/profiles/iso/validate.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml"   version="2.0"
+<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml"   version="3.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
diff --git a/profiles/jsi/docx/from.xsl b/profiles/jsi/docx/from.xsl
index d40ed2199..c6eaa2cbf 100644
--- a/profiles/jsi/docx/from.xsl
+++ b/profiles/jsi/docx/from.xsl
@@ -21,7 +21,7 @@
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"       
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
 
     <!-- import default conversion style -->
diff --git a/profiles/jsi/html/to.xsl b/profiles/jsi/html/to.xsl
index 44737439a..511636c72 100644
--- a/profiles/jsi/html/to.xsl
+++ b/profiles/jsi/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <!--xsl:import href="../default/html/to.xsl"/-->
     <xsl:import href="../../default/html/to.xsl"/>
diff --git a/profiles/jtei/i18n.xsl b/profiles/jtei/i18n.xsl
index fa9cca44e..b23689f38 100644
--- a/profiles/jtei/i18n.xsl
+++ b/profiles/jtei/i18n.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsl:stylesheet version="2.0" xmlns:xd="http://www.pnp-software.com/XSLTdoc"
+<xsl:stylesheet version="3.0" xmlns:xd="http://www.pnp-software.com/XSLTdoc"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:tei="http://www.tei-c.org/ns/1.0" 
   xmlns:eg="http://www.tei-c.org/ns/Examples"
diff --git a/profiles/jtei/jtei.common.xsl b/profiles/jtei/jtei.common.xsl
index 52cfdaa9e..2558f4f7a 100644
--- a/profiles/jtei/jtei.common.xsl
+++ b/profiles/jtei/jtei.common.xsl
@@ -7,7 +7,7 @@
   xmlns:local="local"
   xmlns="http://www.tei-c.org/ns/1.0"
   exclude-result-prefixes="#all"
-  version="2.0">
+  version="3.0">
   
   <!-- This stylesheet module contains shared functions and templates for all jTEI conversions -->
   
diff --git a/profiles/jtei/odt/odt.common.xsl b/profiles/jtei/odt/odt.common.xsl
index 3b5470fcd..07399f093 100644
--- a/profiles/jtei/odt/odt.common.xsl
+++ b/profiles/jtei/odt/odt.common.xsl
@@ -13,7 +13,7 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
-    exclude-result-prefixes="#all" version="2.0"
+    exclude-result-prefixes="#all" version="3.0"
     xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
     xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
     xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
diff --git a/profiles/jtei/odt/to.xsl b/profiles/jtei/odt/to.xsl
index 9a8c630f9..e7eb8540f 100644
--- a/profiles/jtei/odt/to.xsl
+++ b/profiles/jtei/odt/to.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.tei-c.org/ns/1.0"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
-  version="2.0"
+  version="3.0"
   >
   <!-- import base conversion style -->
   
diff --git a/profiles/jtei/openedition/to.xsl b/profiles/jtei/openedition/to.xsl
index 0b65f7076..316bed27a 100644
--- a/profiles/jtei/openedition/to.xsl
+++ b/profiles/jtei/openedition/to.xsl
@@ -8,7 +8,7 @@
   xmlns:i18n="i18n"
   xmlns="http://www.tei-c.org/ns/1.0"
   exclude-result-prefixes="#all"
-  version="2.0">
+  version="3.0">
   
   <xsl:import href="../jtei.common.xsl"/>
   
diff --git a/profiles/jtei/pdf/to.xsl b/profiles/jtei/pdf/to.xsl
index ee33255aa..c1f700408 100644
--- a/profiles/jtei/pdf/to.xsl
+++ b/profiles/jtei/pdf/to.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<xsl:stylesheet version="2.0" xmlns:xd="http://www.pnp-software.com/XSLTdoc"
+<xsl:stylesheet version="3.0" xmlns:xd="http://www.pnp-software.com/XSLTdoc"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:exsl="http://exslt.org/common"
   xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:eg="http://www.tei-c.org/ns/Examples"
diff --git a/profiles/oepack/epub/to.xsl b/profiles/oepack/epub/to.xsl
index bcb01eccd..6eabe6944 100644
--- a/profiles/oepack/epub/to.xsl
+++ b/profiles/oepack/epub/to.xsl
@@ -11,7 +11,7 @@
   xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
   xmlns:rng="http://relaxng.org/ns/structure/1.0"
   exclude-result-prefixes="tei html t a rng iso tbx cals teix"
-  version="2.0">
+  version="3.0">
     <xsl:import href="../../../epub/tei-to-epub.xsl"/>
 
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/oepack/html/from.xsl b/profiles/oepack/html/from.xsl
index 6496706f1..0887bf5df 100644
--- a/profiles/oepack/html/from.xsl
+++ b/profiles/oepack/html/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../tools/html2tei.xsl"/>
diff --git a/profiles/oepack/html/to.xsl b/profiles/oepack/html/to.xsl
index 57df92543..56442be99 100644
--- a/profiles/oepack/html/to.xsl
+++ b/profiles/oepack/html/to.xsl
@@ -4,7 +4,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/ota/docx/to.xsl b/profiles/ota/docx/to.xsl
index df63bbdcc..d5bc762b2 100644
--- a/profiles/ota/docx/to.xsl
+++ b/profiles/ota/docx/to.xsl
@@ -20,7 +20,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
     <xsl:import href="../../default/docx/to.xsl"/>
diff --git a/profiles/ota/epub/to.xsl b/profiles/ota/epub/to.xsl
index 2ff645355..8baac2b1e 100644
--- a/profiles/ota/epub/to.xsl
+++ b/profiles/ota/epub/to.xsl
@@ -13,7 +13,7 @@
   xmlns:t="http://www.thaiopensource.com/ns/annotations" 
   xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" 
   xmlns:rng="http://relaxng.org/ns/structure/1.0" 
-  exclude-result-prefixes="#all" version="2.0">
+  exclude-result-prefixes="#all" version="3.0">
   <xsl:import href="../../../epub/tei-to-epub.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/profiles/ota/epub3/to.xsl b/profiles/ota/epub3/to.xsl
index 568c729c9..3711233dc 100644
--- a/profiles/ota/epub3/to.xsl
+++ b/profiles/ota/epub3/to.xsl
@@ -13,7 +13,7 @@
   xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
   xmlns:rng="http://relaxng.org/ns/structure/1.0"
   exclude-result-prefixes="#all"
-  version="2.0">
+  version="3.0">
     <xsl:import href="../../../epub3/tei-to-epub3.xsl"/>
   <xsl:output method="xml" encoding="utf-8" doctype-system=""
 	      indent="no" omit-xml-declaration="yes"/>
diff --git a/profiles/ota/html/from.xsl b/profiles/ota/html/from.xsl
index 6496706f1..0887bf5df 100644
--- a/profiles/ota/html/from.xsl
+++ b/profiles/ota/html/from.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../tools/html2tei.xsl"/>
diff --git a/profiles/ota/html/to.xsl b/profiles/ota/html/to.xsl
index e2f6b0b99..1b3326742 100644
--- a/profiles/ota/html/to.xsl
+++ b/profiles/ota/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/ota/tcp/from.xsl b/profiles/ota/tcp/from.xsl
index f669f9117..87c0126c2 100644
--- a/profiles/ota/tcp/from.xsl
+++ b/profiles/ota/tcp/from.xsl
@@ -3,7 +3,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns="http://www.tei-c.org/ns/1.0"
-    version="2.0"
+    version="3.0"
     exclude-result-prefixes="tei">
 
     <xsl:import href="../../../tcp/tcp2tei.xsl"/>
diff --git a/profiles/otapages/epub/to.xsl b/profiles/otapages/epub/to.xsl
index 2fdaf1518..f7b357757 100644
--- a/profiles/otapages/epub/to.xsl
+++ b/profiles/otapages/epub/to.xsl
@@ -11,7 +11,7 @@
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 exclude-result-prefixes="tei html t a rng iso tbx cals teix"
-                version="2.0">
+                version="3.0">
     <xsl:import href="../../../epub/tei-to-epub.xsl"/>
 
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/otapages/epub3/to.xsl b/profiles/otapages/epub3/to.xsl
index e1e098ffd..1d034186d 100644
--- a/profiles/otapages/epub3/to.xsl
+++ b/profiles/otapages/epub3/to.xsl
@@ -11,7 +11,7 @@
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 exclude-result-prefixes="tei html t a rng iso tbx cals teix"
-                version="2.0">
+                version="3.0">
     <xsl:import href="../../../epub3/tei-to-epub3.xsl"/>
 
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/oucscourses/docx/from.xsl b/profiles/oucscourses/docx/from.xsl
index 049749711..d4c34e381 100644
--- a/profiles/oucscourses/docx/from.xsl
+++ b/profiles/oucscourses/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a         tei teidocx xs iso">
     <!-- import base conversion style -->
 
diff --git a/profiles/oucscourses/docx/to.xsl b/profiles/oucscourses/docx/to.xsl
index 197ef824d..1fb6d4dde 100644
--- a/profiles/oucscourses/docx/to.xsl
+++ b/profiles/oucscourses/docx/to.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="2.0" exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso a xs pic fn teidocx">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="3.0" exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso a xs pic fn teidocx">
   <!-- import conversion style -->
   <xsl:import href="../../default/docx/to.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/oulipo/docx/from.xsl b/profiles/oulipo/docx/from.xsl
index 5ee052aa8..4dac093bb 100644
--- a/profiles/oulipo/docx/from.xsl
+++ b/profiles/oulipo/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a tei teidocx xs iso">
    
diff --git a/profiles/oulipo/docx/to.xsl b/profiles/oulipo/docx/to.xsl
index b46bba1b0..bd5c3fef7 100644
--- a/profiles/oulipo/docx/to.xsl
+++ b/profiles/oulipo/docx/to.xsl
@@ -20,7 +20,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
     <xsl:import href="../../default/docx/to.xsl"/>
diff --git a/profiles/oulipo/from_common.xsl b/profiles/oulipo/from_common.xsl
index 9ed2d8726..74033c143 100644
--- a/profiles/oulipo/from_common.xsl
+++ b/profiles/oulipo/from_common.xsl
@@ -18,7 +18,7 @@
   xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
   xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
   xmlns:mml="http://www.w3.org/1998/Math/MathML"
-  xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" version="2.0"
+  xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" version="3.0"
   exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a         tei teidocx xs iso">
   <!-- import base conversion style -->
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet"
diff --git a/profiles/oulipo/html/to.xsl b/profiles/oulipo/html/to.xsl
index 1475eaacd..24e616c0c 100644
--- a/profiles/oulipo/html/to.xsl
+++ b/profiles/oulipo/html/to.xsl
@@ -6,7 +6,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html xs"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/oulipo/latex/to.xsl b/profiles/oulipo/latex/to.xsl
index 8f89a976c..04737e413 100644
--- a/profiles/oulipo/latex/to.xsl
+++ b/profiles/oulipo/latex/to.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet
-    version="2.0"
+    version="3.0"
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:teix="http://www.tei-c.org/ns/Examples"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/oulipo/odt/from.xsl b/profiles/oulipo/odt/from.xsl
index 6c171f4a9..3cb3e0846 100644
--- a/profiles/oulipo/odt/from.xsl
+++ b/profiles/oulipo/odt/from.xsl
@@ -3,7 +3,7 @@
   exclude-result-prefixes="office style text table draw fo xlink dc
 			   meta number tei svg chart dr3d math form
 			   script ooo ooow oooc dom xforms xs xsd xsi"
-  office:version="1.0" version="2.0" 
+  office:version="1.0" version="3.0" 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns="http://www.tei-c.org/ns/1.0"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/oulipo/pdf/to.xsl b/profiles/oulipo/pdf/to.xsl
index b155315b6..973513768 100644
--- a/profiles/oulipo/pdf/to.xsl
+++ b/profiles/oulipo/pdf/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/oulipo/slides/to.xsl b/profiles/oulipo/slides/to.xsl
index 8f89a976c..04737e413 100644
--- a/profiles/oulipo/slides/to.xsl
+++ b/profiles/oulipo/slides/to.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet
-    version="2.0"
+    version="3.0"
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:teix="http://www.tei-c.org/ns/Examples"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/oxford/docx/from.xsl b/profiles/oxford/docx/from.xsl
index de1dbddc6..cb832257d 100644
--- a/profiles/oxford/docx/from.xsl
+++ b/profiles/oxford/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a         tei teidocx xs iso">
     <!-- import base conversion style -->
 
diff --git a/profiles/oxford/docx/to.xsl b/profiles/oxford/docx/to.xsl
index 97fc86ac2..d590dcaf3 100644
--- a/profiles/oxford/docx/to.xsl
+++ b/profiles/oxford/docx/to.xsl
@@ -20,7 +20,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
     <xsl:import href="../../default/docx/to.xsl"/>
diff --git a/profiles/oxford/epub/to.xsl b/profiles/oxford/epub/to.xsl
index fd1ae6ee6..47573d866 100644
--- a/profiles/oxford/epub/to.xsl
+++ b/profiles/oxford/epub/to.xsl
@@ -13,7 +13,7 @@
   xmlns:rng="http://relaxng.org/ns/structure/1.0"
   exclude-result-prefixes="tei html t a rng iso tbx
   cals xlink teix"
-  version="2.0">
+  version="3.0">
     <xsl:import href="../../../epub/tei-to-epub.xsl"/>
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/oxford/html/to.xsl b/profiles/oxford/html/to.xsl
index eeb1151fc..45721af95 100644
--- a/profiles/oxford/html/to.xsl
+++ b/profiles/oxford/html/to.xsl
@@ -6,7 +6,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html xs"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/oxford/latex/to.xsl b/profiles/oxford/latex/to.xsl
index fa3547a00..f45d72289 100644
--- a/profiles/oxford/latex/to.xsl
+++ b/profiles/oxford/latex/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei m teix"
-    version="2.0">
+    version="3.0">
   <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/oxford/p4/from.xsl b/profiles/oxford/p4/from.xsl
index c14f82b0e..63cd8cece 100644
--- a/profiles/oxford/p4/from.xsl
+++ b/profiles/oxford/p4/from.xsl
@@ -3,7 +3,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:tei="http://www.tei-c.org/ns/1.0" 
     xmlns="http://www.tei-c.org/ns/1.0"
-    version="2.0">
+    version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
 
diff --git a/profiles/oxford/pdf/to.xsl b/profiles/oxford/pdf/to.xsl
index 0c7d0d761..062acc202 100644
--- a/profiles/oxford/pdf/to.xsl
+++ b/profiles/oxford/pdf/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../latex/to.xsl"/>
diff --git a/profiles/oxford/slides/to.xsl b/profiles/oxford/slides/to.xsl
index b538fc959..5553bb59c 100644
--- a/profiles/oxford/slides/to.xsl
+++ b/profiles/oxford/slides/to.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:tei="http://www.tei-c.org/ns/1.0" 
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../slides/teilatex-slides.xsl"/>
diff --git a/profiles/readme/html/to.xsl b/profiles/readme/html/to.xsl
index 56b72cfd4..52bdeda94 100644
--- a/profiles/readme/html/to.xsl
+++ b/profiles/readme/html/to.xsl
@@ -6,7 +6,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="#all"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
   
   <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/readme/txt/to.xsl b/profiles/readme/txt/to.xsl
index f593c4490..92749ad38 100644
--- a/profiles/readme/txt/to.xsl
+++ b/profiles/readme/txt/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
     <xsl:import href="../../../txt/tei-to-text.xsl"/>
 
diff --git a/profiles/saxonce/html/to.xsl b/profiles/saxonce/html/to.xsl
index 267de1bba..9e3325df6 100644
--- a/profiles/saxonce/html/to.xsl
+++ b/profiles/saxonce/html/to.xsl
@@ -10,7 +10,7 @@
 		xmlns:tei="http://www.tei-c.org/ns/1.0" 
 		xmlns:rng="http://relaxng.org/ns/structure/1.0"
 		exclude-result-prefixes="#all"
-		version="2.0">
+		version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/sciencejournal/docx/from.xsl b/profiles/sciencejournal/docx/from.xsl
index 43ab8ed2f..f276489af 100644
--- a/profiles/sciencejournal/docx/from.xsl
+++ b/profiles/sciencejournal/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
     <!-- import base conversion style -->
 
diff --git a/profiles/sciencejournal/docx/to.xsl b/profiles/sciencejournal/docx/to.xsl
index b0b783157..2684bb5cd 100644
--- a/profiles/sciencejournal/docx/to.xsl
+++ b/profiles/sciencejournal/docx/to.xsl
@@ -20,7 +20,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
     <xsl:import href="../../default/docx/to.xsl"/>
diff --git a/profiles/sciencejournal/epub/to.xsl b/profiles/sciencejournal/epub/to.xsl
index ff478dbf8..1421e88fe 100644
--- a/profiles/sciencejournal/epub/to.xsl
+++ b/profiles/sciencejournal/epub/to.xsl
@@ -13,7 +13,7 @@
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 exclude-result-prefixes="tei html t a rng iso tbx
 					 cals xlink teix"
-                version="2.0">
+                version="3.0">
     <xsl:import href="../../../epub/tei-to-epub.xsl"/>
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
diff --git a/profiles/sciencejournal/html/to.xsl b/profiles/sciencejournal/html/to.xsl
index a87ae6d77..e7f45a48d 100644
--- a/profiles/sciencejournal/html/to.xsl
+++ b/profiles/sciencejournal/html/to.xsl
@@ -6,7 +6,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html xs"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/sciencejournal/latex/to.xsl b/profiles/sciencejournal/latex/to.xsl
index fd456d469..d45fc257e 100644
--- a/profiles/sciencejournal/latex/to.xsl
+++ b/profiles/sciencejournal/latex/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/simple/docx/from.xsl b/profiles/simple/docx/from.xsl
index 644c6d8a3..373512338 100644
--- a/profiles/simple/docx/from.xsl
+++ b/profiles/simple/docx/from.xsl
@@ -19,7 +19,7 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:mml="http://www.w3.org/1998/Math/MathML"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx pic rel a         tei teidocx xs iso">
     <!-- import base conversion style -->
 
diff --git a/profiles/tcp/epub/to.xsl b/profiles/tcp/epub/to.xsl
index 3fb730255..27b54ed0d 100644
--- a/profiles/tcp/epub/to.xsl
+++ b/profiles/tcp/epub/to.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:t="http://www.thaiopensource.com/ns/annotations" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" exclude-result-prefixes="#all" version="2.0">
+<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:t="http://www.thaiopensource.com/ns/annotations" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" exclude-result-prefixes="#all" version="3.0">
   <xsl:import href="../../../epub/tei-to-epub.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
diff --git a/profiles/tcp/html/to.xsl b/profiles/tcp/html/to.xsl
index 6c56d0bda..2672357ae 100644
--- a/profiles/tcp/html/to.xsl
+++ b/profiles/tcp/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/tcp/html5/to.xsl b/profiles/tcp/html5/to.xsl
deleted file mode 120000
index d24029e0e..000000000
--- a/profiles/tcp/html5/to.xsl
+++ /dev/null
@@ -1 +0,0 @@
-../html/to.xsl
\ No newline at end of file
diff --git a/profiles/tcp/html5/to.xsl b/profiles/tcp/html5/to.xsl
new file mode 100644
index 000000000..2672357ae
--- /dev/null
+++ b/profiles/tcp/html5/to.xsl
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:tei="http://www.tei-c.org/ns/1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    exclude-result-prefixes="tei"
+    version="3.0">
+    <!-- import base conversion style -->
+
+    <xsl:import href="../../../html/html.xsl"/>
+
+  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
+      <desc>
+
+         <p>This software is dual-licensed:
+
+1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
+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
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+This software is provided by the copyright holders and contributors
+"as is" and any express or implied warranties, including, but not
+limited to, the implied warranties of merchantability and fitness for
+a particular purpose are disclaimed. In no event shall the copyright
+holder or contributors be liable for any direct, indirect, incidental,
+special, exemplary, or consequential damages (including, but not
+limited to, procurement of substitute goods or services; loss of use,
+data, or profits; or business interruption) however caused and on any
+theory of liability, whether in contract, strict liability, or tort
+(including negligence or otherwise) arising in any way out of the use
+of this software, even if advised of the possibility of such damage.
+</p>
+         <p>Author: See AUTHORS</p>
+         
+         <p>Copyright: 2013, TEI Consortium</p>
+      </desc>
+   </doc>
+
+   <xsl:output method="xhtml" omit-xml-declaration="yes"
+	       encoding="utf-8"/>
+
+   <xsl:param name="pageLayout">Complex</xsl:param>
+    <xsl:param name="autoToc">true</xsl:param>
+    <xsl:param name="cssFile">../tcp.css</xsl:param>
+    <xsl:param name="footnoteBackLink">true</xsl:param>
+    <xsl:param name="homeURL">http://www.ota.ox.ac.uk/tcp/</xsl:param>
+    <xsl:param name="htmlTitlePrefix">[TCP] </xsl:param>
+    <xsl:param name="institution">Text Creation Partnership EEBO, ECCO and Evans texts</xsl:param>
+    <xsl:param name="numberBackHeadings"></xsl:param>
+    <xsl:param name="numberFigures">false</xsl:param>
+    <xsl:param name="numberFrontHeadings"></xsl:param>
+    <xsl:param name="numberHeadings">false</xsl:param>
+    <xsl:param name="numberHeadingsDepth">-1</xsl:param>
+    <xsl:param name="numberTables">false</xsl:param>
+    <xsl:param name="pagebreakStyle">visible</xsl:param>
+    <xsl:param name="parentURL">http://www.textcreationpartnership.org/tcp-eebo/</xsl:param>
+    <xsl:param name="parentWords">Text Creation Partnership</xsl:param>
+    <xsl:param name="publisher">University of Oxford TCP</xsl:param>
+    <xsl:param name="showTitleAuthor">true</xsl:param>
+    <xsl:param name="sort">author</xsl:param>
+    <xsl:param name="splitLevel">-1</xsl:param>
+    <xsl:param name="subject">University of Oxford TCP</xsl:param>
+    <xsl:param name="treestyle">d3VerticalTree</xsl:param>
+    <xsl:param name="generationComment">false</xsl:param>
+    <xsl:param name="separator"> | </xsl:param>
+
+  <xsl:template name="mainPage">
+    <xsl:param name="currentID"/>
+    <div class="show-all" id="main">
+      <!-- header -->
+
+      <div id="hdr" class="stdheader">
+        <xsl:call-template name="hdr"/>
+	<xsl:call-template name="makeHTMLHeading">
+	  <xsl:with-param name="class">author</xsl:with-param>
+	  <xsl:with-param name="text">
+	    <xsl:call-template name="generateAuthorList"/>
+	    <xsl:sequence select="tei:generateDate(.)"/>
+	    <xsl:sequence select="tei:generateEdition(.)"/>
+	  </xsl:with-param>
+	</xsl:call-template>
+      </div>
+
+      <div id="main-menu">
+	<p><i>University of     <span class="bold">O</span>xford 
+      <span class="bold">T</span>ext 
+      <span class="bold">A</span>rchive</i></p>
+      <ul class="OTAnav">
+        <li class="navLink"><a    href="http://www.ota.ox.ac.uk/">Home</a> | 	</li>
+	<li class="navLink"><a href="http://www.ota.ox.ac.uk/tcp">OTA TCP Catalogue</a>	| </li>
+	<li class="navlink"><a href="http://www.textcreationpartnership.org/tcp-eebo/">Text
+	Creation Partnership</a></li>
+      </ul><hr/>
+	<xsl:call-template name="mainTOC"/>
+	<hr/>
+	<p class="small">This material was created by the Text Creation Partnership in partnership with ProQuest's Early English Books Online, Gale Cengage's Eighteenth Century Collections Online, and Readex's Evans Early American Imprints.</p>
+      </div>
+
+
+      <div id="onecol" class="main-content">
+	<xsl:call-template name="mainFrame">
+	  <xsl:with-param name="currentID" select="$currentID"/>
+	  <xsl:with-param name="minimal">true</xsl:with-param>
+	</xsl:call-template>
+
+	<div class="stdfooter">
+	  <xsl:apply-templates select="/*/tei:teiHeader/tei:fileDesc/tei:publicationStmt/tei:availability/*"/>
+	</div>
+      </div>
+
+
+      <div class="clear" id="em"/>
+    </div>
+
+
+  </xsl:template>
+
+
+
+  <xsl:template match="tei:body/tei:lb"/>
+
+  <xsl:template match="tei:div/tei:lb"/>
+
+   <xsl:template match="tei:titlePart" mode="simple">
+      <xsl:if test="preceding-sibling::tei:titlePart">
+         <br/>
+      </xsl:if>
+      <xsl:value-of select="."/>
+   </xsl:template>
+
+
+  <xsl:function name="tei:escapeChars" as="xs:string">
+    <xsl:param name="letters"/>
+    <xsl:param name="context"/>
+    <xsl:value-of select="translate($letters,'ſ','s')"/>
+  </xsl:function>
+
+</xsl:stylesheet>
diff --git a/profiles/tei/docx/from.xsl b/profiles/tei/docx/from.xsl
index 32f41f1c9..b62c383d4 100644
--- a/profiles/tei/docx/from.xsl
+++ b/profiles/tei/docx/from.xsl
@@ -19,7 +19,7 @@
 		xmlns:html="http://www.w3.org/1999/xhtml"
 		xmlns:its="http://www.w3.org/2005/11/its"
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp html its w10 w wne mml tbx iso">
     <!-- import base conversion style -->
 
diff --git a/profiles/tei/docx/to.xsl b/profiles/tei/docx/to.xsl
index 1be490543..bf153baad 100644
--- a/profiles/tei/docx/to.xsl
+++ b/profiles/tei/docx/to.xsl
@@ -19,7 +19,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
 
diff --git a/profiles/tei/dtd/to.xsl b/profiles/tei/dtd/to.xsl
index 710bde53d..b05500bf3 100644
--- a/profiles/tei/dtd/to.xsl
+++ b/profiles/tei/dtd/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../odds/odd2dtd.xsl"/>
diff --git a/profiles/tei/epub/to.xsl b/profiles/tei/epub/to.xsl
index 1c780f2d7..f63ac7541 100644
--- a/profiles/tei/epub/to.xsl
+++ b/profiles/tei/epub/to.xsl
@@ -10,7 +10,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink" 
     xmlns:xs="http://www.w3.org/2001/XMLSchema" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    exclude-result-prefixes="xlink rng tei teix xhtml a html xs xsl" version="2.0">
+    exclude-result-prefixes="xlink rng tei teix xhtml a html xs xsl" version="3.0">
 
   <xsl:import href="../../../epub/tei-to-epub.xsl"/>
   <xsl:import href="../../../odds/teiodds.xsl"/>
diff --git a/profiles/tei/epub3/to.xsl b/profiles/tei/epub3/to.xsl
index 62efed4b8..d433b06dc 100644
--- a/profiles/tei/epub3/to.xsl
+++ b/profiles/tei/epub3/to.xsl
@@ -10,7 +10,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink" 
     xmlns:xs="http://www.w3.org/2001/XMLSchema" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    exclude-result-prefixes="xlink rng tei teix xhtml a html xs xsl" version="2.0">
+    exclude-result-prefixes="xlink rng tei teix xhtml a html xs xsl" version="3.0">
 
   <xsl:import href="../../../epub3/tei-to-epub3.xsl"/>
   <xsl:import href="../../../odds/teiodds.xsl"/>
diff --git a/profiles/tei/fo/to.xsl b/profiles/tei/fo/to.xsl
index 66b64effc..0503fda6f 100644
--- a/profiles/tei/fo/to.xsl
+++ b/profiles/tei/fo/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../fo/fo.xsl"/>
diff --git a/profiles/tei/html/to.xsl b/profiles/tei/html/to.xsl
index 6e0211225..f23215704 100644
--- a/profiles/tei/html/to.xsl
+++ b/profiles/tei/html/to.xsl
@@ -5,7 +5,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:skos="http://www.w3.org/2004/02/skos/core#"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../html/html.xsl"/>
diff --git a/profiles/tei/html5/to.xsl b/profiles/tei/html5/to.xsl
deleted file mode 120000
index d24029e0e..000000000
--- a/profiles/tei/html5/to.xsl
+++ /dev/null
@@ -1 +0,0 @@
-../html/to.xsl
\ No newline at end of file
diff --git a/profiles/tei/html5/to.xsl b/profiles/tei/html5/to.xsl
new file mode 100644
index 000000000..f23215704
--- /dev/null
+++ b/profiles/tei/html5/to.xsl
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet 
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns:tei="http://www.tei-c.org/ns/1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:skos="http://www.w3.org/2004/02/skos/core#"
+    exclude-result-prefixes="tei html"
+    version="3.0">
+    <!-- import base conversion style -->
+
+    <xsl:import href="../../../html/html.xsl"/>
+    <xsl:import href="../../../html/microdata.xsl"/>
+
+  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
+      <desc>
+
+         <p>This software is dual-licensed:
+
+1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
+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
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+This software is provided by the copyright holders and contributors
+"as is" and any express or implied warranties, including, but not
+limited to, the implied warranties of merchantability and fitness for
+a particular purpose are disclaimed. In no event shall the copyright
+holder or contributors be liable for any direct, indirect, incidental,
+special, exemplary, or consequential damages (including, but not
+limited to, procurement of substitute goods or services; loss of use,
+data, or profits; or business interruption) however caused and on any
+theory of liability, whether in contract, strict liability, or tort
+(including negligence or otherwise) arising in any way out of the use
+of this software, even if advised of the possibility of such damage.
+</p>
+         <p>Author: See AUTHORS</p>
+         
+         <p>Copyright: 2013, TEI Consortium</p>
+      </desc>
+   </doc>
+
+  <xsl:param name="splitLevel">-1</xsl:param>
+  
+<!--  Default behaviour concerning CSS files is the same as in previous HTML5 output
+  transformation, this is, a link to the file “tei.css”. To change this behaviour and include internal CSS instead
+  (as it was the default in HTML output), declare both the "cssFile" and "cssInlineFile" parameters. — hsb, 2021-09-05 -->
+  
+  <!--<xsl:param name="cssFile"></xsl:param>-->
+  <!--<xsl:param name="cssInlineFiles">../tei.css ../odd.css</xsl:param>-->
+  <xsl:param name="institution"></xsl:param>
+  <xsl:param name="feedbackURL"/>
+  <xsl:param name="searchURL"/>
+  <xsl:template name="copyrightStatement"></xsl:template>
+  <xsl:param name="parentURL">https://www.tei-c.org/</xsl:param>
+  <xsl:param name="parentWords">TEI</xsl:param>
+
+
+  <xsl:template match="skos:exactMatch">
+    <tt>'<xsl:value-of select="."/>'</tt>
+  </xsl:template>
+  
+  <xsl:template match="tei:valItem">
+    <tr>
+      <td><xsl:sequence select="tei:showMode(@ident,@mode)"/>
+        <xsl:if test="tei:paramList">
+          <xsl:text> (</xsl:text>
+          <xsl:value-of select="tei:paramList/tei:paramSpec/@ident" separator=","/>
+          <xsl:text>)</xsl:text>
+        </xsl:if>
+      </td>
+      <td><xsl:value-of select="tei:desc"/>
+        <xsl:if test="skos:exactMatch">
+          [also   <xsl:apply-templates select="skos:exactMatch"/>]
+        </xsl:if>
+      </td>
+    </tr>
+  </xsl:template>
+  
+  <xsl:template match="tei:att">
+    <span>
+      <xsl:call-template name="makeRendition"/>
+      <xsl:apply-templates/>
+    </span>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/profiles/tei/latex/to.xsl b/profiles/tei/latex/to.xsl
index 1d0e26079..d073d1198 100644
--- a/profiles/tei/latex/to.xsl
+++ b/profiles/tei/latex/to.xsl
@@ -4,7 +4,7 @@
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="tei m"
-                version="2.0">
+                version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../latex/latex.xsl"/>
diff --git a/profiles/tei/odt/from.xsl b/profiles/tei/odt/from.xsl
index 2be3096e3..c42118533 100644
--- a/profiles/tei/odt/from.xsl
+++ b/profiles/tei/odt/from.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
 		>
     <!-- import base conversion style -->
 
diff --git a/profiles/tei/odt/to.xsl b/profiles/tei/odt/to.xsl
index 5cfc4381b..d291aa31b 100644
--- a/profiles/tei/odt/to.xsl
+++ b/profiles/tei/odt/to.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
-                version="2.0"
+                version="3.0"
 		>
     <!-- import base conversion style -->
 
diff --git a/profiles/tei/rdf/to.xsl b/profiles/tei/rdf/to.xsl
index 93c1487b9..b4c268600 100644
--- a/profiles/tei/rdf/to.xsl
+++ b/profiles/tei/rdf/to.xsl
@@ -4,7 +4,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="tei html"
-    version="2.0">
+    version="3.0">
     <!-- import base conversion style -->
 
     <xsl:import href="../../../rdf/tei2rdf.xsl"/>
diff --git a/profiles/tei/rng/to.xsl b/profiles/tei/rng/to.xsl
index c7f8f9670..a9ad07304 100644
--- a/profiles/tei/rng/to.xsl
+++ b/profiles/tei/rng/to.xsl
@@ -12,7 +12,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     exclude-result-prefixes="a fo html i rng sch tei teix xi xs xsl"
-                version="2.0">
+                version="3.0">
 
     <!-- import base conversion style -->
 
diff --git a/profiles/tei/slides/to.xsl b/profiles/tei/slides/to.xsl
index e155d06a7..8dea27d8c 100644
--- a/profiles/tei/slides/to.xsl
+++ b/profiles/tei/slides/to.xsl
@@ -1,5 +1,5 @@
 <xsl:stylesheet
-    version="2.0"
+    version="3.0"
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:teix="http://www.tei-c.org/ns/Examples"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
diff --git a/profiles/teikindle/epub/to.xsl b/profiles/teikindle/epub/to.xsl
index 9d51b1d09..a0b5acf02 100644
--- a/profiles/teikindle/epub/to.xsl
+++ b/profiles/teikindle/epub/to.xsl
@@ -10,7 +10,7 @@
     xmlns:xlink="http://www.w3.org/1999/xlink" 
     xmlns:xs="http://www.w3.org/2001/XMLSchema" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    exclude-result-prefixes="xlink rng tei teix xhtml a html xs xsl" version="2.0">
+    exclude-result-prefixes="xlink rng tei teix xhtml a html xs xsl" version="3.0">
 
   <xsl:import href="../../../epub/tei-to-epub.xsl"/>
   <xsl:import href="../../../odds/teiodds.xsl"/>
diff --git a/profiles/transcription/docx/from.xsl b/profiles/transcription/docx/from.xsl
index 4a45d2a80..48ea81b45 100644
--- a/profiles/transcription/docx/from.xsl
+++ b/profiles/transcription/docx/from.xsl
@@ -20,7 +20,7 @@
                 xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"                
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="#all">
 
     <!-- import default conversion style -->
diff --git a/profiles/transcription/docx/to.xsl b/profiles/transcription/docx/to.xsl
index 0be68eacf..b607a71f8 100644
--- a/profiles/transcription/docx/to.xsl
+++ b/profiles/transcription/docx/to.xsl
@@ -21,7 +21,7 @@
                 xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture"
                 
                 xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="teix ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn tei teidocx">
     <!-- import conversion style -->
     <xsl:import href="../../default/docx/to.xsl"/>
diff --git a/rdf/crm.xsl b/rdf/crm.xsl
index e832173d0..9d8c2f323 100644
--- a/rdf/crm.xsl
+++ b/rdf/crm.xsl
@@ -9,7 +9,7 @@
     xmlns:owl="http://www.w3.org/2002/07/owl#" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0" 
+    version="3.0" 
     xpath-default-namespace="http://www.tei-c.org/ns/1.0" 
     exclude-result-prefixes="tei rdf rdfs owl xsd crm xsl xs">
   
diff --git a/rdf/dc.xsl b/rdf/dc.xsl
index 90a75329b..4a7686dde 100644
--- a/rdf/dc.xsl
+++ b/rdf/dc.xsl
@@ -9,7 +9,7 @@
     xmlns:owl="http://www.w3.org/2002/07/owl#" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0" 
+    version="3.0" 
     xpath-default-namespace="http://www.tei-c.org/ns/1.0" 
     exclude-result-prefixes="dc tei rdf rdfs owl xsd xsl xs">
   
diff --git a/rdf/make-acdc.xsl b/rdf/make-acdc.xsl
index 1510cc06b..ac1effaad 100644
--- a/rdf/make-acdc.xsl
+++ b/rdf/make-acdc.xsl
@@ -5,7 +5,7 @@
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
     xmlns:tei="http://www.tei-c.org/ns/1.0" 
     exclude-result-prefixes="tei rdf"
-    version="2.0"
+    version="3.0"
 >
 
 
@@ -39,7 +39,7 @@
   <XSL:template match="/">
   
 
-  <xsl:stylesheet version="2.0"
+  <xsl:stylesheet version="3.0"
 		  xpath-default-namespace="http://www.tei-c.org/ns/1.0"
 		  xmlns:XSL="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/rdf/tei2rdf.xsl b/rdf/tei2rdf.xsl
index 8c3fc7d5d..d7b523ac2 100644
--- a/rdf/tei2rdf.xsl
+++ b/rdf/tei2rdf.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <XSL:stylesheet xmlns:XSL="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 xpath-default-namespace="http://www.tei-c.org/ns/1.0">
    <XSL:import href="../tools/getfiles.xsl"/>
    <XSL:import href="crm.xsl"/>
diff --git a/simple/mapatts.xsl b/simple/mapatts.xsl
index 1414c46d1..68f7103d4 100644
--- a/simple/mapatts.xsl
+++ b/simple/mapatts.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XSL:stylesheet xmlns:XSL="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<XSL:stylesheet xmlns:XSL="http://www.w3.org/1999/XSL/Transform" version="3.0">
    <XSL:template mode="pass2 #default" match="@place">
       <XSL:attribute name="place">
          <XSL:choose>
diff --git a/simple/teitosimple.xsl b/simple/teitosimple.xsl
index df145dec1..677fd4d6d 100644
--- a/simple/teitosimple.xsl
+++ b/simple/teitosimple.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0"
-    xmlns:tei="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="tei xs" version="2.0"
+    xmlns:tei="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="tei xs" version="3.0"
     xpath-default-namespace="http://www.tei-c.org/ns/1.0">
 
   <xsl:include href="mapatts.xsl"/>
diff --git a/slides/slides.xsl b/slides/slides.xsl
index 88863ab85..70f41db89 100644
--- a/slides/slides.xsl
+++ b/slides/slides.xsl
@@ -9,7 +9,7 @@
                 xmlns:m="http://www.w3.org/1998/Math/MathML"
                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="tei xlink xhtml m"
-                version="2.0">
+                version="3.0">
    
 
   <xsl:strip-space elements="teix:* rng:* xsl:* xhtml:* atom:* m:*"/>
diff --git a/slides/teihtml-slides.xsl b/slides/teihtml-slides.xsl
index aab27417d..5841e81b2 100644
--- a/slides/teihtml-slides.xsl
+++ b/slides/teihtml-slides.xsl
@@ -9,7 +9,7 @@
                 xmlns:m="http://www.w3.org/1998/Math/MathML"
                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
                 exclude-result-prefixes="tei xlink xhtml m"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../html/html.xsl"/>
 
   <xsl:strip-space elements="teix:* rng:* xsl:* xhtml:* atom:* m:*"/>
diff --git a/slides/teilatex-slides.xsl b/slides/teilatex-slides.xsl
index 6de5a1a7c..fecc65d71 100644
--- a/slides/teilatex-slides.xsl
+++ b/slides/teilatex-slides.xsl
@@ -47,7 +47,7 @@ XSL LaTeX stylesheet to make slides
                 xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                 xmlns:map="http://apache.org/cocoon/sitemap/1.0"
                 exclude-result-prefixes="a map atom xhtml teix tei xsl rng"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../latex/latex.xsl"/>
   <xsl:strip-space elements="teix:* rng:* xsl:* xhtml:* atom:*"/>
   <xsl:output method="text" encoding="utf-8"/>
diff --git a/tbx/teitotbx.xsl b/tbx/teitotbx.xsl
index 3d9f386d3..9170d632a 100644
--- a/tbx/teitotbx.xsl
+++ b/tbx/teitotbx.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html"
     exclude-result-prefixes="tei tbx">
diff --git a/tcp/tcp2tei.xsl b/tcp/tcp2tei.xsl
index 841e772bc..1499073b1 100644
--- a/tcp/tcp2tei.xsl
+++ b/tcp/tcp2tei.xsl
@@ -3,7 +3,7 @@
 $Date$ $Author$
 
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="tei" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" exclude-result-prefixes="tei" version="3.0">
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
     <desc>
       <p>XSLT script for cleaning up ECCO texts TEI P5 conversion</p>
diff --git a/tite/tite-to-tei.xsl b/tite/tite-to-tei.xsl
index 20bb91eb8..8d6af35ed 100644
--- a/tite/tite-to-tei.xsl
+++ b/tite/tite-to-tei.xsl
@@ -3,7 +3,7 @@
                 xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:tei="http://www.tei-c.org/ns/1.0"
 		exclude-result-prefixes="tei"
-		version="2.0"
+		version="3.0"
 		xpath-default-namespace="http://www.tei-c.org/ns/tite/1.0">
 
    <xsl:output cdata-section-elements="eg"/>
diff --git a/tools/getfiles.xsl b/tools/getfiles.xsl
index 2decaeff8..3f66d4bb4 100644
--- a/tools/getfiles.xsl
+++ b/tools/getfiles.xsl
@@ -9,7 +9,7 @@
 <xsl:stylesheet xmlns:n="www.example.com" xmlns:tei="http://www.tei-c.org/ns/1.0"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="n tei xs">
 
   <xsl:param name="debug">false</xsl:param>
diff --git a/tools/getnames.xsl b/tools/getnames.xsl
index a710d7627..720fc5908 100644
--- a/tools/getnames.xsl
+++ b/tools/getnames.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns="http://www.tei-c.org/ns/1.0"
 		xpath-default-namespace="http://www.tei-c.org/ns/1.0"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="2.0">
+		version="3.0">
 <!--
 This software is dual-licensed:
 
diff --git a/tools/iden.xsl b/tools/iden.xsl
index 4eabea637..cd0b73a70 100644
--- a/tools/iden.xsl
+++ b/tools/iden.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet xmlns="http://www.tei-c.org/ns/1.0"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="2.0">
+		version="3.0">
 <!--
 This software is dual-licensed:
 
diff --git a/tools/makegraphicsanttask.xsl b/tools/makegraphicsanttask.xsl
index eb757748f..4aca64f95 100644
--- a/tools/makegraphicsanttask.xsl
+++ b/tools/makegraphicsanttask.xsl
@@ -3,7 +3,7 @@
 		xmlns:teix="http://www.tei-c.org/ns/Examples"
 		xmlns:smil="http://www.w3.org/ns/SMIL"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   <xsl:import href="../common/functions.xsl"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
       <desc>
diff --git a/tools/odd-to-csv.xsl b/tools/odd-to-csv.xsl
index 4958df146..c53dd1029 100644
--- a/tools/odd-to-csv.xsl
+++ b/tools/odd-to-csv.xsl
@@ -6,7 +6,7 @@
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     exclude-result-prefixes="rng tei"
-    version="2.0">
+    version="3.0">
   <xsl:import href="../common/functions.xsl"/>
   <xsl:output method="text"/>
   <xsl:param name="module"/>
diff --git a/tools/odd-to-tree.xsl b/tools/odd-to-tree.xsl
index edaf51e36..4cd6ee18b 100644
--- a/tools/odd-to-tree.xsl
+++ b/tools/odd-to-tree.xsl
@@ -4,7 +4,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
-    version="2.0">
+    version="3.0">
   <xsl:import href="../common/functions.xsl"/>
   <xsl:param name="method">modules</xsl:param>
   <xsl:param name="minimal">false</xsl:param>
diff --git a/tools/odd2nuodd.xsl b/tools/odd2nuodd.xsl
index 591b8580a..c2152bc58 100644
--- a/tools/odd2nuodd.xsl
+++ b/tools/odd2nuodd.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0" 
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xpath-default-namespace="http://www.tei-c.org/ns/1.0"
 	xmlns="http://www.tei-c.org/ns/1.0"
diff --git a/tools/oddbyexample.xsl b/tools/oddbyexample.xsl
index 7aa9552be..c130f269d 100644
--- a/tools/oddbyexample.xsl
+++ b/tools/oddbyexample.xsl
@@ -10,7 +10,7 @@
   xmlns:n="www.example.com" xmlns:rng="http://relaxng.org/ns/structure/1.0"
   xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns="http://www.tei-c.org/ns/1.0"
   exclude-result-prefixes="rng tei n"
-  xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="2.0">
+  xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="3.0">
   <!--
 This software is dual-licensed:
 
diff --git a/tools/processpb.xsl b/tools/processpb.xsl
index c6bb4f099..5a1afd430 100644
--- a/tools/processpb.xsl
+++ b/tools/processpb.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns="http://www.tei-c.org/ns/1.0"
 		xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xpath-default-namespace="http://www.tei-c.org/ns/1.0"
-		version="2.0">
+		version="3.0">
 <!--
 This software is dual-licensed:
 
diff --git a/tools/tei-to-tree.xsl b/tools/tei-to-tree.xsl
index 0a3e3abe2..43ff12bba 100644
--- a/tools/tei-to-tree.xsl
+++ b/tools/tei-to-tree.xsl
@@ -3,7 +3,7 @@
     xmlns="http://www.tei-c.org/ns/1.0" 
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
-    version="2.0">
+    version="3.0">
   <xsl:output indent="no"/>
   <xsl:variable name="What">//*</xsl:variable>
   <xsl:variable name="special-nodes" select="//*"/>
diff --git a/tools/timing-profile.xsl b/tools/timing-profile.xsl
index e342f2a58..615c1da9e 100644
--- a/tools/timing-profile.xsl
+++ b/tools/timing-profile.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:transform version="2.0"
+<xsl:transform version="3.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:strip-space elements="*"/>
diff --git a/txt/tei-to-text.xsl b/txt/tei-to-text.xsl
index 77ee33cad..17029c807 100644
--- a/txt/tei-to-text.xsl
+++ b/txt/tei-to-text.xsl
@@ -4,7 +4,7 @@
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
+    version="3.0">
   <xsl:import href="../common/functions.xsl"/>
 
  <xsl:strip-space elements="tei:additional tei:address tei:adminInfo
diff --git a/verbatimxml/teitoverbatim.xsl b/verbatimxml/teitoverbatim.xsl
index 2a9d902ba..ba202d79e 100644
--- a/verbatimxml/teitoverbatim.xsl
+++ b/verbatimxml/teitoverbatim.xsl
@@ -3,7 +3,7 @@
     xmlns="http://www.tei-c.org/ns/1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
     xpath-default-namespace="http://www.tei-c.org/ns/1.0"
-    version="2.0">
+    version="3.0">
 
   <xsl:template match="/">
     <TEI xmlns="http://www.tei-c.org/ns/1.0">
diff --git a/wordpress/wordpress-to-tei.xsl b/wordpress/wordpress-to-tei.xsl
index b0008f4e5..50d0fff40 100644
--- a/wordpress/wordpress-to-tei.xsl
+++ b/wordpress/wordpress-to-tei.xsl
@@ -10,7 +10,7 @@
     xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns="http://www.tei-c.org/ns/1.0"
 xmlns:html="http://www.tei-c.org/ns/1.0"
-version="2.0" exclude-result-prefixes="#all">
+version="3.0" exclude-result-prefixes="#all">
   <xsl:variable name="allowedtags">
     <address/>
     <blockquote/>
diff --git a/xlsx/xlsxtotei.xsl b/xlsx/xlsxtotei.xsl
index 7f64f82de..8fb0655f5 100644
--- a/xlsx/xlsxtotei.xsl
+++ b/xlsx/xlsxtotei.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns="http://www.tei-c.org/ns/1.0"
+<xsl:stylesheet version="3.0" xmlns="http://www.tei-c.org/ns/1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
   xmlns:rels="http://schemas.openxmlformats.org/package/2006/relationships"
diff --git a/xsd/postprocess.xsl b/xsd/postprocess.xsl
index fb8ad2d68..ea7ebb33f 100644
--- a/xsd/postprocess.xsl
+++ b/xsd/postprocess.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:tei="http://www.tei-c.org/ns/1.0"
-  version="2.0">
+  version="3.0">
   
   <xsl:strip-space elements="*"/>
   <xsl:output indent="yes"/>

From bc85cb4a9b6ba8b5adc79ca492cf5c41eaba0fed Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Mon, 20 Nov 2023 17:07:33 -0500
Subject: [PATCH 19/50] Set application/@version to a placeholder value before
 comparing

---
 Test/cleanup.pl                               |  1 +
 Test/expected-results/hyperlinktest.xml       |  2 +-
 Test/expected-results/test-indexes.xml        |  2 +-
 Test/expected-results/test-rtf2tei.xml        |  2 +-
 Test/expected-results/test11.xml              |  2 +-
 Test/expected-results/test11a.xml             |  2 +-
 Test/expected-results/test18.xml              |  2 +-
 Test/expected-results/test19.xml              |  2 +-
 Test/expected-results/test29.xml              |  2 +-
 Test/expected-results/test37.xml              |  2 +-
 Test/expected-results/test39.xml              |  2 +-
 Test/expected-results/test40.xml              |  2 +-
 Test2/cleanForDiff.xsl                        | 20 +++++++++++++++++--
 Test2/expected-results/testDocxIndexes1.xml   |  4 +++-
 .../expected-results/testDocxListsTables1.xml |  4 +++-
 Test2/expected-results/testNotes2.xml         |  4 +++-
 Test2/expected-results/testShelfmarkMs.xml    |  4 +++-
 debian-tei-xsl/debian/changelog               |  6 ++++++
 18 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/Test/cleanup.pl b/Test/cleanup.pl
index 02137d90d..3d74ee1ce 100644
--- a/Test/cleanup.pl
+++ b/Test/cleanup.pl
@@ -6,5 +6,6 @@
   s/SAXON HE 9.*//;
   s/XSLT stylesheets version [1-9].*//;
   s/on 20[0-9][0-9].[0-9][0-9].[0-9][0-9]T.*Z\.?//;
+  s/(<application.*version\s*=\s*)['"][0-9.a-z]+['"]/$1"9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22"/;
   print;
 }
diff --git a/Test/expected-results/hyperlinktest.xml b/Test/expected-results/hyperlinktest.xml
index 332d4b844..edb06a246 100644
--- a/Test/expected-results/hyperlinktest.xml
+++ b/Test/expected-results/hyperlinktest.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test-indexes.xml b/Test/expected-results/test-indexes.xml
index 6261ae688..cab57cdb8 100644
--- a/Test/expected-results/test-indexes.xml
+++ b/Test/expected-results/test-indexes.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test-rtf2tei.xml b/Test/expected-results/test-rtf2tei.xml
index 2a985ddad..c19b40ace 100644
--- a/Test/expected-results/test-rtf2tei.xml
+++ b/Test/expected-results/test-rtf2tei.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test11.xml b/Test/expected-results/test11.xml
index 1a9ea462b..9e3f39434 100644
--- a/Test/expected-results/test11.xml
+++ b/Test/expected-results/test11.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test11a.xml b/Test/expected-results/test11a.xml
index c1f022f6a..d99161e5c 100644
--- a/Test/expected-results/test11a.xml
+++ b/Test/expected-results/test11a.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test18.xml b/Test/expected-results/test18.xml
index 6747e0a01..0188c914b 100644
--- a/Test/expected-results/test18.xml
+++ b/Test/expected-results/test18.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test19.xml b/Test/expected-results/test19.xml
index 612383d06..c95c087bd 100644
--- a/Test/expected-results/test19.xml
+++ b/Test/expected-results/test19.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test29.xml b/Test/expected-results/test29.xml
index ad429bba2..9aceb7ed5 100644
--- a/Test/expected-results/test29.xml
+++ b/Test/expected-results/test29.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test37.xml b/Test/expected-results/test37.xml
index 48c8ee2fe..c566fb088 100644
--- a/Test/expected-results/test37.xml
+++ b/Test/expected-results/test37.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test39.xml b/Test/expected-results/test39.xml
index 145cf3565..f08132bc3 100644
--- a/Test/expected-results/test39.xml
+++ b/Test/expected-results/test39.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test/expected-results/test40.xml b/Test/expected-results/test40.xml
index b5ccec7be..44902fbb4 100644
--- a/Test/expected-results/test40.xml
+++ b/Test/expected-results/test40.xml
@@ -20,7 +20,7 @@
     </fileDesc>
     <encodingDesc>
       <appInfo>
-        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+        <application xml:id="docxtotei" ident="TEI_fromDOCX" version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
           <label>DOCX to TEI</label>
         </application>
       </appInfo>
diff --git a/Test2/cleanForDiff.xsl b/Test2/cleanForDiff.xsl
index 525545fc2..35c72ff40 100644
--- a/Test2/cleanForDiff.xsl
+++ b/Test2/cleanForDiff.xsl
@@ -30,6 +30,10 @@
                    
                 4. Remove any timestamps that are generated during processing, since
                    these will be different each time a test is run.
+
+		5. Remove the @version attribute of &lt;application> elements that have
+		   “tei” (case insensitive) in either their @xml:id or @ident attribute
+		   (per issue #646).
             </xd:p>
         </xd:desc>
     </xd:doc>
@@ -64,7 +68,19 @@
             <xsl:copy-of select="@*"/>
         </xsl:copy>
     </xsl:template>
-    
+
+<!--  And versions from <application>s we (probably) inserted. -->
+    <xsl:template match="tei:application[ matches( string-join( ( @xml:id, '␝', @ident ) ), 'tei', 'i') ]">
+        <!-- Note that any character legal in an XML attribute could
+	     be used to separate the @xml:id from the @ident, above,
+	     EXCEPT one of ‘t’, ‘T’, ‘e’, ‘E’, ‘i’, or ‘I’. -->
+        <xsl:copy>
+            <xsl:copy-of select="@* except @version"/>
+	    <xsl:attribute name="version" select="'9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22'"/>
+	    <xsl:apply-templates select="node()"/>
+        </xsl:copy>
+    </xsl:template>
+
 <!--  Default identity transform.  -->
     <xsl:template match="@* | node()" priority="-1" mode="#all">
         <xsl:copy>
@@ -72,4 +88,4 @@
         </xsl:copy>
     </xsl:template>
     
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/Test2/expected-results/testDocxIndexes1.xml b/Test2/expected-results/testDocxIndexes1.xml
index e450d2f10..bd24614f0 100644
--- a/Test2/expected-results/testDocxIndexes1.xml
+++ b/Test2/expected-results/testDocxIndexes1.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/Test2/expected-results/testDocxListsTables1.xml b/Test2/expected-results/testDocxListsTables1.xml
index c13431c07..656695824 100644
--- a/Test2/expected-results/testDocxListsTables1.xml
+++ b/Test2/expected-results/testDocxListsTables1.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/Test2/expected-results/testNotes2.xml b/Test2/expected-results/testNotes2.xml
index 0b4aca3cb..5289b99f5 100644
--- a/Test2/expected-results/testNotes2.xml
+++ b/Test2/expected-results/testNotes2.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/Test2/expected-results/testShelfmarkMs.xml b/Test2/expected-results/testShelfmarkMs.xml
index 1acd54972..f032134d6 100644
--- a/Test2/expected-results/testShelfmarkMs.xml
+++ b/Test2/expected-results/testShelfmarkMs.xml
@@ -19,7 +19,9 @@
       </fileDesc>
       <encodingDesc>
          <appInfo>
-            <application xml:id="docxtotei" ident="TEI_fromDOCX" version="7.57.0a">
+            <application xml:id="docxtotei"
+                         ident="TEI_fromDOCX"
+                         version="9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22">
                <label>DOCX to TEI</label>
             </application>
          </appInfo>
diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog
index 03dc8ade3..d7f5e948a 100644
--- a/debian-tei-xsl/debian/changelog
+++ b/debian-tei-xsl/debian/changelog
@@ -1,3 +1,9 @@
+tei-xsl (7.57.0a) natty; urgency=low
+
+  * new release from upstream
+
+ -- TEI                          <editors@www.tei-c.org>  Mon, 20 Nov 2023 15:40:30 -0500
+
 tei-xsl (7.56.0a) natty; urgency=low
 
   * new release from upstream

From fce000828852523c1c925d10ca3286481756ae71 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Wed, 29 Nov 2023 16:59:39 -0500
Subject: [PATCH 20/50] Address #598: Only check for FPIs in ident elements,
 not altIdent elements

---
 Test2/inputFiles/testNonTeiOdd1.odd | 4 ++--
 debian-tei-xsl/debian/changelog     | 6 ++++++
 odds/odd2dtd.xsl                    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Test2/inputFiles/testNonTeiOdd1.odd b/Test2/inputFiles/testNonTeiOdd1.odd
index c7f3186ab..b6b0bc576 100644
--- a/Test2/inputFiles/testNonTeiOdd1.odd
+++ b/Test2/inputFiles/testNonTeiOdd1.odd
@@ -32,12 +32,12 @@ schematypens="http://purl.oclc.org/dsdl/schematron"?>
         <schemaSpec ident="nonTeiOdd" start="div" ns="http://www.w3.org/1999/xhtml">
 
 	  <moduleSpec ident="NTO_heads">
-	    <altIdent type="FPI">Non TEI ODD Test, headings</altIdent>
+	    <ident type="FPI">Non TEI ODD Test, headings</ident>
 	    <desc>This module holds the heading elements of various levels</desc>
 	  </moduleSpec>
 
 	  <moduleSpec ident="NTO_lists">
-	    <altIdent type="FPI">Non TEI ODD Test, lists</altIdent>
+	    <ident type="FPI">Non TEI ODD Test, lists</ident>
 	    <desc>This module holds the elements for lists</desc>
 	  </moduleSpec>
 	  
diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog
index 03dc8ade3..e4dbfdc9f 100644
--- a/debian-tei-xsl/debian/changelog
+++ b/debian-tei-xsl/debian/changelog
@@ -1,3 +1,9 @@
+tei-xsl (7.57.0a) natty; urgency=low
+
+  * new release from upstream
+
+ -- TEI                          <editors@www.tei-c.org>  Wed, 29 Nov 2023 16:51:37 -0500
+
 tei-xsl (7.56.0a) natty; urgency=low
 
   * new release from upstream
diff --git a/odds/odd2dtd.xsl b/odds/odd2dtd.xsl
index cfa35de75..5724d55bb 100644
--- a/odds/odd2dtd.xsl
+++ b/odds/odd2dtd.xsl
@@ -206,7 +206,7 @@ of this software, even if advised of the possibility of such damage.
 	&lt;!ENTITY % file.</xsl:text>
             <xsl:value-of select="@ident"/>
             <xsl:text> PUBLIC '-//TEI P5//ELEMENTS </xsl:text>
-            <xsl:sequence select="( tei:idno[@type eq 'FPI'], tei:altIdent[@type eq 'FPI'] )[1]"/>
+            <xsl:sequence select="tei:idno[@type eq 'FPI']"/>
             <xsl:text>//EN' '</xsl:text>
             <xsl:value-of select="@ident"/>
             <xsl:text>.dtd' &gt;

From 1f6dabedfe7983d6e640f7702b23e3297ef31f5f Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Tue, 12 Dec 2023 10:29:11 -0500
Subject: [PATCH 21/50] test 'to', not 'format', and include HTML in kinds of
 outputs that might require ODD processing

---
 bin/transformtei | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/transformtei b/bin/transformtei
index 16a8e94a8..c26c2ebea 100755
--- a/bin/transformtei
+++ b/bin/transformtei
@@ -36,8 +36,8 @@ echo "  --profile=$profile    # which transformation profile to use"
 echo "  --lang=$lang    # which language to use "
 echo "  --oxygenlib=$oxygenlib    # where is oxygenlib"
 echo "  --splitLevel=$splitLevel        # splitting level "
-case $format in
-    rng|rnc|dtd|xsd)
+case "$to" in
+    dtd|html|html5|rnc|rng|xsd)
         if [ $from != odd ]; then echo "  --odd                # perform processing of ODD (if appropriate)"; fi
         echo "  --localsource=DIR    # where is local copy of source of TEI Guidelines"
         echo "  --summaryDoc         # only make summary, when doing ODD processing"

From e3aac9d3c29c62326a4a4aba90471e694b572b52 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Fri, 15 Dec 2023 11:58:23 -0500
Subject: [PATCH 22/50] Alter tei:descOrGlossOutOfDate() so that it will
 compare multiple elements; also test the desc or gloss elements based on type
 attribute

---
 common/functions.xsl | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/common/functions.xsl b/common/functions.xsl
index d23c982db..fff4c88f7 100644
--- a/common/functions.xsl
+++ b/common/functions.xsl
@@ -1124,11 +1124,11 @@ of this software, even if advised of the possibility of such damage.
       <xsl:sequence select="tei:makeGloss(.,$langs)"/>
       <!-- now the description -->
       <!--
-	  Change, 2020-02-10 in response to #418:
-	  Only look at, count, or copy those <desc> elements that do
-	  NOT have a @type of "deprecationInfo". Note that we use
-	  not(@type eq 'dI') because using just @type ne 'dI' does not
-	  include those <desc>s that do not have @type at all.
+          Change, 2020-02-10 in response to #418:
+          Only look at, count, or copy those <desc> elements that do
+          NOT have a @type of "deprecationInfo". Note that we use
+          not(@type eq 'dI') because using just @type ne 'dI' does not
+          include those <desc>s that do not have @type at all.
       -->
       <xsl:choose>
         <xsl:when test="not(tei:desc[ not( @type eq 'deprecationInfo' ) ])"> </xsl:when>
@@ -1234,13 +1234,27 @@ of this software, even if advised of the possibility of such damage.
   </doc>
   <xsl:function name="tei:descOrGlossOutOfDate" as="xs:boolean">
     <xsl:param name="context"/>
-    <xsl:for-each select="$context">
-      <xsl:variable name="lang" select="tei:generateDocumentationLang(.)[1]"/>
-      <xsl:sequence select="tei:gloss[@xml:lang eq 'en']/@versionDate gt  tei:gloss[ @xml:lang eq $lang]/@versionDate
-			 or tei:desc[@xml:lang='en' and  not( @type eq 'deprecationInfo' )]/@versionDate
-			    gt
-			    tei:desc[@xml:lang eq $lang and  not( @type eq 'deprecationInfo' )]/@versionDate" />
-    </xsl:for-each>
+    <xsl:variable name="lang" select="tei:generateDocumentationLang($context)[1]"/>
+    <xsl:variable name="test_results" as="xs:boolean*">
+      <!-- first test <gloss> children without @type -->
+      <xsl:sequence select="$context/tei:gloss[ @xml:lang eq  'en' ]/@versionDate
+                         >  $context/tei:gloss[ @xml:lang eq $lang ]/@versionDate"/>
+      <!-- second test <desc> children wwithout @type -->
+      <xsl:sequence select="$context/tei:desc[ @xml:lang eq  'en' ]/@versionDate
+                         >  $context/tei:desc[ @xml:lang eq $lang ]/@versionDate"/>
+      <!-- next test <gloss> children with @type -->
+      <xsl:for-each select="distinct-values( $context/tei:gloss/@type )">
+        <xsl:sequence select="$context/tei:gloss[ @type eq . ][ @xml:lang eq  'en' ]/@versionDate
+                           >  $context/tei:gloss[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/>
+      </xsl:for-each>
+      <!-- last teset <desc> children with @type -->
+      <xsl:for-each select="distinct-values( $context/tei:desc/@type )">
+        <xsl:sequence select="$context/tei:desc[ @type eq . ][ @xml:lang eq  'en' ]/@versionDate
+                           >  $context/tei:desc[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/>
+      </xsl:for-each>
+    </xsl:variable>
+    <!-- if any one of the above is true, then something is amiss, return true. -->
+    <xsl:sequence select="$test_results = true()"/>
   </xsl:function>
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">

From aca9d4e317c5059e5e4a62dbc093fa9a10b0062e Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Thu, 4 Jan 2024 14:29:24 -0500
Subject: [PATCH 23/50] =?UTF-8?q?Oops=20=E2=80=94=20fix=20code=20to=20matc?=
 =?UTF-8?q?h=20comment:=20Test=20only=20those=20<gloss>s=20and=20<desc>s?=
 =?UTF-8?q?=20that=20actually=20do=20not=20have=20a=20type=3D=20attribute.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/functions.xsl            | 8 ++++----
 debian-tei-xsl/debian/changelog | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/functions.xsl b/common/functions.xsl
index fff4c88f7..5b2a83ab7 100644
--- a/common/functions.xsl
+++ b/common/functions.xsl
@@ -1237,11 +1237,11 @@ of this software, even if advised of the possibility of such damage.
     <xsl:variable name="lang" select="tei:generateDocumentationLang($context)[1]"/>
     <xsl:variable name="test_results" as="xs:boolean*">
       <!-- first test <gloss> children without @type -->
-      <xsl:sequence select="$context/tei:gloss[ @xml:lang eq  'en' ]/@versionDate
-                         >  $context/tei:gloss[ @xml:lang eq $lang ]/@versionDate"/>
+      <xsl:sequence select="$context/tei:gloss[ not(@type) ][ @xml:lang eq  'en' ]/@versionDate
+                         >  $context/tei:gloss[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/>
       <!-- second test <desc> children wwithout @type -->
-      <xsl:sequence select="$context/tei:desc[ @xml:lang eq  'en' ]/@versionDate
-                         >  $context/tei:desc[ @xml:lang eq $lang ]/@versionDate"/>
+      <xsl:sequence select="$context/tei:desc[ not(@type) ][ @xml:lang eq  'en' ]/@versionDate
+                         >  $context/tei:desc[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/>
       <!-- next test <gloss> children with @type -->
       <xsl:for-each select="distinct-values( $context/tei:gloss/@type )">
         <xsl:sequence select="$context/tei:gloss[ @type eq . ][ @xml:lang eq  'en' ]/@versionDate
diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog
index 03dc8ade3..225d8ef30 100644
--- a/debian-tei-xsl/debian/changelog
+++ b/debian-tei-xsl/debian/changelog
@@ -1,3 +1,9 @@
+tei-xsl (7.57.0a) natty; urgency=low
+
+  * new release from upstream
+
+ -- TEI                          <editors@www.tei-c.org>  Thu, 04 Jan 2024 14:25:06 -0500
+
 tei-xsl (7.56.0a) natty; urgency=low
 
   * new release from upstream

From fe0386ba68f1dcb68b2b478a4ea70278ee6dcf80 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Fri, 5 Jan 2024 10:01:26 -0500
Subject: [PATCH 24/50] Per Stylesheets group, revert to value operator, adding
 a comment to point out this fact. (And also fix some typos in comments).

---
 common/functions.xsl | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/functions.xsl b/common/functions.xsl
index 5b2a83ab7..06d6916c0 100644
--- a/common/functions.xsl
+++ b/common/functions.xsl
@@ -1235,22 +1235,31 @@ of this software, even if advised of the possibility of such damage.
   <xsl:function name="tei:descOrGlossOutOfDate" as="xs:boolean">
     <xsl:param name="context"/>
     <xsl:variable name="lang" select="tei:generateDocumentationLang($context)[1]"/>
+    <!--
+        Coding NOTE: The 4 tests that comprise $test_results currently
+        use “gt” the value operator rather than ‘>’ the general
+        operator. This is because we expect that there will ever only
+        be 1 sibling <gloss> or <desc> that has the same @type and
+        same @xml:lang. But we might be proven wrong, in which case
+        perhaps ‘>’ would have been better. (If you change it, change
+        this comment, too!)
+    -->
     <xsl:variable name="test_results" as="xs:boolean*">
       <!-- first test <gloss> children without @type -->
       <xsl:sequence select="$context/tei:gloss[ not(@type) ][ @xml:lang eq  'en' ]/@versionDate
-                         >  $context/tei:gloss[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/>
-      <!-- second test <desc> children wwithout @type -->
+                        gt  $context/tei:gloss[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/>
+      <!-- second test <desc> children without @type -->
       <xsl:sequence select="$context/tei:desc[ not(@type) ][ @xml:lang eq  'en' ]/@versionDate
-                         >  $context/tei:desc[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/>
+                        gt  $context/tei:desc[ not(@type) ][ @xml:lang eq $lang ]/@versionDate"/>
       <!-- next test <gloss> children with @type -->
       <xsl:for-each select="distinct-values( $context/tei:gloss/@type )">
         <xsl:sequence select="$context/tei:gloss[ @type eq . ][ @xml:lang eq  'en' ]/@versionDate
-                           >  $context/tei:gloss[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/>
+                          gt  $context/tei:gloss[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/>
       </xsl:for-each>
-      <!-- last teset <desc> children with @type -->
+      <!-- last test <desc> children with @type -->
       <xsl:for-each select="distinct-values( $context/tei:desc/@type )">
         <xsl:sequence select="$context/tei:desc[ @type eq . ][ @xml:lang eq  'en' ]/@versionDate
-                           >  $context/tei:desc[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/>
+                          gt  $context/tei:desc[ @type eq . ][ @xml:lang eq $lang ]/@versionDate"/>
       </xsl:for-each>
     </xsl:variable>
     <!-- if any one of the above is true, then something is amiss, return true. -->

From 275be31fc1f5c86061e33437d3d7885283e4aa7f Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Sat, 13 Jan 2024 22:18:11 -0500
Subject: [PATCH 25/50] Do not copy attrs from TEI constraint element to
 Schematron rule element

---
 odds/extract-isosch.xsl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/odds/extract-isosch.xsl b/odds/extract-isosch.xsl
index d54f68711..831e310fc 100644
--- a/odds/extract-isosch.xsl
+++ b/odds/extract-isosch.xsl
@@ -52,6 +52,8 @@ of this software, even if advised of the possibility of such damage.
       <d:p>Author: See AUTHORS</d:p>
       <d:p>Copyright: 2014, TEI Consortium</d:p>
       <d:p/>
+      <d:p>Modified 2024-01-13 by Syd Bauman:
+      Bug fix. Stop copying tei:constraint/@* onto &lt;sch:rule>.</d:p>
       <d:p>Modified 2018-09-25 by Syd Bauman:
       Bug fix. Handle sqf: namespace semi-intelligently.</d:p>
       <d:p>Modified 2016-07-22 by Syd Bauman &amp; Martin Holmes: ...</d:p>
@@ -337,7 +339,7 @@ of this software, even if advised of the possibility of such damage.
                 <!-- wrappers for them, making HERE the context. -->
                 <pattern id="{$patID}">
                   <rule context="{tei:generate-context(.)}">
-                    <xsl:apply-templates select="@* except @context | node()"/>
+                    <xsl:apply-templates select="node()"/>
                   </rule>
                 </pattern>
               </xsl:when>

From fcb9cbf4c4a80d477be7d1e22f7df0eeda9d081c Mon Sep 17 00:00:00 2001
From: Joey Takeda <joeytakeda@users.noreply.github.com>
Date: Thu, 25 Jan 2024 13:44:12 -0800
Subject: [PATCH 26/50] Clean up CI files per #620 (#655)

* Removes .travis.yml
* Removes Slack notification from GH Actions jobs

Co-authored-by: Syd Bauman <s.bauman@northeastern.edu>
---
 .github/workflows/test.yml | 17 +----------------
 .travis.yml                | 12 ------------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f39fb3221..132c30009 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,14 +22,6 @@ jobs:
       - name: Run tests from the Test directory
         run: make clean test deb dist
 
-      - name: Slack Notification
-        if: always()
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_COLOR: ${{ job.status }}
-          MSG_MINIMAL: commit,actions url
-
   test2:
     runs-on: ubuntu-latest
     container:
@@ -41,11 +33,4 @@ jobs:
 
       - name: Run tests from the Test2 directory
         run: make test2
-        
-      - name: Slack Notification
-        if: always()
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_COLOR: ${{ job.status }}
-          MSG_MINIMAL: commit,actions url
+        
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ec465827d..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-sudo: required
-
-language: java
-
-services:
-  - docker
-
-before_install:
-  - docker pull teic/jenkins:dev
-
-script:
-  - docker run --rm --name jenkins -w /var/odd -it -v `pwd`:/var/odd -u $UID --entrypoint "make" teic/jenkins:dev clean test deb dist

From ecee7bf17188329a4f0c6d497d647291576102e3 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Thu, 25 Jan 2024 17:18:51 -0500
Subject: [PATCH 27/50] Per suggestion @raffazizzi re-word comment

---
 Test2/cleanForDiff.xsl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Test2/cleanForDiff.xsl b/Test2/cleanForDiff.xsl
index 5a7bb8ff3..122cbffe2 100644
--- a/Test2/cleanForDiff.xsl
+++ b/Test2/cleanForDiff.xsl
@@ -31,9 +31,9 @@
                 4. Remove any timestamps that are generated during processing, since
                    these will be different each time a test is run.
 
-		5. Remove the @version attribute of &lt;application> elements that have
-		   “tei” (case insensitive) in either their @xml:id or @ident attribute
-		   (per issue #646).
+                5. Replace the value of the @version attribute of any &lt;application>
+                   elements that have “tei” (case insensitive) in either their @xml:id
+                   or @ident attribute with a dummy value (per issue #646).
             </xd:p>
         </xd:desc>
     </xd:doc>
@@ -72,12 +72,12 @@
 <!--  And versions from <application>s we (probably) inserted. -->
     <xsl:template match="tei:application[ matches( string-join( ( @xml:id, '␝', @ident ) ), 'tei', 'i') ]">
         <!-- Note that any character legal in an XML attribute could
-	     be used to separate the @xml:id from the @ident, above,
-	     EXCEPT one of ‘t’, ‘T’, ‘e’, ‘E’, ‘i’, or ‘I’. -->
+             be used to separate the @xml:id from the @ident, above,
+             EXCEPT one of ‘t’, ‘T’, ‘e’, ‘E’, ‘i’, or ‘I’. -->
         <xsl:copy>
             <xsl:copy-of select="@* except @version"/>
-	    <xsl:attribute name="version" select="'9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22'"/>
-	    <xsl:apply-templates select="node()"/>
+            <xsl:attribute name="version" select="'9thisisaplaceholder88.777soisthis6666.55555thistoo4444.333lastone22'"/>
+            <xsl:apply-templates select="node()"/>
         </xsl:copy>
     </xsl:template>
 

From cb6eef62a2b83fa3e5141a200513c657e4c78ec6 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Thu, 25 Jan 2024 21:32:51 -0500
Subject: [PATCH 28/50] Updated P5 subset: Updated source/p5subset.xml from
 current dev version of TEI repo, and updated tests to match.

---
 Test/expected-results/test.isosch            |  2 +-
 Test/expected-results/test.odd.html          |  2 +-
 Test/expected-results/test.rng               |  4 +--
 Test/expected-results/test15.odd.rnc         |  7 +++--
 Test/expected-results/test21.odd.rnc         |  7 +++--
 Test/expected-results/test30.dtd             |  6 ++--
 Test/expected-results/test30.rnc             |  8 ++---
 Test/expected-results/test33.rnc             |  3 +-
 Test/expected-results/test34.rnc             |  3 +-
 Test/expected-results/test35.rnc             |  3 +-
 Test/expected-results/testdrama.compiled.xml |  2 +-
 Test2/expected-results/testAttValQuant.rng   |  2 +-
 Test2/expected-results/testPure1.rng         |  2 +-
 source/p5subset.xml                          | 32 ++++++++------------
 14 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch
index cdbe7e965..5877f4663 100644
--- a/Test/expected-results/test.isosch
+++ b/Test/expected-results/test.isosch
@@ -71,7 +71,7 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
             </assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.calendarSystem-calendar-calendar-10">
+   <pattern id="schematron-constraint-test-att.calendarSystem-calendar-calendar_attr_on_empty_element-10">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
               systems or calendars to which the date represented by the content of this element belongs,
diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html
index 4ff7d078f..5f70dc96d 100644
--- a/Test/expected-results/test.odd.html
+++ b/Test/expected-results/test.odd.html
@@ -3914,7 +3914,7 @@ <h1>
               <span class="hi">
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-surface.html">surface</a>
               </span>: 
-              <span xml:lang="en" lang="en">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and transcriptions of the writing within them.</span>[
+              <span xml:lang="en" lang="en">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
             </tr>
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 4651d584d..89b8fd4cb 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -4080,7 +4080,7 @@ Suggested values include: 1] full (full form); 2] pref (prefix); 3] suff (suffix
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.calendarSystem-calendar-calendar-constraint-rule-10">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
       <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
               systems or calendars to which the date represented by the content of this element belongs,
@@ -7865,7 +7865,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   </define>
   <define name="surface">
     <element name="surface">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index 7dbff0aef..330fb6a6d 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -2089,7 +2089,8 @@ att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "test15-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "test15-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -7527,7 +7528,7 @@ event =
      model.headLike*,
      (model.pLike+ | model.labelLike+ | eventName+),
      (model.noteLike | model.biblLike | linkGrp | link | idno | ptr)*,
-     (event | listEvent)*,
+     model.eventLike*,
      (model.personLike | listPerson)*,
      (model.placeLike | listPlace)*,
      model.objectLike*,
@@ -7850,7 +7851,7 @@ listEvent =
     (model.headLike*,
      desc*,
      (relation | listRelation)*,
-     ((event | listEvent)+, (relation | listRelation)*)+),
+     (model.eventLike+, (relation | listRelation)*)+),
     att.global.attributes,
     att.typed.attributes,
     att.declarable.attributes,
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index e8f82cff8..9fe9b929a 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -2431,7 +2431,8 @@ att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "test21-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "test21-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -5402,7 +5403,7 @@ event =
      model.headLike*,
      (model.pLike+ | model.labelLike+ | eventName+),
      (model.noteLike | model.biblLike | linkGrp | link | idno | ptr)*,
-     (event | listEvent)*,
+     model.eventLike*,
      (model.personLike | listPerson)*,
      (model.placeLike | listPlace)*,
      model.objectLike*,
@@ -5725,7 +5726,7 @@ listEvent =
     (model.headLike*,
      desc*,
      (relation | listRelation)*,
-     ((event | listEvent)+, (relation | listRelation)*)+),
+     (model.eventLike+, (relation | listRelation)*)+),
     att.global.attributes,
     att.typed.attributes,
     att.declarable.attributes,
diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd
index 0232382a3..6bdca4db4 100644
--- a/Test/expected-results/test30.dtd
+++ b/Test/expected-results/test30.dtd
@@ -1875,7 +1875,7 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST epigraph
  %Tatt.global.attributes; >
 <!--doc:(event) contains data relating to anything of significance that happens in time. [13.3.1. Basic Principles] -->
-<!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|linkGrp|link|idno|ptr)*,(event|listEvent)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
+<!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|linkGrp|link|idno|ptr)*,(%model.eventLike;)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
 <!ATTLIST event xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST event
  %Tatt.global.attributes;
@@ -2339,7 +2339,7 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.typed.attributes;
 ordered %teidata.truthValue;  "true"  >
 <!--doc:(list of events) contains a list of descriptions, each of which provides information about an identifiable event. [13.3.1. Basic Principles] -->
-<!ELEMENT listEvent (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((event|listEvent)+,(relation|listRelation)*)+))>
+<!ELEMENT listEvent (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((%model.eventLike;)+,(relation|listRelation)*)+))>
 <!ATTLIST listEvent xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listEvent
  %Tatt.global.attributes;
@@ -3293,7 +3293,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
 reason CDATA  #IMPLIED >
-<!--doc:defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] -->
+<!--doc:defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] -->
 <!ELEMENT surface (((%model.global;|%model.labelLike;|%model.graphicLike;)*,((zone|line|path|surface|surfaceGrp),(%model.global;)*)*))>
 <!ATTLIST surface xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST surface
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index 886126cf7..643f076e5 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -2352,7 +2352,7 @@ Tatt.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "testbasic-att.calendarSystem-calendar-calendar-constraint-rule-10"
+    "testbasic-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -6681,7 +6681,7 @@ Tevent =
       | Tlink
       | Tidno
       | Tptr)*,
-     (Tevent | TlistEvent)*,
+     Tmodel.eventLike*,
      (Tmodel.personLike | TlistPerson)*,
      (Tmodel.placeLike | TlistPlace)*,
      Tmodel.objectLike*,
@@ -7004,7 +7004,7 @@ TlistEvent =
     (Tmodel.headLike*,
      Tdesc*,
      (Trelation | TlistRelation)*,
-     ((Tevent | TlistEvent)+, (Trelation | TlistRelation)*)+),
+     (Tmodel.eventLike+, (Trelation | TlistRelation)*)+),
     Tatt.global.attributes,
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
@@ -8152,7 +8152,7 @@ TsourceDoc =
   }
 Tsurface =
   
-  ## defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]
+  ## defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]
   element surface {
     ((Tmodel.global | Tmodel.labelLike | Tmodel.graphicLike)*,
      ((Tzone | Tline | Tpath | Tsurface | TsurfaceGrp),
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index 1b698d163..a59a67ed8 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -2062,7 +2062,8 @@ tei_att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "foo-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 906b6fb7b..f61252ae8 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -2067,7 +2067,8 @@ tei_att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "foo-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index d1306426c..973f368b9 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -2062,7 +2062,8 @@ tei_att.calendarSystem.attribute.calendar =
     }
   }?
 sch:pattern [
-  id = "foo-att.calendarSystem-calendar-calendar-constraint-rule-10"
+  id =
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
index 51170c138..40ccaeace 100644
--- a/Test/expected-results/testdrama.compiled.xml
+++ b/Test/expected-results/testdrama.compiled.xml
@@ -7146,7 +7146,7 @@ one initial.</desc>
       <datatype minOccurs="1" maxOccurs="unbounded">
         <dataRef key="teidata.pointer"/>
       </datatype>
-      <constraintSpec ident="calendar" scheme="schematron">
+      <constraintSpec ident="calendar_attr_on_empty_element" scheme="schematron">
         <constraint>
           <sch:rule context="tei:*[@calendar]">
             <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index f1dcc5797..07c4b1d0d 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -3457,7 +3457,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.calendarSystem-calendar-calendar-constraint-rule-10">
+            id="tavq-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 04db355dc..38a708bbc 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -3908,7 +3908,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.calendarSystem-calendar-calendar-constraint-rule-10">
+            id="testPure1-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
diff --git a/source/p5subset.xml b/source/p5subset.xml
index d60887950..f7cfd90b3 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -6,8 +6,8 @@
         <title>The TEI Guidelines</title>
       </titleStmt>
       <editionStmt>
-        <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.7.0.html">4.7.0a</ref>. Last updated on
-        <date when="2023-11-16">16th November 2023</date>, revision <ref target="https://github.com/TEIC/TEI/commit/486847356">486847356</ref></edition>
+        <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.8.0.html">4.8.0a</ref>. Last updated on
+        <date when="2024-01-22">22nd January 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/a6432f272">a6432f272</ref></edition>
       </editionStmt>
       <publicationStmt>
         <distributor>TEI Consortium</distributor>
@@ -16,7 +16,7 @@
             Distributed under a Creative Commons Attribution 3.0 Unported License.
           </licence>
           <licence target="http://www.opensource.org/licenses/BSD-2-Clause">
-            <p>Copyright 2023 TEI Consortium.</p>
+            <p>Copyright 2024 TEI Consortium.</p>
             <p>All rights reserved.</p>     
             <p>Redistribution and use in source and binary forms, with
             or without modification, are permitted provided that the
@@ -46304,8 +46304,7 @@ associated.</desc>
 <elementSpec ident="surface" module="transcr">
   <desc versionDate="2011-11-20" xml:lang="en">defines a written surface as a two-dimensional 
 coordinate space, optionally grouping one or more graphic representations of
-that space, zones of interest within that space, and transcriptions of the
-  writing within them.</desc>
+that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">직사각형의 좌표 공간과 그 내부에서 기록 표면부를 정의한다. 수의적으로 그 공간의 하나 이상의 그림 표상과 관심 있는 직사각형 공간을 모아놓는다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">define una superficie escrita en coordinadas rectangulares, agrupando opcionalmente una o más representaciones gráficas de ese espacio, y las zonas rectangulares de interés dentro de él.</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">矩形の座標により、書記の表面を定義する。選択的に、空間や矩形範囲中のひ
@@ -52080,10 +52079,7 @@ different witnesses.
         <elementRef key="idno"/>
         <elementRef key="ptr"/>
       </alternate>
-      <alternate minOccurs="0" maxOccurs="unbounded">
-        <elementRef key="event" minOccurs="1" maxOccurs="1"/>
-        <elementRef key="listEvent" minOccurs="1" maxOccurs="1"/>
-      </alternate>
+      <classRef key="model.eventLike" minOccurs="0" maxOccurs="unbounded"/>
       <alternate minOccurs="0" maxOccurs="unbounded">
         <classRef key="model.personLike" minOccurs="1" maxOccurs="1"/>
         <elementRef key="listPerson" minOccurs="1" maxOccurs="1"/>
@@ -52942,8 +52938,7 @@ different witnesses.
   <gloss versionDate="2009-01-21" xml:lang="en">list of events</gloss>
   <gloss xml:lang="fr" versionDate="2009-03-19">liste d'événements</gloss>
   <gloss versionDate="2021-02-02" xml:lang="it">list di eventi</gloss>
-  <desc versionDate="2009-01-21" xml:lang="en">contains a list of descriptions, each of which provides information
-    about an identifiable event.</desc>
+  <desc versionDate="2009-01-21" xml:lang="en">contains a list of descriptions, each of which provides information about an identifiable event.</desc>
   <desc versionDate="2009-03-19" xml:lang="fr">contient une liste de descriptions, chacune d'entre elles fournissant des informations sur un événement connu.</desc>
   <desc versionDate="2021-02-02" xml:lang="it">contiene una lista di descrizioni, ognuna delle quali fornisce informazioni a proposito di un determinato evento.</desc>
   <classes>
@@ -52963,14 +52958,11 @@ different witnesses.
         <elementRef key="listRelation" minOccurs="1" maxOccurs="1"/>
       </alternate>
       <sequence minOccurs="1" maxOccurs="unbounded">
-	<alternate minOccurs="1" maxOccurs="unbounded">
-	  <elementRef key="event" minOccurs="1" maxOccurs="1"/>
-	  <elementRef key="listEvent" minOccurs="1" maxOccurs="1"/>
-	</alternate>
-	<alternate minOccurs="0" maxOccurs="unbounded">
-	  <elementRef key="relation" minOccurs="1" maxOccurs="1"/>
-	  <elementRef key="listRelation" minOccurs="1" maxOccurs="1"/>
-	</alternate>
+        <classRef key="model.eventLike" minOccurs="1" maxOccurs="unbounded"/>
+        <alternate minOccurs="0" maxOccurs="unbounded">
+          <elementRef key="relation" minOccurs="1" maxOccurs="1"/>
+          <elementRef key="listRelation" minOccurs="1" maxOccurs="1"/>
+        </alternate>
       </sequence>
     </sequence>
   </content>
@@ -56285,7 +56277,7 @@ one initial.</desc>
       <datatype minOccurs="1" maxOccurs="unbounded">
         <dataRef key="teidata.pointer"/>
       </datatype>
-      <constraintSpec ident="calendar" scheme="schematron">
+      <constraintSpec ident="calendar_attr_on_empty_element" scheme="schematron">
         <constraint>
           <sch:rule context="tei:*[@calendar]">
             <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more

From e01fd3260312fdfc7e33372993c5aefc6c6af657 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Sat, 24 Feb 2024 01:32:57 +1000
Subject: [PATCH 29/50] Fix spelling (#662)

---
 bin/teitorelaxng            | 2 +-
 html/html_textstructure.xsl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/teitorelaxng b/bin/teitorelaxng
index 19573b519..500de7142 100755
--- a/bin/teitorelaxng
+++ b/bin/teitorelaxng
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-echo "$0 has been superceded by teitorng (and oddtorng, which is the same as \"teitorng --odd\")"
+echo "$0 has been superseded by teitorng (and oddtorng, which is the same as \"teitorng --odd\")"
 exit 13
diff --git a/html/html_textstructure.xsl b/html/html_textstructure.xsl
index e817a6b9b..72b8169ab 100644
--- a/html/html_textstructure.xsl
+++ b/html/html_textstructure.xsl
@@ -2141,7 +2141,7 @@ function click(d) {
       </div>
    </xsl:template>
    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] arrangment of page as HTML divs <param name="currentID">currentID</param>
+      <desc>[html] arrangement of page as HTML divs <param name="currentID">currentID</param>
       </desc>
    </doc>
    <xsl:template name="bodyLayout">

From 70c95e17788ba230d1d6eb138680d9a7046e63ce Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:28:20 +1000
Subject: [PATCH 30/50] Change the embedded XSLT version from `2.0` to `3.0`
 (#663)

---
 Documentation/teixsl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/teixsl.xml b/Documentation/teixsl.xml
index a159dc80b..1f17cc410 100644
--- a/Documentation/teixsl.xml
+++ b/Documentation/teixsl.xml
@@ -204,7 +204,7 @@ be asked if you want to install them.</p>
 	<code>tei/xml/tei/stylesheet/profiles</code>. For example, to create your local profile for Word to TEI, create and a directory
 	called <code>local</code>, and under that one called <code>docx</code>. In there, create a file
 	called <code>from.xsl</code> which looks like this:
-  <egXML xmlns="http://www.tei-c.org/ns/Examples" rend="full"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" version="2.0" exclude-result-prefixes="w"><xsl:import href="../../default/docx/from.xsl"/></xsl:stylesheet></egXML>
+  <egXML xmlns="http://www.tei-c.org/ns/Examples" rend="full"><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.tei-c.org/ns/1.0" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" version="3.0" exclude-result-prefixes="w"><xsl:import href="../../default/docx/from.xsl"/></xsl:stylesheet></egXML>
 Edit that accordingly, and then choose the <code>local</code> profile in oXygen transformations.</p>
         </div>
         <div xml:id="oxgarage">

From cfa97aa7a9fc4e4a9f63bba5e2b97d5ec288d873 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Sat, 24 Feb 2024 05:30:55 +1000
Subject: [PATCH 31/50] Fix spelling (#664)

---
 Documentation/teixsl.xml | 2 +-
 README.md                | 2 +-
 common/common_core.xsl   | 2 +-
 common/functions.xsl     | 2 +-
 docx/from/pass2.xsl      | 2 +-
 docx/tools/build.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/teixsl.xml b/Documentation/teixsl.xml
index 1f17cc410..16d452eb3 100644
--- a/Documentation/teixsl.xml
+++ b/Documentation/teixsl.xml
@@ -221,7 +221,7 @@ and
 note that the latter is not a fully-supported service, so please do not rely on it for production use.</p>
           <p>OxGarage is open source, and runs as a Java servlet. 
 A Debian package is available at <ptr target="http://tei.oucs.ox.ac.uk/teideb/"/>.
-Source code is on Github at <ptr target="https://github.com/sebastianrahtz/oxgarage.git"/></p>
+Source code is on GitHub at <ptr target="https://github.com/sebastianrahtz/oxgarage.git"/></p>
           <p>To use OxGarage, go to the web site, click on <emph>Documents</emph> and
 select <emph>TEI P5 XML Document</emph> as your input. When you do so a list of
 possible conversion targets should appear on the right. Choose, for
diff --git a/README.md b/README.md
index 549bc63b9..abf32d12f 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ It will then be available at `release/xslcommon/doc/tei-xsl/index.html`.
 ## About the Text Encoding Initiative (TEI)
 
 The Text Encoding Initiative (TEI) is a community of practice in the area now known as textual digital humanities. Since 1994 
-the primary output of the TEI has been [the TEI/XML guidelines](https://www.tei-c.org/release/doc/tei-p5-doc/en/html/index.html), a standard for the interchange of textual data. A main focii of the TEI is the [TEI-L mailing list](https://listserv.brown.edu/cgi-bin/wa?A1=ind1904&L=TEI-L); the TEI is also on [github](https://github.com/TEIC/TEI) and [docker](https://hub.docker.com/u/teic), a repository called [TAPAS](https://tapasproject.org/) and an [academic journal, the jTEI](https://journals.openedition.org/jtei/). 
+the primary output of the TEI has been [the TEI/XML guidelines](https://www.tei-c.org/release/doc/tei-p5-doc/en/html/index.html), a standard for the interchange of textual data. A main focii of the TEI is the [TEI-L mailing list](https://listserv.brown.edu/cgi-bin/wa?A1=ind1904&L=TEI-L); the TEI is also on [GitHub](https://github.com/TEIC/TEI) and [docker](https://hub.docker.com/u/teic), a repository called [TAPAS](https://tapasproject.org/) and an [academic journal, the jTEI](https://journals.openedition.org/jtei/). 
 
 TEI/XML can be thought of as a sibling of HTML (they're approximately the same age, depending on how you measure it) which evolved with a focus on defined textual semantics rather than defined display semantics.  [TEI by example](https://teibyexample.org/) is a good introduction to TEI/XML.
 The [Text Encoding Initiative Wikipedia article](https://en.wikipedia.org/wiki/Text_Encoding_Initiative) contains some short examples. 
diff --git a/common/common_core.xsl b/common/common_core.xsl
index fa901fc2b..99aa20e47 100644
--- a/common/common_core.xsl
+++ b/common/common_core.xsl
@@ -169,7 +169,7 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process tei:abbr (abbrevation)</desc>
+      <desc>Process tei:abbr (abbreviation)</desc>
    </doc>
   <xsl:template match="tei:abbr">
     <xsl:choose>
diff --git a/common/functions.xsl b/common/functions.xsl
index 06d6916c0..d6dfa128d 100644
--- a/common/functions.xsl
+++ b/common/functions.xsl
@@ -1172,7 +1172,7 @@ of this software, even if advised of the possibility of such damage.
           The original code, which had separate templates for tei:valList[@type=open] and
           tei:valList[@type=semi], was very redundant. However, it may have been very clever
           in how it handled the case of multiple child <valList>s. Or, it may have obliviously
-          worked in that case, producing passable, if not ideal, outupt. Depends on your point
+          worked in that case, producing passable, if not ideal, output. Depends on your point
           of view, in part.
           I believe we reproduce what it did, whether you like it or not, by using '=' instead
           of 'eq' in the "if" comparison in the definition of $msg.
diff --git a/docx/from/pass2.xsl b/docx/from/pass2.xsl
index f88cf27fd..3a7af30cd 100644
--- a/docx/from/pass2.xsl
+++ b/docx/from/pass2.xsl
@@ -461,7 +461,7 @@ of this software, even if advised of the possibility of such damage.
 
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
     <desc> &lt;CAPTION&gt; belongs to nearest figure or table. Tables with multi-paragraph preceding
-          CAPTIONs or with follwing captions are wrapped in a figure and the first para becomes a &lt;head&gt;, 
+          CAPTIONs or with following captions are wrapped in a figure and the first para becomes a &lt;head&gt;,
           while subsequent ones become &lt;figDescs&gt;. A single preceding CAPTION paragraph becomes an 
           internal header. Figure captions become headers and figDescs in a similar way.</desc>
   </doc>
diff --git a/docx/tools/build.xml b/docx/tools/build.xml
index f9879204a..b5c5baec2 100644
--- a/docx/tools/build.xml
+++ b/docx/tools/build.xml
@@ -7,7 +7,7 @@
   <!-- define the the saxon transformer or place it in the ant lib directory -->
   <property name = "saxon.jar" value=".../saxon10he.jar"/>
   
-	<!-- modfiy basedir, if necessary: -Dbasedir=... -->
+	<!-- modify basedir, if necessary: -Dbasedir=... -->
 	<echo>     basedir: ${basedir}</echo>
 	
 	<!-- profile, may be overwritten by external property: -Dprofile=default -->

From d8ebf04976f9483dab13132f4b8301010a07405c Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:29:20 +1000
Subject: [PATCH 32/50] Fix spelling (#666)

---
 docx/from/paragraphs.xsl | 2 +-
 docx/to/mml2omml.xsl     | 8 ++++----
 docx/tools/build.xml     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docx/from/paragraphs.xsl b/docx/from/paragraphs.xsl
index a49b6dc2c..567c7fad7 100644
--- a/docx/from/paragraphs.xsl
+++ b/docx/from/paragraphs.xsl
@@ -77,7 +77,7 @@ of this software, even if advised of the possibility of such damage.
    <xsl:variable name="ust">\t</xsl:variable>
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
       <desc>
-         <p>Calls the named template paragraph-wp that can be overriden.</p>
+         <p>Calls the named template paragraph-wp that can be overridden.</p>
          <p>
             See comment at begin of document to understand why this template is calling
             a named template.
diff --git a/docx/to/mml2omml.xsl b/docx/to/mml2omml.xsl
index 74f10ef77..a789032e4 100644
--- a/docx/to/mml2omml.xsl
+++ b/docx/to/mml2omml.xsl
@@ -497,7 +497,7 @@
          </xsl:choose>
       </xsl:variable>
 
-      <!--In order to determine the length of the run, we will find the number of nodes before the inital node in the run and
+      <!--In order to determine the length of the run, we will find the number of nodes before the initial node in the run and
 			the number of nodes before the first node that DOES NOT belong to the current run.  The number of nodes that will
 			be printed is One Less than the difference between the latter and the former-->
 
@@ -573,7 +573,7 @@
       <!--The beginning and ending of the current run has been established. Now we should open a run element-->
       <xsl:choose>
 
-        <!--If cndRun > 0, then there is a following diffrent prop, or non- Token, 
+        <!--If cndRun > 0, then there is a following different prop, or non- Token,
 						although there may or may not have been a preceding different prop, or non-
 						Token-->
         <xsl:when test="$cndRun &gt; 0">
@@ -1513,7 +1513,7 @@
 
   <!-- Note:  ndCur should only be an munder/mover MathML element.
   
-       ndCur should be interpretted as an m:bar if
+       ndCur should be interpreted as an m:bar if
           1)  its respective accent attribute is not true
           2)  its second child is an mml:mo
           3)  the character of the mml:mo is the correct under/over bar. -->
@@ -1585,7 +1585,7 @@
 
   <!-- Note:  ndCur should only be an mover MathML element.
   
-       ndCur should be interpretted as an m:acc if
+       ndCur should be interpreted as an m:acc if
           1)  its accent attribute is true
           2)  its second child is an mml:mo
           3)  there is only one character in the mml:mo -->
diff --git a/docx/tools/build.xml b/docx/tools/build.xml
index b5c5baec2..1755a9d85 100644
--- a/docx/tools/build.xml
+++ b/docx/tools/build.xml
@@ -74,7 +74,7 @@
 	<!-- zip back together -->
 	<zip destfile="${targetFile}" basedir="${temp}" />
 
-	<!-- delete the working directory whith all its content -->
+	<!-- delete the working directory with all its content -->
 	<echo>remove working directory</echo>
 	<delete includeEmptyDirs="true" verbose="true">
 		<fileset dir="${temp}"/>

From 15f871ab3c462d164e628f678ccbcffd2773b7bd Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Tue, 27 Feb 2024 00:05:50 +1000
Subject: [PATCH 33/50] Change XSLT 2.0 to 3.0 in the README (#667)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index abf32d12f..0d0a81b84 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 TEI XSL Stylesheets
 
-This is a family of XSLT 2.0 stylesheets to transform TEI XML documents to various formats, including XHTML, LaTeX, XSL Formatting Objects, ePub, plain text, RDF, JSON; and to/from Word OOXML (docx) and OpenOffice (odt).  They concentrate on the core TEI modules which are used for simple transcription and "born digital" writing. It is important to understand that they do _not_:
+This is a family of XSLT 3.0 stylesheets to transform TEI XML documents to various formats, including XHTML, LaTeX, XSL Formatting Objects, ePub, plain text, RDF, JSON; and to/from Word OOXML (docx) and OpenOffice (odt).  They concentrate on the core TEI modules which are used for simple transcription and "born digital" writing. It is important to understand that they do _not_:
 
 *   cover all TEI elements and possible attribute values
 *   attempt to define a standard TEI processing or rendering model

From 9b452f4afb4d16d9311c1dc444d0120d8df0dc89 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Thu, 7 Mar 2024 14:02:19 -0500
Subject: [PATCH 34/50] Comment changes, including spelling corrections

---
 odds/teiodds.xsl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index a206bf40a..354516d9c 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -345,11 +345,11 @@ of this software, even if advised of the possibility of such damage.
   <xsl:template name="repeat_as_needed" as="element()+">
     <xsl:param name="repeatMe" as="element()+"/>
     <xsl:variable name="norMinMax" select="tei:norMinMax(.)" as="item()+"/>
-    <xsl:variable name="min" select="$norMinMax[1]"/>
-    <xsl:variable name="max" select="$norMinMax[2]"/>
-    <xsl:variable name="owe" select="$norMinMax[3]"/>
+    <xsl:variable name="min" select="$norMinMax[1]"/> <!-- minimum number of occurrences as an xs:integer -->
+    <xsl:variable name="max" select="$norMinMax[2]"/> <!-- maximum number of occurrences as an xs:integer, -1 for unbounded -->
+    <xsl:variable name="owe" select="$norMinMax[3]"/> <!-- occurrence wrapper element, as the string "optional", "zeroOrMore", or "oneOrMore" -->
     <xsl:choose>
-      <!-- Handle min=0 max=1, min=0 max=unbounded, and min=1 max=unbounded all in one feel swoop: -->
+      <!-- Handle min=0 max=1, min=0 max=unbounded, and min=1 max=unbounded all in one fell swoop: -->
       <xsl:when test="string-length($owe) ne 0">
         <xsl:element name="{$owe}" namespace="http://relaxng.org/ns/structure/1.0">
           <xsl:copy-of select="$repeatMe"/>
@@ -2326,7 +2326,7 @@ of this software, even if advised of the possibility of such damage.
     </xsl:variable>
     <!--
       Generate the local name of the RELAX NG element used to create
-      the requested range of occurences, iff it is one of the
+      the requested range of occurrences, iff it is one of the
       available possiblities. If not, use an empty text node (as a
       flag).
     -->

From cc55edf458626f4dad672eb7be7a6725b20eba5e Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Fri, 8 Mar 2024 14:29:00 +1000
Subject: [PATCH 35/50] Fix spelling (#671)

---
 fo/fo_textstructure.xsl     | 6 +++---
 html/html_textstructure.xsl | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fo/fo_textstructure.xsl b/fo/fo_textstructure.xsl
index 00eb350c3..1553d0714 100644
--- a/fo/fo_textstructure.xsl
+++ b/fo/fo_textstructure.xsl
@@ -114,7 +114,7 @@ of this software, even if advised of the possibility of such damage.
                      <xsl:call-template name="headers-footers-oneside-back"/>
                   </xsl:otherwise>
                </xsl:choose>
-              <!-- insert footNote Seperator -->
+              <!-- insert footNote Separator -->
               <static-content flow-name="xsl-footnote-separator">
                 <block>
                   <leader leader-pattern="rule" leader-length="100%" rule-style="solid" rule-thickness="0.5pt"/>
@@ -165,7 +165,7 @@ of this software, even if advised of the possibility of such damage.
 	       <xsl:call-template name="headers-footers-oneside"/>
 	     </xsl:otherwise>
 	   </xsl:choose>
-	   <!-- insert footNote Seperator -->
+	   <!-- insert footNote Separator -->
 	   <static-content flow-name="xsl-footnote-separator">
 	     <block>
 	       <leader leader-pattern="rule" leader-length="100%" rule-style="solid" rule-thickness="0.5pt"/>
@@ -398,7 +398,7 @@ of this software, even if advised of the possibility of such damage.
 		   <xsl:call-template name="headers-footers-oneside"/>
 		 </xsl:otherwise>
                </xsl:choose>
-	     <!-- insert footNote Seperator -->
+	     <!-- insert footNote Separator -->
 	     <static-content flow-name="xsl-footnote-separator">
 	       <block>
 	         <leader leader-pattern="rule" leader-length="100%" rule-style="solid" rule-thickness="0.5pt"/>
diff --git a/html/html_textstructure.xsl b/html/html_textstructure.xsl
index 72b8169ab..0139fc247 100644
--- a/html/html_textstructure.xsl
+++ b/html/html_textstructure.xsl
@@ -1195,9 +1195,9 @@
                   <script type="text/javascript" src="http://d3js.org/d3.v3.min.js"/>
                   <!-- from d3noob’s block #8375092 January 11, 2014
 	    Interactive d3.js tree diagram
-	    This is a d3.js tree diagram that incldes an interactive element as used as an example in the book D3 Tips and Tricks.
+	    This is a d3.js tree diagram that includes an interactive element as used as an example in the book D3 Tips and Tricks.
 
-	    Any parent node can be clicked on to collapse the portion of the tree below it, on itself. Conversly, it can be clicked on again to regrow.
+	    Any parent node can be clicked on to collapse the portion of the tree below it, on itself. Conversely, it can be clicked on again to regrow.
 
 	    It is derived from the Mike Bostock Collapsible tree example but it is a slightly cut down version.
 	    -->

From 0a775840d68695016f8fef0e23fd63593e983905 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Fri, 8 Mar 2024 17:16:15 +1000
Subject: [PATCH 36/50] Fix spelling

---
 Test/expected-results/test27.fo             | 2 +-
 Test/expected-results/test27.html           | 2 +-
 Test/expected-results/test27.tex            | 2 +-
 Test/test27.xml                             | 2 +-
 Test2/expected-results/testBibliography1.fo | 2 +-
 Test2/inputFiles/testBibliography1.xml      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Test/expected-results/test27.fo b/Test/expected-results/test27.fo
index a60e8c694..46d5431bb 100644
--- a/Test/expected-results/test27.fo
+++ b/Test/expected-results/test27.fo
@@ -837,7 +837,7 @@
                   <block text-align="end">5</block>
                 </list-item-label>
                 <list-item-body start-indent="body-start()">
-                  <block font-weight="normal">Fol. <inline font-style="normal" font-weight="bold">46rb</inline>: contains a major initial a <inline font-weight="bold">Þ</inline> with branches and leaves, with an extention down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</block>
+                  <block font-weight="normal">Fol. <inline font-style="normal" font-weight="bold">46rb</inline>: contains a major initial a <inline font-weight="bold">Þ</inline> with branches and leaves, with an extension down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</block>
                 </list-item-body>
               </list-item>
               <list-item space-before.optimum="4pt">
diff --git a/Test/expected-results/test27.html b/Test/expected-results/test27.html
index 695fd1ca7..e4d05e89c 100644
--- a/Test/expected-results/test27.html
+++ b/Test/expected-results/test27.html
@@ -905,7 +905,7 @@ <h5>Decoration</h5>
         <span style="font-weight:bold">M</span>just intrudes on of the first letters of the text, showing that the illumination was done after the scribe finished his work.</li>
         <li class="item">Fol. 
         <span class="bold">46rb:</span>contains a major initial a 
-        <span style="font-weight:bold">Þ</span>with branches and leaves, with an extention down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</li>
+        <span style="font-weight:bold">Þ</span>with branches and leaves, with an extension down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</li>
         <li class="item">Fol. 
         <span class="bold">51va:</span>: The opening of 
         <span class="titlem">Halldórs þáttr Snorrasonar</span>contains a major initial, a 
diff --git a/Test/expected-results/test27.tex b/Test/expected-results/test27.tex
index 3415f2588..b7e47f64e 100644
--- a/Test/expected-results/test27.tex
+++ b/Test/expected-results/test27.tex
@@ -530,7 +530,7 @@ \subsubsection{Decoration}
 \item[2] Fol. \textbf{29rb}: : The opening of \textit{Norna-Gests þáttr} contains a \textit{littera florissa} of the letter {\bfseries Þ} with dots and branches. The first three lines are set in, but the round bow of the {\bfseries Þ} extends up the upper margin, while the descendent runs down to the bottom of the margin. The bar is metamorphosing down the page from a dotted line to some sort of a branch with leaf-like outgrows and is ending in two spirals, and a leaf in the middle, in the lower margin. The top of the {\bfseries Þ} is ending in one single spiral.
 \item[3] Fol. \textbf{31va}: The opening of \textit{Helga þáttr Þórissonar} contains a major initial, a \textit{littera florissa} of a {\bfseries Þ}. 3 lines are set in, but the letter extends in the margin. The {\bfseries Þ} ends with two spirals in the lower margin.
 \item[4] Fol. \textbf{33va}: The opening of \textit{Færeyinga saga} contains a major initial, a \textit{littera florissa} of the letter {\bfseries M} with branches and leaves. The four top lines are set in, but the {\bfseries M} extends in the upper margin. The right-hand line of the {\bfseries M} just intrudes on of the first letters of the text, showing that the illumination was done after the scribe finished his work.
-\item[5] Fol. \textbf{46rb}: contains a major initial a {\bfseries Þ} with branches and leaves, with an extention down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.
+\item[5] Fol. \textbf{46rb}: contains a major initial a {\bfseries Þ} with branches and leaves, with an extension down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.
 \item[6] Fol. \textbf{51va}: : The opening of \textit{Halldórs þáttr Snorrasonar} contains a major initial, a \textit{littera florissa} of the letter {\bfseries H}. Four lines are set in, but the initial extends nine lines up the margin.
 \end{itemize}  \par
 There are also some little drawings in the margins, e.g. fol. \textbf{10r}: : A man with a fish on the hook of his fishing rod; fol. \textbf{22r}: : A kissing couple; fol. \textbf{26r}: : Three knights fighting a dragon who is eating one of them.\par
diff --git a/Test/test27.xml b/Test/test27.xml
index bab46ce5d..d35de0aad 100644
--- a/Test/test27.xml
+++ b/Test/test27.xml
@@ -1953,7 +1953,7 @@ for language resources</title>
 											in the upper margin. The right-hand line of the <hi rend="bold">M</hi> just
 											intrudes on of the first letters of the text, showing that the illumination
 											was done after the scribe finished his work.</item>
-                    <item n="5">Fol. <locus>46rb</locus>contains a major initial a <hi rend="bold">Þ</hi> with branches and leaves, with an extention down the margin with one
+                    <item n="5">Fol. <locus>46rb</locus>contains a major initial a <hi rend="bold">Þ</hi> with branches and leaves, with an extension down the margin with one
 											fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</item>
                     <item n="6">Fol. <locus>51va</locus>: The opening of <title type="uniform">Halldórs þáttr Snorrasonar</title> contains a major initial, a
 												<term>littera florissa</term> of the letter <hi rend="bold">H</hi>. Four
diff --git a/Test2/expected-results/testBibliography1.fo b/Test2/expected-results/testBibliography1.fo
index 3665b80c9..135cd2b49 100644
--- a/Test2/expected-results/testBibliography1.fo
+++ b/Test2/expected-results/testBibliography1.fo
@@ -1449,7 +1449,7 @@
                            <block text-align="end">5</block>
                         </list-item-label>
                         <list-item-body start-indent="body-start()">
-                           <block font-weight="normal">Fol. <inline font-style="normal" font-weight="bold">46rb</inline>: contains a major initial a <inline font-weight="bold">Þ</inline> with branches and leaves, with an extention down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</block>
+                           <block font-weight="normal">Fol. <inline font-style="normal" font-weight="bold">46rb</inline>: contains a major initial a <inline font-weight="bold">Þ</inline> with branches and leaves, with an extension down the margin with one fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</block>
                         </list-item-body>
                      </list-item>
                      <list-item space-before.optimum="4pt">
diff --git a/Test2/inputFiles/testBibliography1.xml b/Test2/inputFiles/testBibliography1.xml
index bab46ce5d..d35de0aad 100644
--- a/Test2/inputFiles/testBibliography1.xml
+++ b/Test2/inputFiles/testBibliography1.xml
@@ -1953,7 +1953,7 @@ for language resources</title>
 											in the upper margin. The right-hand line of the <hi rend="bold">M</hi> just
 											intrudes on of the first letters of the text, showing that the illumination
 											was done after the scribe finished his work.</item>
-                    <item n="5">Fol. <locus>46rb</locus>contains a major initial a <hi rend="bold">Þ</hi> with branches and leaves, with an extention down the margin with one
+                    <item n="5">Fol. <locus>46rb</locus>contains a major initial a <hi rend="bold">Þ</hi> with branches and leaves, with an extension down the margin with one
 											fleur-de-lis-like outgrow, and ends with a fleur-de-lis.</item>
                     <item n="6">Fol. <locus>51va</locus>: The opening of <title type="uniform">Halldórs þáttr Snorrasonar</title> contains a major initial, a
 												<term>littera florissa</term> of the letter <hi rend="bold">H</hi>. Four

From d539451035df65837865990d139ca269e529d635 Mon Sep 17 00:00:00 2001
From: trishaoconnor <trishaoconnor88@gmail.com>
Date: Sat, 16 Mar 2024 12:02:45 +0100
Subject: [PATCH 37/50] =?UTF-8?q?Corrected=20typo=20for=20issue=20=C2=B4#5?=
 =?UTF-8?q?84=C2=B4=20=20(#670)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Corrected typo from sup to sub
---
 common/functions.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/functions.xsl b/common/functions.xsl
index d6dfa128d..e63c4201a 100644
--- a/common/functions.xsl
+++ b/common/functions.xsl
@@ -298,7 +298,7 @@ of this software, even if advised of the possibility of such damage.
     <xsl:param name="element"/>
     <xsl:for-each select="$element">
       <xsl:choose>
-        <xsl:when test="ancestor-or-self::*[@rend][tei:match(@rend,'sup')]">true</xsl:when>
+        <xsl:when test="ancestor-or-self::*[@rend][tei:match(@rend,'sub')]">true</xsl:when>
         <xsl:when test="ancestor-or-self::*[@rend][tei:match(@rend,'subscript')]">true</xsl:when>
         <xsl:otherwise>false</xsl:otherwise>
       </xsl:choose>

From 2b68eb6ac2ca6097507ef8b62a8d73db2eb350b8 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Sun, 24 Mar 2024 02:31:00 +1000
Subject: [PATCH 38/50] Fix spelling

---
 Test/mediawiki1.xml             | 2 +-
 epub/tei-to-epub.xsl            | 2 +-
 epub3/tei-to-epub3.xsl          | 2 +-
 html/html_param.xsl             | 6 +++---
 html/html_textstructure.xsl     | 4 ++--
 profiles/oxford/epub/oxford.css | 2 +-
 profiles/saxonce/README.txt     | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Test/mediawiki1.xml b/Test/mediawiki1.xml
index af0e36426..fcc67eb14 100644
--- a/Test/mediawiki1.xml
+++ b/Test/mediawiki1.xml
@@ -319,7 +319,7 @@ The EpiDoc Guidelines are available in two forms:
 ==Tools==
 Tool developed by and for the EpiDoc community include:
 * The EpiDoc Example Stylesheets (XSLT), available from the SourceForge file repository. These stylesheets are also used to deliver the Guidelines.&lt;ref&gt;https://sourceforge.net/p/epidoc/wiki/Stylesheets/&lt;/ref&gt;
-* CHET-C (the Chapel Hill Electronic Text-Converter), an application originally written in VBA, then as a free-standing [[Java (programming language)|Java]] app, and now available as a self-contained [[Javascript]] platform written by Hugh Cayless. &lt;ref&gt;http://www.stoa.org/projects/epidoc/stable/chetc-js/chetc.html&lt;/ref&gt;
+* CHET-C (the Chapel Hill Electronic Text-Converter), an application originally written in VBA, then as a free-standing [[Java (programming language)|Java]] app, and now available as a self-contained [[JavaScript]] platform written by Hugh Cayless. &lt;ref&gt;http://www.stoa.org/projects/epidoc/stable/chetc-js/chetc.html&lt;/ref&gt;
 * Transcoder: a Java tool for converting between Beta Code, Unicode NF C, Unicode NF D, and GreekKeys encoding for Greek script on the fly.&lt;ref&gt;https://sourceforge.net/projects/epidoc/files/Transcoder/&lt;/ref&gt;
 
 ==Projects==
diff --git a/epub/tei-to-epub.xsl b/epub/tei-to-epub.xsl
index e1d10e0a5..ec332afe7 100644
--- a/epub/tei-to-epub.xsl
+++ b/epub/tei-to-epub.xsl
@@ -152,7 +152,7 @@ of this software, even if advised of the possibility of such damage.
           <xsl:variable name="file" select="normalize-space(.)"/>
           <xsl:variable name="name" select="tokenize($file,'/')[last()]"/>
           <xsl:if test="$verbose='true'">
-            <xsl:message>write Javascript file <xsl:value-of select="$name"/></xsl:message>
+            <xsl:message>write JavaScript file <xsl:value-of select="$name"/></xsl:message>
           </xsl:if>
           <xsl:result-document method="text" href="{concat($directory,'/OPS/',$name)}">
             <xsl:for-each select="unparsed-text($file)">
diff --git a/epub3/tei-to-epub3.xsl b/epub3/tei-to-epub3.xsl
index 7723585f9..ffa661c30 100644
--- a/epub3/tei-to-epub3.xsl
+++ b/epub3/tei-to-epub3.xsl
@@ -169,7 +169,7 @@ of this software, even if advised of the possibility of such damage.
           <xsl:variable name="file" select="normalize-space(.)"/>
           <xsl:variable name="name" select="tokenize($file,'/')[last()]"/>
           <xsl:if test="$verbose='true'">
-            <xsl:message>write Javascript file <xsl:value-of select="$name"/></xsl:message>
+            <xsl:message>write JavaScript file <xsl:value-of select="$name"/></xsl:message>
           </xsl:if>
           <xsl:result-document method="text" href="{concat($directory,'/OPS/',$name)}">
             <xsl:for-each select="unparsed-text($file)">
diff --git a/html/html_param.xsl b/html/html_param.xsl
index e4e1fa7a9..f025e9b6d 100644
--- a/html/html_param.xsl
+++ b/html/html_param.xsl
@@ -64,7 +64,7 @@ of this software, even if advised of the possibility of such damage.
   </xsl:param>
   
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="string">
-    <desc>which Javascript library to use for drawing trees</desc>
+    <desc>which JavaScript library to use for drawing trees</desc>
   </doc>
   <xsl:param name="treestyle">googlechart</xsl:param>
 
@@ -148,7 +148,7 @@ HTML width and height (in pixels) from supplied dimensions.</desc>
    </doc>
   <xsl:template name="bodyEndHook"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where Javascript calls can be inserted  just after &lt;body&gt;</desc>
+      <desc>[html] Hook where JavaScript calls can be inserted  just after &lt;body&gt;</desc>
    </doc>
   <xsl:template name="bodyJavascriptHook"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
@@ -178,7 +178,7 @@ HTML width and height (in pixels) from supplied dimensions.</desc>
    </doc>
   <xsl:template name="figureHook"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where extra Javascript functions can be defined</desc>
+      <desc>[html] Hook where extra JavaScript functions can be defined</desc>
    </doc>
   <xsl:template name="javascriptHook"/>
   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
diff --git a/html/html_textstructure.xsl b/html/html_textstructure.xsl
index 0139fc247..19a536941 100644
--- a/html/html_textstructure.xsl
+++ b/html/html_textstructure.xsl
@@ -1479,12 +1479,12 @@ function click(d) {
    </xsl:template>
 
    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Javascript functions to be declared in HTML header</desc>
+      <desc>[html] JavaScript functions to be declared in HTML header</desc>
    </doc>
    <xsl:template name="includeJavascript"> </xsl:template>
    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
       <desc>
-         <p>[html] Write out some Javascript into the HTML</p>
+         <p>[html] Write out some JavaScript into the HTML</p>
          <p>Note that it does not have to commented if the output is XHTML</p>
          <param name="content">The code</param>
       </desc>
diff --git a/profiles/oxford/epub/oxford.css b/profiles/oxford/epub/oxford.css
index b1a9db033..57054e5be 100644
--- a/profiles/oxford/epub/oxford.css
+++ b/profiles/oxford/epub/oxford.css
@@ -362,7 +362,7 @@ body {
 .box,.main-content {
     margin: 0 1em;
 }
-/* This next css is used to hide and show text using a javascript function */
+/* This next css is used to hide and show text using a JavaScript function */
 .posthidden {
     display: none
 }
diff --git a/profiles/saxonce/README.txt b/profiles/saxonce/README.txt
index 96bd3745c..48b0b2c4a 100644
--- a/profiles/saxonce/README.txt
+++ b/profiles/saxonce/README.txt
@@ -1 +1 @@
-For use with Saxon CE (XSLT processor in Javascript)
+For use with Saxon CE (XSLT processor in JavaScript)

From 9206a74b8f895b6ce733cae4cbfd99c25515fc6e Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Wed, 27 Mar 2024 15:27:31 -0400
Subject: [PATCH 39/50] Work on #319 point 2: @trishaoconnor and I found (what
 we think is) the spot in odd2odd.xsl that caused the output constraintSpec
 element to appear before the output datatype element, and swapped it with the
 immediately following constructor in the "odd2odd-mergeAttribute" template.
 This fixed the error in the output of running odd2odd.xsl on
 tei_simplePrint.odd, and all tests in both Test/ and Test2/ pass (except I do
 not have xelatex on my system).

---
 odds/odd2odd.xsl | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index 5046bdf6c..71023f2bd 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -110,7 +110,6 @@ of this software, even if advised of the possibility of such damage.
   <xsl:key name="odd2odd-SCHEMASPECS" match="tei:schemaSpec" use="@ident"/>
   <xsl:key match="tei:moduleSpec" name="odd2odd-MODULES" use="@ident"/>
 
-
    <!-- all of these use a combination of @ident _and_ @ns (where
    present), in case of duplication of names across schemes -->
 
@@ -143,7 +142,6 @@ of this software, even if advised of the possibility of such damage.
   <xsl:key name="odd2odd-REPLACE"    match="tei:macroSpec[@mode eq 'replace']"   use="tei:uniqueName(.)"/>
   <xsl:key name="odd2odd-REPLACEATT" match="tei:attDef[@mode eq 'replace']" use="concat(../../@ident,'_',@ident)"/>
 
-
   <xsl:variable name="DEFAULTSOURCE">
     <xsl:choose>
       <xsl:when test="$defaultSource != ''">
@@ -195,7 +193,6 @@ of this software, even if advised of the possibility of such damage.
       </xsl:choose>
   </xsl:function>
 
-
   <xsl:function name="tei:checkExclude" as="xs:boolean">
     <xsl:param name="ident"  as="xs:string"/>
     <xsl:param name="exc" />
@@ -346,7 +343,7 @@ of this software, even if advised of the possibility of such damage.
   <xsl:variable name="ODD">
     <xsl:for-each select="/*">
       <xsl:copy>
-              <xsl:attribute name="xml:base" select="document-uri(/)"/>
+        <xsl:attribute name="xml:base" select="document-uri(/)"/>
         <xsl:copy-of select="@*"/>
         <xsl:if test="$useVersionFromTEI='true'">
           <xsl:processing-instruction name="TEIVERSION">
@@ -1271,8 +1268,8 @@ of this software, even if advised of the possibility of such damage.
           <xsl:if test="$ORIGINAL/tei:attList">
             <attList xmlns="http://www.tei-c.org/ns/1.0">
               <xsl:call-template name="odd2odd-processAttributes">
-		<xsl:with-param name="ORIGINAL" select="$ORIGINAL"/>
-		<xsl:with-param name="objectName" select="$className"/>
+                <xsl:with-param name="ORIGINAL" select="$ORIGINAL"/>
+                <xsl:with-param name="objectName" select="$className"/>
               </xsl:call-template>
             </attList>
           </xsl:if>
@@ -1642,7 +1639,7 @@ of this software, even if advised of the possibility of such damage.
                                  not(@ident=$ORIGINAL/tei:attList//tei:attDef/@ident)]"/>
     <!-- any direct attRef elements -->
     <xsl:apply-templates mode="justcopy"
-                           select="tei:attList/tei:attRef"/>
+                         select="tei:attList/tei:attRef"/>
     <!-- now look at each of the original object's attributes and see
     if we have an update -->
     <xsl:for-each select="$ORIGINAL/tei:attList">
@@ -1773,14 +1770,6 @@ of this software, even if advised of the possibility of such damage.
               <xsl:apply-templates mode="justcopy" select="$Old/tei:desc"/>
           </xsl:otherwise>
         </xsl:choose>
-        <xsl:choose>
-          <xsl:when test="$New/tei:constraintSpec">
-            <xsl:apply-templates mode="justcopy" select="$New/tei:constraintSpec"/>
-          </xsl:when>
-          <xsl:when test="$Old/tei:constraintSpec">
-            <xsl:copy-of select="$Old/tei:constraintSpec"/>
-          </xsl:when>
-        </xsl:choose>
         <xsl:choose>
           <xsl:when test="$New/tei:datatype">
             <xsl:apply-templates mode="justcopy" select="$New/tei:datatype"/>
@@ -1790,7 +1779,14 @@ of this software, even if advised of the possibility of such damage.
           </xsl:when>
         </xsl:choose>
         <xsl:choose>
-          
+          <xsl:when test="$New/tei:constraintSpec">
+            <xsl:apply-templates mode="justcopy" select="$New/tei:constraintSpec"/>
+          </xsl:when>
+          <xsl:when test="$Old/tei:constraintSpec">
+            <xsl:copy-of select="$Old/tei:constraintSpec"/>
+          </xsl:when>
+        </xsl:choose>
+        <xsl:choose>
           <xsl:when test="$New/tei:defaultVal">
             <xsl:apply-templates mode="justcopy" select="$New/tei:defaultVal"/>
           </xsl:when>

From bb946985a64e10af43f952bf98e94b305736dcd5 Mon Sep 17 00:00:00 2001
From: Piotr Banski <bansp@users.noreply.github.com>
Date: Thu, 28 Mar 2024 19:47:40 +0100
Subject: [PATCH 40/50] link fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d0a81b84..d86c17e0a 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ In particular, Stylesheets assume that you use `ant` version 1.9.x+. If for some
 
 It is helpful to have the TEI environment installed locally. Please refer to http://www.tei-c.org/Guidelines/P5/get.xml for hints on how to do that.
 
-It is also possible to avoid manual installation of additional tools, by resorting to the pre-built test environment in Docker described in http://teic.github.io/TCW/testing_and_building.html .
+It is also possible to avoid manual installation of additional tools, by resorting to the pre-built test environment in Docker described in https://teic.github.io/Documentation/TCW/testing_and_building.html .
 
 ## Usage
 The `bin/` directory contains several executable files, which can be run on Linux, OS X, or other Unix operating systems. These perform a variety of transformations and are very useful for, e.g., generating a schema from a TEI ODD. Some examples:

From 5a48e1595f0bf7d35c1dcd50993724cd346d4cd9 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Wed, 1 May 2024 14:47:09 -0400
Subject: [PATCH 41/50] Updated P5 subset: Initially with @trishaoconnor,
 updated p5subset to current version from TEI dev branch. This required
 reverting commit 61247e54d5412e5f1a2e46adb76ef92879c66b3a from TEI issue
 2498, PR 2520, and lots of work, including discussion at SVF2F.

---
 Test/expected-results/oddbyexample.odd       |    9 +
 Test/expected-results/test.isosch            |   84 +-
 Test/expected-results/test.odd.html          |    4 +-
 Test/expected-results/test.rng               |  336 ++--
 Test/expected-results/test15.odd.html        |    8 +-
 Test/expected-results/test15.odd.rnc         |  248 ++-
 Test/expected-results/test21.odd.rnc         |  329 ++--
 Test/expected-results/test30.rnc             |  273 ++-
 Test/expected-results/test33.rnc             |  163 +-
 Test/expected-results/test34.combined.json   |   25 +-
 Test/expected-results/test34.rnc             |  163 +-
 Test/expected-results/test35.rnc             |  163 +-
 Test/expected-results/testClass.rnc          |   30 +-
 Test/expected-results/testdrama.compiled.xml |  872 +++++----
 Test2/expected-results/testAttValQuant.rng   |  275 +--
 Test2/expected-results/testPure1.rng         |  427 ++---
 source/p5subset.xml                          | 1656 +++++++++---------
 17 files changed, 2545 insertions(+), 2520 deletions(-)

diff --git a/Test/expected-results/oddbyexample.odd b/Test/expected-results/oddbyexample.odd
index dea6071c6..fd1e52cf8 100644
--- a/Test/expected-results/oddbyexample.odd
+++ b/Test/expected-results/oddbyexample.odd
@@ -172,6 +172,15 @@
             <moduleRef key="header"
                        include="teiHeader fileDesc titleStmt publicationStmt sourceDesc"/>
             <!--Checking module gaiji-->
+            <classRef key="att.gaijiProp"/>
+            <classSpec ident="att.gaijiProp" type="atts" mode="change">
+               <attList>
+                  <attDef ident="name" mode="delete"/>
+                  <attDef ident="value" mode="delete"/>
+                  <attDef ident="version" mode="delete"/>
+                  <attDef ident="scheme" mode="delete"/>
+               </attList>
+            </classSpec>
             <!--Checking module verse-->
             <!--Checking module transcr-->
             <!--Checking module linking-->
diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch
index 5877f4663..7bdf4f0c7 100644
--- a/Test/expected-results/test.isosch
+++ b/Test/expected-results/test.isosch
@@ -80,16 +80,16 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
    </pattern>
    <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-ab-or-p-11">
       <rule context="tei:p">
-         <report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
-        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
-      </report>
+         <report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
+          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
+        </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-l-or-lg-12">
       <rule context="tei:p">
-         <report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-      </report>
+         <report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-desc-deprecationInfo-only-in-deprecated-13">
@@ -103,20 +103,17 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
    </pattern>
    <pattern id="schematron-constraint-test-rt-target-rt-target-not-span-14">
       <rule context="tei:rt/@target">
-         <report test="../@from | ../@to">When target= is
-            present, neither from= nor to= should be.</report>
+         <report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-rt-from-rt-from-15">
       <rule context="tei:rt/@from">
-         <assert test="../@to">When from= is present, the to=
-            attribute of <name/> is required.</assert>
+         <assert test="../@to">When from= is present, the to= attribute of <name/> is required.</assert>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-rt-to-rt-to-16">
       <rule context="tei:rt/@to">
-         <assert test="../@from">When to= is present, the from=
-            attribute of <name/> is required.</assert>
+         <assert test="../@from">When to= is present, the from= attribute of <name/> is required.</assert>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-name-calendar-calendar-check-name-17">
@@ -128,14 +125,12 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
    </pattern>
    <pattern id="schematron-constraint-test-ptr-ptrAtts-18">
       <rule context="tei:ptr">
-         <report test="@target and @cRef">Only one of the
-attributes @target and @cRef may be supplied on <name/>.</report>
+         <report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <name/>.</report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-ref-refAtts-19">
       <rule context="tei:ref">
-         <report test="@target and @cRef">Only one of the
-	attributes @target' and @cRef' may be supplied on <name/>
+         <report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <name/>
          </report>
       </rule>
    </pattern>
@@ -181,31 +176,23 @@ attributes @target and @cRef may be supplied on <name/>.</report>
    </pattern>
    <pattern id="schematron-constraint-test-relatedItem-targetorcontent1-26">
       <rule context="tei:relatedItem">
-         <report test="@target and count( child::* ) &gt; 0">
-If the @target attribute on <name/> is used, the
-relatedItem element must be empty</report>
-         <assert test="@target or child::*">A relatedItem element should have either a 'target' attribute
-        or a child element to indicate the related bibliographic item</assert>
+         <report test="@target and count( child::* ) &gt; 0">If the @target attribute on <name/> is used, the relatedItem element must be empty</report>
+         <assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</assert>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-l-abstractModel-structure-l-in-l-27">
       <rule context="tei:l">
-         <report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
-        Abstract model violation: Lines may not contain lines or lg elements.
-      </report>
+         <report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-lg-atleast1oflggapl-28">
       <rule context="tei:lg">
-         <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
-        must contain at least one child l, lg, or gap element.</assert>
+         <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</assert>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-lg-abstractModel-structure-lg-in-l-29">
       <rule context="tei:lg">
-         <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
-        Abstract model violation: Lines may not contain line groups.
-      </report>
+         <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-sponsor-calendar-calendar-check-sponsor-30">
@@ -245,8 +232,9 @@ relatedItem element must be empty</report>
    </pattern>
    <pattern id="schematron-constraint-test-quotation-quotationContents-35">
       <rule context="tei:quotation">
-         <report test="not(@marks) and not (tei:p)">
-On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
+         <report test="not( @marks )  and  not( tei:p )">
+          On <name/>, either the @marks attribute should be used, or a paragraph of description provided
+        </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-citeStructure-match-citestructure-outer-match-36">
@@ -347,15 +335,15 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
    <pattern id="schematron-constraint-test-div-abstractModel-structure-div-in-l-or-lg-56">
       <rule context="tei:div">
          <report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </report>
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-div-abstractModel-structure-div-in-ab-or-p-57">
       <rule context="tei:div">
          <report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </report>
+          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-link-linkTargets3-58">
@@ -367,22 +355,22 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
    <pattern id="schematron-constraint-test-ab-abstractModel-structure-ab-in-l-or-lg-59">
       <rule context="tei:ab">
          <report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
-      </report>
+          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
+        </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-join-joinTargets3-60">
       <rule context="tei:join">
-         <assert test="contains(@target,' ')">
-You must supply at least two values for @target on <name/>
+         <assert test="contains( normalize-space( @target ),' ')">
+          You must supply at least two values for @target on <name/>
          </assert>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-standOff-nested_standOff_should_be_typed-61">
       <rule context="tei:standOff">
          <assert test="@type or not(ancestor::tei:standOff)">This
-      <name/> element must have a @type attribute, since it is
-      nested inside a <name/>
+        <name/> element must have a @type attribute, since it is
+        nested inside a <name/>
          </assert>
       </rule>
    </pattern>
@@ -491,4 +479,18 @@ You must supply at least two values for @target on <name/>
                 </report>
       </rule>
    </pattern>
+   <pattern>
+      <rule context="tei:superEntry">
+         <report test="true()" role="nonfatal">
+                  WARNING: use of deprecated element — The <name/> element will be removed from the TEI on 2027-03-07. 
+                </report>
+      </rule>
+   </pattern>
+   <pattern>
+      <rule context="tei:re">
+         <report test="true()" role="nonfatal">
+                  WARNING: use of deprecated element — The <name/> element will be removed from the TEI on 2026-03-10. 
+                </report>
+      </rule>
+   </pattern>
 </schema>
diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html
index 5f70dc96d..dc7ca0623 100644
--- a/Test/expected-results/test.odd.html
+++ b/Test/expected-results/test.odd.html
@@ -3457,7 +3457,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-re.html">re</a>
               </span>: (
               <span xml:lang="en" lang="en">related entry</span>) 
-              <span xml:lang="en" lang="en">contains a dictionary entry for a lexical item related to the headword, such as a compound phrase or derived form, embedded inside a larger entry.</span>[
+              <span xml:lang="en" lang="en" class="outOfDateTranslation">contains a dictionary entry for a lexical item related to the headword, such as a compound phrase or derived form, embedded inside a larger entry.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPRE">9.3.6. Related Entries</a>]</td>
             </tr>
             <tr>
@@ -3897,7 +3897,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-superEntry.html">superEntry</a>
               </span>: (
               <span xml:lang="en" lang="en">super entry</span>) 
-              <span xml:lang="en" lang="en">groups a sequence of entries within any kind of lexical resource, such as a dictionary or lexicon which function as a single unit, for example a set of homographs.</span>[
+              <span xml:lang="en" lang="en" class="outOfDateTranslation">groups a sequence of entries within any kind of lexical resource, such as a dictionary or lexicon which function as a single unit, for example a set of homographs.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr>
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 6f2aa5ee4..49046fc88 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -243,7 +243,10 @@
     <optional>
       <attribute name="confidence">
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
-        <data type="double"/>
+        <data type="double">
+          <param name="minInclusive">0</param>
+          <param name="maxInclusive">1</param>
+        </data>
       </attribute>
     </optional>
   </define>
@@ -364,7 +367,10 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
       <attribute name="degree">
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a coded representation of the degree of damage, either as a number between 0 (undamaged) and 1 (very extensively damaged), or as one of the codes high, medium, low, or unknown. The <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;damage&gt;</code> element with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@degree</code> attribute should only be used where the text may be read with some confidence; text supplied from other sources should be tagged as <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;supplied&gt;</code>.</a:documentation>
         <choice>
-          <data type="double"/>
+          <data type="double">
+            <param name="minInclusive">0</param>
+            <param name="maxInclusive">1</param>
+          </data>
           <choice>
             <value>high</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
@@ -698,7 +704,10 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
       <attribute name="cert">
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(certainty) signifies the degree of certainty associated with the intervention or interpretation.</a:documentation>
         <choice>
-          <data type="double"/>
+          <data type="double">
+            <param name="minInclusive">0</param>
+            <param name="maxInclusive">1</param>
+          </data>
           <choice>
             <value>high</value>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
@@ -4131,19 +4140,19 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
     <element name="p">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]</a:documentation>
       <ref name="macro.paraContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
-        <rule context="tei:p">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
-        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:p">
+          <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
+          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
+        </sch:report>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
-        <rule context="tei:p">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:p">
+          <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -4337,7 +4346,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
     <element name="desc">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
       <ref name="macro.limitedContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-desc-deprecationInfo-only-in-deprecated-constraint-rule-13">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:desc[ @type eq 'deprecationInfo']">
           <sch:assert test="../@validUntil">Information about a
         deprecation should only be present in a specification element
@@ -4430,11 +4439,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-target-rt-target-not-span-constraint-report-8">
-        <rule context="tei:rt/@target">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@from | ../@to">When target= is
-            present, neither from= nor to= should be.</sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-target-rt-target-not-span-constraint-rule-14">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:rt/@target">
+          <sch:report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</sch:report>
+        </sch:rule>
       </pattern>
       <optional>
         <attribute name="from">
@@ -4444,11 +4452,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-from-rt-from-constraint-assert-7">
-        <rule context="tei:rt/@from">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@to">When from= is present, the to=
-            attribute of <sch:name/> is required.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-from-rt-from-constraint-rule-15">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:rt/@from">
+          <sch:assert test="../@to">When from= is present, the to= attribute of <sch:name/> is required.</sch:assert>
+        </sch:rule>
       </pattern>
       <optional>
         <attribute name="to">
@@ -4458,11 +4465,10 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-to-rt-to-constraint-assert-8">
-        <rule context="tei:rt/@to">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="../@from">When to= is present, the from=
-            attribute of <sch:name/> is required.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-to-rt-to-constraint-rule-16">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:rt/@to">
+          <sch:assert test="../@from">When to= is present, the from= attribute of <sch:name/> is required.</sch:assert>
+        </sch:rule>
       </pattern>
       <empty/>
     </element>
@@ -4686,7 +4692,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-name-calendar-calendar-check-name-constraint-rule-12">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-name-calendar-calendar-check-name-constraint-rule-17">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -4926,11 +4932,10 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
     <element name="ptr">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ptr-ptrAtts-constraint-report-9">
-        <rule context="tei:ptr">
-          <report test="@target and @cRef">Only one of the
-attributes @target and @cRef may be supplied on <name/>.</report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ptr-ptrAtts-constraint-rule-18">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:ptr">
+          <sch:report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <sch:name/>.</sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.cReferencing.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -4945,12 +4950,11 @@ attributes @target and @cRef may be supplied on <name/>.</report>
     <element name="ref">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
       <ref name="macro.paraContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ref-refAtts-constraint-report-10">
-        <rule context="tei:ref">
-          <report test="@target and @cRef">Only one of the
-	attributes @target' and @cRef' may be supplied on <name/>
-               </report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ref-refAtts-constraint-rule-19">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:ref">
+          <sch:report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <sch:name/>
+               </sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.cReferencing.attributes"/>
       <ref name="att.declaring.attributes"/>
@@ -5007,7 +5011,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
           </zeroOrMore>
         </zeroOrMore>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-list-gloss-list-must-have-labels-constraint-rule-13">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-list-gloss-list-must-have-labels-constraint-rule-20">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:list[@type='gloss']">
           <sch:assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</sch:assert>
         </sch:rule>
@@ -5433,7 +5437,7 @@ Elements]</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-author-calendar-calendar-check-author-constraint-rule-14">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-author-calendar-calendar-check-author-constraint-rule-21">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5462,7 +5466,7 @@ Elements]</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-editor-calendar-calendar-check-editor-constraint-rule-15">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-editor-calendar-calendar-check-editor-constraint-rule-22">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5522,7 +5526,7 @@ Elements]</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-resp-calendar-calendar-check-resp-constraint-rule-16">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-resp-calendar-calendar-check-resp-constraint-rule-23">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5561,7 +5565,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-title-calendar-calendar-check-title-constraint-rule-17">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-title-calendar-calendar-check-title-constraint-rule-24">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5607,7 +5611,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-meeting-calendar-calendar-check-meeting-constraint-rule-18">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-meeting-calendar-calendar-check-meeting-constraint-rule-25">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5777,14 +5781,11 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           <ref name="model.ptrLike"/>
         </choice>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-relatedItem-targetorcontent1-constraint-report-11">
-        <rule context="tei:relatedItem">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and count( child::* ) &gt; 0">
-If the @target attribute on <sch:name/> is used, the
-relatedItem element must be empty</sch:report>
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target or child::*">A relatedItem element should have either a 'target' attribute
-        or a child element to indicate the related bibliographic item</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-relatedItem-targetorcontent1-constraint-rule-26">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:relatedItem">
+          <sch:report test="@target and count( child::* ) &gt; 0">If the @target attribute on <sch:name/> is used, the relatedItem element must be empty</sch:report>
+          <sch:assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</sch:assert>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
@@ -5811,12 +5812,10 @@ relatedItem element must be empty</sch:report>
           <ref name="model.global"/>
         </choice>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-l-abstractModel-structure-l-in-l-constraint-report-12">
-        <rule context="tei:l">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
-        Abstract model violation: Lines may not contain lines or lg elements.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-l-abstractModel-structure-l-in-l-constraint-rule-27">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:l">
+          <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.fragmentable.attributes"/>
@@ -5857,18 +5856,15 @@ relatedItem element must be empty</sch:report>
           </zeroOrMore>
         </zeroOrMore>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-atleast1oflggapl-constraint-assert-17">
-        <rule context="tei:lg">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
-        must contain at least one child l, lg, or gap element.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-atleast1oflggapl-constraint-rule-28">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:lg">
+          <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</sch:assert>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-abstractModel-structure-lg-in-l-constraint-report-13">
-        <rule context="tei:lg">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
-        Abstract model violation: Lines may not contain line groups.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-abstractModel-structure-lg-in-l-constraint-rule-29">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:lg">
+          <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -6150,7 +6146,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-sponsor-calendar-calendar-check-sponsor-constraint-rule-19">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-sponsor-calendar-calendar-check-sponsor-constraint-rule-30">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6179,7 +6175,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-funder-calendar-calendar-check-funder-constraint-rule-20">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-funder-calendar-calendar-check-funder-constraint-rule-31">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6208,7 +6204,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-principal-calendar-calendar-check-principal-constraint-rule-21">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-principal-calendar-calendar-check-principal-constraint-rule-32">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6340,7 +6336,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-idno-calendar-calendar-check-idno-constraint-rule-22">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-idno-calendar-calendar-check-idno-constraint-rule-33">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6396,7 +6392,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-licence-calendar-calendar-check-licence-constraint-rule-23">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-licence-calendar-calendar-check-licence-constraint-rule-34">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6638,11 +6634,12 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       <zeroOrMore>
         <ref name="model.pLike"/>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-quotation-quotationContents-constraint-report-14">
-        <rule context="tei:quotation">
-          <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="not(@marks) and not (tei:p)">
-On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-quotation-quotationContents-constraint-rule-35">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:quotation">
+          <sch:report test="not( @marks )  and  not( tei:p )">
+          On <sch:name/>, either the @marks attribute should be used, or a paragraph of description provided
+        </sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.declarable.attributes"/>
@@ -6906,15 +6903,15 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.</a:documentation>
         <text/>
       </attribute>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-outer-match-constraint-rule-24">
-        <rule xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[not(parent::tei:citeStructure)]">
-          <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-outer-match-constraint-rule-36">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[not(parent::tei:citeStructure)]">
+          <sch:assert test="starts-with(@match,'/')">An XPath in @match on the outer <sch:name/> must start with '/'.</sch:assert>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-inner-match-constraint-rule-25">
-        <rule xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[parent::tei:citeStructure]">
-          <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-inner-match-constraint-rule-37">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[parent::tei:citeStructure]">
+          <sch:assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <sch:name/>.</sch:assert>
+        </sch:rule>
       </pattern>
       <optional>
         <attribute name="unit">
@@ -7150,7 +7147,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-26">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7193,7 +7190,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDef-calendar-calendar-check-unitDef-constraint-rule-27">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDef-calendar-calendar-check-unitDef-constraint-rule-39">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7223,7 +7220,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-conversion-calendar-calendar-check-conversion-constraint-rule-28">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-conversion-calendar-calendar-check-conversion-constraint-rule-40">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7286,7 +7283,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-application-calendar-calendar-check-application-constraint-rule-29">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-application-calendar-calendar-check-application-constraint-rule-41">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7363,7 +7360,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-creation-calendar-calendar-check-creation-constraint-rule-30">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-creation-calendar-calendar-check-creation-constraint-rule-42">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7621,7 +7618,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-change-calendar-calendar-check-change-constraint-rule-31">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-change-calendar-calendar-check-change-constraint-rule-43">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7818,7 +7815,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
           <ref name="back"/>
         </optional>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-facsimile-no_facsimile_text_nodes-constraint-rule-32">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-facsimile-no_facsimile_text_nodes-constraint-rule-44">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:facsimile//tei:line | tei:facsimile//tei:zone">
           <sch:report test="child::text()[ normalize-space(.) ne '']">
           A facsimile element represents a text with images, thus
@@ -7939,7 +7936,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
     <element name="path">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path) defines any line passing through two or more points within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-path-pathmustnotbeclosed-constraint-rule-33">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-path-pathmustnotbeclosed-constraint-rule-45">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:path[@points]">
           <sch:let name="firstPair" value="tokenize( normalize-space( @points ), ' ')[1]"/>
           <sch:let name="lastPair" value="tokenize( normalize-space( @points ), ' ')[last()]"/>
@@ -7985,15 +7982,15 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
     <element name="addSpan">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;add&gt;</code>). [11.3.1.4. Additions and Deletions]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-constraint-assert-31">
-        <rule context="tei:addSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-constraint-rule-46">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:addSpan">
+          <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-fr-constraint-assert-32">
-        <rule context="tei:addSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-fr-constraint-rule-47">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:addSpan">
+          <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.transcriptional.attributes"/>
@@ -8018,15 +8015,15 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
     <element name="damageSpan">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-constraint-assert-33">
-        <rule context="tei:damageSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-constraint-rule-48">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:damageSpan">
+          <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-34">
-        <rule context="tei:damageSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-49">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:damageSpan">
+          <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.damaged.attributes"/>
@@ -8039,15 +8036,15 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
     <element name="delSpan">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [11.3.1.4. Additions and Deletions]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-constraint-assert-35">
-        <rule context="tei:delSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-constraint-rule-50">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:delSpan">
+          <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-fr-constraint-assert-36">
-        <rule context="tei:delSpan">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@spanTo">L'attribut spanTo est requis.</sch:assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-fr-constraint-rule-51">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:delSpan">
+          <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.transcriptional.attributes"/>
@@ -8209,10 +8206,10 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
           <ref name="model.milestoneLike"/>
         </choice>
       </oneOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-subst-substContents1-constraint-assert-37">
-        <rule context="tei:subst">
-          <assert xmlns:xi="http://www.w3.org/2001/XInclude" test="child::tei:add and (child::tei:del or child::tei:surplus)"><name/> must have at least one child add and at least one child del or surplus</assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-subst-substContents1-constraint-rule-52">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:subst">
+          <sch:assert test="child::tei:add and (child::tei:del or child::tei:surplus)"><sch:name/> must have at least one child add and at least one child del or surplus</sch:assert>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.transcriptional.attributes"/>
@@ -9251,19 +9248,19 @@ Suggested values include: 1] initial; 2] final</a:documentation>
           </rng:group>
         </rng:optional>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-report-17">
-        <rule context="tei:div">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-53">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:div">
+          <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+        </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-ab-or-p-constraint-report-18">
-        <rule context="tei:div">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-54">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:div">
+          <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.divLike.attributes"/>
@@ -10165,11 +10162,11 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
     <element name="link">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-link-linkTargets3-constraint-assert-38">
-        <rule context="tei:link">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-link-linkTargets3-constraint-rule-55">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:link">
+          <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
                </sch:assert>
-        </rule>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.attributes"/>
@@ -10200,12 +10197,12 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
     <element name="ab">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
       <ref name="macro.abContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-19">
-        <rule context="tei:ab">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-56">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:ab">
+          <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
@@ -10368,12 +10365,12 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
           <ref name="model.certLike"/>
         </choice>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-join-joinTargets3-constraint-assert-39">
-        <rule context="tei:join">
-          <assert xmlns:xi="http://www.w3.org/2001/XInclude" test="contains(@target,' ')">
-You must supply at least two values for @target on <name/>
-               </assert>
-        </rule>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-join-joinTargets3-constraint-rule-57">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:join">
+          <sch:assert test="contains( normalize-space( @target ),' ')">
+          You must supply at least two values for @target on <sch:name/>
+               </sch:assert>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.attributes"/>
@@ -10467,10 +10464,19 @@ You must supply at least two values for @target on <name/>
         <attribute name="weights">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">If <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is excl, each weight states the probability that the corresponding alternative occurs. If <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs.</a:documentation>
           <list>
-            <data type="double"/>
-            <data type="double"/>
+            <data type="double">
+              <param name="minInclusive">0</param>
+              <param name="maxInclusive">1</param>
+            </data>
+            <data type="double">
+              <param name="minInclusive">0</param>
+              <param name="maxInclusive">1</param>
+            </data>
             <zeroOrMore>
-              <data type="double"/>
+              <data type="double">
+                <param name="minInclusive">0</param>
+                <param name="maxInclusive">1</param>
+              </data>
             </zeroOrMore>
           </list>
         </attribute>
@@ -10514,13 +10520,13 @@ You must supply at least two values for @target on <name/>
       <oneOrMore>
         <ref name="model.standOffPart"/>
       </oneOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-standOff-nested_standOff_should_be_typed-constraint-assert-40">
-        <rule context="tei:standOff">
-          <sch:assert xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="@type or not(ancestor::tei:standOff)">This
-      <sch:name/> element must have a @type attribute, since it is
-      nested inside a <sch:name/>
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-standOff-nested_standOff_should_be_typed-constraint-rule-58">
+        <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:standOff">
+          <sch:assert test="@type or not(ancestor::tei:standOff)">This
+        <sch:name/> element must have a @type attribute, since it is
+        nested inside a <sch:name/>
                </sch:assert>
-        </rule>
+        </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html
index 8262a22af..62b9e15cd 100644
--- a/Test/expected-results/test15.odd.html
+++ b/Test/expected-results/test15.odd.html
@@ -756,7 +756,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Schematron</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div class="pre" itemprop="ab">&lt;sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"&gt; Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. &lt;/sch:report&gt;</div>
+                  <div class="pre" itemprop="ab">&lt;sch:rule context="tei:div"&gt; &lt;sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"&gt; Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. &lt;/sch:report&gt; &lt;/sch:rule&gt;</div>
                 </td>
               </tr>
               <tr itemprop="row">
@@ -764,7 +764,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Schematron</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div class="pre" itemprop="ab">&lt;sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"&gt; Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. &lt;/sch:report&gt;</div>
+                  <div class="pre" itemprop="ab">&lt;sch:rule context="tei:div"&gt; &lt;sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"&gt; Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. &lt;/sch:report&gt; &lt;/sch:rule&gt;</div>
                 </td>
               </tr>
               <tr itemprop="row">
@@ -1320,7 +1320,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Schematron</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div class="pre" itemprop="ab">&lt;sch:report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"&gt; Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. &lt;/sch:report&gt;</div>
+                  <div class="pre" itemprop="ab">&lt;sch:rule context="tei:p"&gt; &lt;sch:report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText | parent::tei:exemplum | parent::tei:item | parent::tei:note | parent::tei:q | parent::tei:quote | parent::tei:remarks | parent::tei:said | parent::tei:sp | parent::tei:stage | parent::tei:cell | parent::tei:figure )"&gt; Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. &lt;/sch:report&gt; &lt;/sch:rule&gt;</div>
                 </td>
               </tr>
               <tr itemprop="row">
@@ -1328,7 +1328,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Schematron</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div class="pre" itemprop="ab">&lt;sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"&gt; Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. &lt;/sch:report&gt;</div>
+                  <div class="pre" itemprop="ab">&lt;sch:rule context="tei:p"&gt; &lt;sch:report test="( ancestor::tei:l or ancestor::tei:lg ) and not( ancestor::tei:floatingText | parent::tei:figure | parent::tei:note )"&gt; Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. &lt;/sch:report&gt; &lt;/sch:rule&gt;</div>
                 </td>
               </tr>
               <tr itemprop="row">
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index 076d5b715..cd8a6e716 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -124,7 +124,9 @@ att.ranging.attribute.confidence =
       ", or the proportion of observed values that fall within that range."
     ]
   ]
-  attribute confidence { xsd:double }?
+  attribute confidence {
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
+  }?
 att.dimensions.attributes =
   att.ranging.attributes,
   att.dimensions.attribute.unit,
@@ -511,7 +513,7 @@ att.global.responsibility.attribute.cert =
   
   ## (certainty) signifies the degree of certainty associated with the intervention or interpretation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -2175,7 +2177,7 @@ p =
     macro.paraContent
     >> sch:pattern [
          id =
-           "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
+           "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2184,10 +2186,10 @@ p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2197,7 +2199,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
+           "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2206,10 +2208,10 @@ p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2378,7 +2380,7 @@ desc =
     macro.limitedContent
     >> sch:pattern [
          id =
-           "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
+           "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2466,7 +2468,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test15-rt-target-rt-target-not-span-constraint-report-8"
+         id = "test15-rt-target-rt-target-not-span-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2475,8 +2477,7 @@ rt =
            "               "
            sch:report [
              test = "../@from | ../@to"
-             "When target= is\x{a}" ~
-             "            present, neither from= nor to= should be."
+             "When target= is present, neither from= nor to= should be."
            ]
            "\x{a}" ~
            "            "
@@ -2490,7 +2491,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test15-rt-from-rt-from-constraint-assert-7"
+         id = "test15-rt-from-rt-from-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2499,8 +2500,7 @@ rt =
            "               "
            sch:assert [
              test = "../@to"
-             "When from= is present, the to=\x{a}" ~
-             "            attribute of "
+             "When from= is present, the to= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2516,7 +2516,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test15-rt-to-rt-to-constraint-assert-8"
+         id = "test15-rt-to-rt-to-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2525,8 +2525,7 @@ rt =
            "               "
            sch:assert [
              test = "../@from"
-             "When to= is present, the from=\x{a}" ~
-             "            attribute of "
+             "When to= is present, the from= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2715,7 +2714,7 @@ name =
      }?)
     >> sch:pattern [
          id =
-           "test15-name-calendar-calendar-check-name-constraint-rule-12"
+           "test15-name-calendar-calendar-check-name-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2908,7 +2907,7 @@ ptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "test15-ptr-ptrAtts-constraint-report-9"
+         id = "test15-ptr-ptrAtts-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2917,8 +2916,7 @@ ptr =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "attributes @target and @cRef may be supplied on "
+             "Only one of the attributes @target and @cRef may be supplied on "
              sch:name [ ]
              "."
            ]
@@ -2942,7 +2940,7 @@ ref =
   element ref {
     macro.paraContent
     >> sch:pattern [
-         id = "test15-ref-refAtts-constraint-report-10"
+         id = "test15-ref-refAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2951,8 +2949,7 @@ ref =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "	attributes @target' and @cRef' may be supplied on "
+             "Only one of the attributes @target' and @cRef' may be supplied on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -2983,7 +2980,7 @@ ref =
      (model.divBottom, model.global*)*)
     >> sch:pattern [
          id =
-           "test15-list-gloss-list-must-have-labels-constraint-rule-13"
+           "test15-list-gloss-list-must-have-labels-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3308,7 +3305,7 @@ author =
      }?)
     >> sch:pattern [
          id =
-           "test15-author-calendar-calendar-check-author-constraint-rule-14"
+           "test15-author-calendar-calendar-check-author-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3348,7 +3345,7 @@ editor =
      }?)
     >> sch:pattern [
          id =
-           "test15-editor-calendar-calendar-check-editor-constraint-rule-15"
+           "test15-editor-calendar-calendar-check-editor-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3398,7 +3395,7 @@ resp =
      }?)
     >> sch:pattern [
          id =
-           "test15-resp-calendar-calendar-check-resp-constraint-rule-16"
+           "test15-resp-calendar-calendar-check-resp-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3445,7 +3442,7 @@ title =
      }?)
     >> sch:pattern [
          id =
-           "test15-title-calendar-calendar-check-title-constraint-rule-17"
+           "test15-title-calendar-calendar-check-title-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3504,7 +3501,7 @@ meeting =
      }?)
     >> sch:pattern [
          id =
-           "test15-meeting-calendar-calendar-check-meeting-constraint-rule-18"
+           "test15-meeting-calendar-calendar-check-meeting-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3622,7 +3619,7 @@ relatedItem =
   element relatedItem {
     ((model.biblLike | model.ptrLike)?)
     >> sch:pattern [
-         id = "test15-relatedItem-targetorcontent1-constraint-report-11"
+         id = "test15-relatedItem-targetorcontent1-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3631,18 +3628,15 @@ relatedItem =
            "               "
            sch:report [
              test = "@target and count( child::* ) > 0"
-             "\x{a}" ~
              "If the @target attribute on "
              sch:name [ ]
-             " is used, the\x{a}" ~
-             "relatedItem element must be empty"
+             " is used, the relatedItem element must be empty"
            ]
            "\x{a}" ~
            "               "
            sch:assert [
              test = "@target or child::*"
-             "A relatedItem element should have either a 'target' attribute\x{a}" ~
-             "        or a child element to indicate the related bibliographic item"
+             "A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item"
            ]
            "\x{a}" ~
            "            "
@@ -3666,7 +3660,7 @@ l =
     ((text | model.gLike | model.phrase | model.inter | model.global)*)
     >> sch:pattern [
          id =
-           "test15-l-abstractModel-structure-l-in-l-constraint-report-12"
+           "test15-l-abstractModel-structure-l-in-l-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3676,9 +3670,7 @@ l =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain lines or lg elements.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain lines or lg elements."
            ]
            "\x{a}" ~
            "            "
@@ -3708,7 +3700,7 @@ lg =
       | lg)*,
      (model.divBottom, model.global*)*)
     >> sch:pattern [
-         id = "test15-lg-atleast1oflggapl-constraint-assert-17"
+         id = "test15-lg-atleast1oflggapl-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3718,8 +3710,7 @@ lg =
            sch:assert [
              test =
                "count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0"
-             "An lg element\x{a}" ~
-             "        must contain at least one child l, lg, or gap element."
+             "An lg element must contain at least one child l, lg, or gap element."
            ]
            "\x{a}" ~
            "            "
@@ -3729,7 +3720,7 @@ lg =
        ]
     >> sch:pattern [
          id =
-           "test15-lg-abstractModel-structure-lg-in-l-constraint-report-13"
+           "test15-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3739,9 +3730,7 @@ lg =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain line groups.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain line groups."
            ]
            "\x{a}" ~
            "            "
@@ -3953,7 +3942,7 @@ sponsor =
      }?)
     >> sch:pattern [
          id =
-           "test15-sponsor-calendar-calendar-check-sponsor-constraint-rule-19"
+           "test15-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3993,7 +3982,7 @@ funder =
      }?)
     >> sch:pattern [
          id =
-           "test15-funder-calendar-calendar-check-funder-constraint-rule-20"
+           "test15-funder-calendar-calendar-check-funder-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4033,7 +4022,7 @@ principal =
      }?)
     >> sch:pattern [
          id =
-           "test15-principal-calendar-calendar-check-principal-constraint-rule-21"
+           "test15-principal-calendar-calendar-check-principal-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4162,7 +4151,7 @@ idno =
      }?)
     >> sch:pattern [
          id =
-           "test15-idno-calendar-calendar-check-idno-constraint-rule-22"
+           "test15-idno-calendar-calendar-check-idno-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4224,7 +4213,7 @@ licence =
      }?)
     >> sch:pattern [
          id =
-           "test15-licence-calendar-calendar-check-licence-constraint-rule-23"
+           "test15-licence-calendar-calendar-check-licence-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4401,7 +4390,7 @@ quotation =
   element quotation {
     (model.pLike*)
     >> sch:pattern [
-         id = "test15-quotation-quotationContents-constraint-report-14"
+         id = "test15-quotation-quotationContents-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4409,11 +4398,12 @@ quotation =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "not(@marks) and not (tei:p)"
+             test = "not( @marks )  and  not( tei:p )"
              "\x{a}" ~
-             "On "
+             "          On "
              sch:name [ ]
-             ", either the @marks attribute should be used, or a paragraph of description provided"
+             ", either the @marks attribute should be used, or a paragraph of description provided\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -4652,7 +4642,7 @@ citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "test15-citeStructure-match-citestructure-outer-match-constraint-rule-24"
+           "test15-citeStructure-match-citestructure-outer-match-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4673,7 +4663,7 @@ citeStructure =
        ]
     >> sch:pattern [
          id =
-           "test15-citeStructure-match-citestructure-inner-match-constraint-rule-25"
+           "test15-citeStructure-match-citestructure-inner-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4855,7 +4845,7 @@ unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "test15-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-26"
+           "test15-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4896,7 +4886,7 @@ unitDef =
      }?)
     >> sch:pattern [
          id =
-           "test15-unitDef-calendar-calendar-check-unitDef-constraint-rule-27"
+           "test15-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4937,7 +4927,7 @@ conversion =
      }?)
     >> sch:pattern [
          id =
-           "test15-conversion-calendar-calendar-check-conversion-constraint-rule-28"
+           "test15-conversion-calendar-calendar-check-conversion-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5003,7 +4993,7 @@ application =
      }?)
     >> sch:pattern [
          id =
-           "test15-application-calendar-calendar-check-application-constraint-rule-29"
+           "test15-application-calendar-calendar-check-application-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5066,7 +5056,7 @@ creation =
      }?)
     >> sch:pattern [
          id =
-           "test15-creation-calendar-calendar-check-creation-constraint-rule-30"
+           "test15-creation-calendar-calendar-check-creation-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5288,7 +5278,7 @@ change =
      }?)
     >> sch:pattern [
          id =
-           "test15-change-calendar-calendar-check-change-constraint-rule-31"
+           "test15-change-calendar-calendar-check-change-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5448,7 +5438,7 @@ floatingText =
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
+           "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5459,8 +5449,8 @@ floatingText =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5470,7 +5460,7 @@ floatingText =
        ]
     >> sch:pattern [
          id =
-           "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
+           "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5481,8 +5471,8 @@ floatingText =
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5918,7 +5908,7 @@ link =
   element link {
     empty
     >> sch:pattern [
-         id = "test15-link-linkTargets3-constraint-assert-31"
+         id = "test15-link-linkTargets3-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5959,7 +5949,7 @@ ab =
     macro.abContent
     >> sch:pattern [
          id =
-           "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5970,8 +5960,8 @@ ab =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -6135,7 +6125,7 @@ join =
   element join {
     ((model.descLike | model.certLike)*)
     >> sch:pattern [
-         id = "test15-join-joinTargets3-constraint-assert-32"
+         id = "test15-join-joinTargets3-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6143,9 +6133,9 @@ join =
            "\x{a}" ~
            "               "
            sch:assert [
-             test = "contains(@target,' ')"
+             test = "contains( normalize-space( @target ),' ')"
              "\x{a}" ~
-             "You must supply at least two values for @target on "
+             "          You must supply at least two values for @target on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -6247,7 +6237,11 @@ alt =
       ]
     ]
     attribute weights {
-      list { xsd:double, xsd:double, xsd:double* }
+      list {
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" }*
+      }
     }?,
     empty
   }
@@ -6283,7 +6277,7 @@ standOff =
     (model.standOffPart+)
     >> sch:pattern [
          id =
-           "test15-standOff-nested_standOff_should_be_typed-constraint-assert-33"
+           "test15-standOff-nested_standOff_should_be_typed-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6293,10 +6287,10 @@ standOff =
            sch:assert [
              test = "@type or not(ancestor::tei:standOff)"
              "This\x{a}" ~
-             "      "
+             "        "
              sch:name [ ]
              " element must have a @type attribute, since it is\x{a}" ~
-             "      nested inside a "
+             "        nested inside a "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -6726,7 +6720,7 @@ orgName =
      }?)
     >> sch:pattern [
          id =
-           "test15-orgName-calendar-calendar-check-orgName-constraint-rule-32"
+           "test15-orgName-calendar-calendar-check-orgName-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6768,7 +6762,7 @@ persName =
      }?)
     >> sch:pattern [
          id =
-           "test15-persName-calendar-calendar-check-persName-constraint-rule-33"
+           "test15-persName-calendar-calendar-check-persName-constraint-rule-51"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6866,7 +6860,7 @@ placeName =
      }?)
     >> sch:pattern [
          id =
-           "test15-placeName-calendar-calendar-check-placeName-constraint-rule-34"
+           "test15-placeName-calendar-calendar-check-placeName-constraint-rule-52"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6907,7 +6901,7 @@ bloc =
      }?)
     >> sch:pattern [
          id =
-           "test15-bloc-calendar-calendar-check-bloc-constraint-rule-35"
+           "test15-bloc-calendar-calendar-check-bloc-constraint-rule-53"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6948,7 +6942,7 @@ country =
      }?)
     >> sch:pattern [
          id =
-           "test15-country-calendar-calendar-check-country-constraint-rule-36"
+           "test15-country-calendar-calendar-check-country-constraint-rule-54"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6989,7 +6983,7 @@ region =
      }?)
     >> sch:pattern [
          id =
-           "test15-region-calendar-calendar-check-region-constraint-rule-37"
+           "test15-region-calendar-calendar-check-region-constraint-rule-55"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7030,7 +7024,7 @@ settlement =
      }?)
     >> sch:pattern [
          id =
-           "test15-settlement-calendar-calendar-check-settlement-constraint-rule-38"
+           "test15-settlement-calendar-calendar-check-settlement-constraint-rule-56"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7071,7 +7065,7 @@ district =
      }?)
     >> sch:pattern [
          id =
-           "test15-district-calendar-calendar-check-district-constraint-rule-39"
+           "test15-district-calendar-calendar-check-district-constraint-rule-57"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7114,7 +7108,7 @@ offset =
      }?)
     >> sch:pattern [
          id =
-           "test15-offset-calendar-calendar-check-offset-constraint-rule-40"
+           "test15-offset-calendar-calendar-check-offset-constraint-rule-58"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7156,7 +7150,7 @@ geogName =
      }?)
     >> sch:pattern [
          id =
-           "test15-geogName-calendar-calendar-check-geogName-constraint-rule-41"
+           "test15-geogName-calendar-calendar-check-geogName-constraint-rule-59"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7199,7 +7193,7 @@ geogFeat =
      }?)
     >> sch:pattern [
          id =
-           "test15-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-42"
+           "test15-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-60"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7259,7 +7253,7 @@ affiliation =
      }?)
     >> sch:pattern [
          id =
-           "test15-affiliation-calendar-calendar-check-affiliation-constraint-rule-43"
+           "test15-affiliation-calendar-calendar-check-affiliation-constraint-rule-61"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7307,7 +7301,7 @@ age =
      }?)
     >> sch:pattern [
          id =
-           "test15-age-calendar-calendar-check-age-constraint-rule-44"
+           "test15-age-calendar-calendar-check-age-constraint-rule-62"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7359,7 +7353,7 @@ birth =
      }?)
     >> sch:pattern [
          id =
-           "test15-birth-calendar-calendar-check-birth-constraint-rule-45"
+           "test15-birth-calendar-calendar-check-birth-constraint-rule-63"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7404,7 +7398,7 @@ climate =
      }?)
     >> sch:pattern [
          id =
-           "test15-climate-calendar-calendar-check-climate-constraint-rule-46"
+           "test15-climate-calendar-calendar-check-climate-constraint-rule-64"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7453,7 +7447,7 @@ death =
      }?)
     >> sch:pattern [
          id =
-           "test15-death-calendar-calendar-check-death-constraint-rule-47"
+           "test15-death-calendar-calendar-check-death-constraint-rule-65"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7501,7 +7495,7 @@ education =
      }?)
     >> sch:pattern [
          id =
-           "test15-education-calendar-calendar-check-education-constraint-rule-48"
+           "test15-education-calendar-calendar-check-education-constraint-rule-66"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7553,7 +7547,7 @@ event =
      }?)
     >> sch:pattern [
          id =
-           "test15-event-calendar-calendar-check-event-constraint-rule-49"
+           "test15-event-calendar-calendar-check-event-constraint-rule-67"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7601,7 +7595,7 @@ faith =
      }?)
     >> sch:pattern [
          id =
-           "test15-faith-calendar-calendar-check-faith-constraint-rule-50"
+           "test15-faith-calendar-calendar-check-faith-constraint-rule-68"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7642,7 +7636,7 @@ floruit =
      }?)
     >> sch:pattern [
          id =
-           "test15-floruit-calendar-calendar-check-floruit-constraint-rule-51"
+           "test15-floruit-calendar-calendar-check-floruit-constraint-rule-69"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7683,7 +7677,7 @@ gender =
      }?)
     >> sch:pattern [
          id =
-           "test15-gender-calendar-calendar-check-gender-constraint-rule-52"
+           "test15-gender-calendar-calendar-check-gender-constraint-rule-70"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7748,7 +7742,7 @@ langKnowledge =
      }?)
     >> sch:pattern [
          id =
-           "test15-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-53"
+           "test15-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-71"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7798,7 +7792,7 @@ langKnown =
      }?)
     >> sch:pattern [
          id =
-           "test15-langKnown-calendar-calendar-check-langKnown-constraint-rule-54"
+           "test15-langKnown-calendar-calendar-check-langKnown-constraint-rule-72"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7926,7 +7920,7 @@ location =
      }?)
     >> sch:pattern [
          id =
-           "test15-location-calendar-calendar-check-location-constraint-rule-55"
+           "test15-location-calendar-calendar-check-location-constraint-rule-73"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7974,7 +7968,7 @@ nationality =
      }?)
     >> sch:pattern [
          id =
-           "test15-nationality-calendar-calendar-check-nationality-constraint-rule-56"
+           "test15-nationality-calendar-calendar-check-nationality-constraint-rule-74"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8022,7 +8016,7 @@ occupation =
      }?)
     >> sch:pattern [
          id =
-           "test15-occupation-calendar-calendar-check-occupation-constraint-rule-57"
+           "test15-occupation-calendar-calendar-check-occupation-constraint-rule-75"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8235,7 +8229,7 @@ persPronouns =
      }?)
     >> sch:pattern [
          id =
-           "test15-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-58"
+           "test15-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-76"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8307,7 +8301,7 @@ population =
      }?)
     >> sch:pattern [
          id =
-           "test15-population-calendar-calendar-check-population-constraint-rule-59"
+           "test15-population-calendar-calendar-check-population-constraint-rule-77"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8336,7 +8330,7 @@ relation =
   element relation {
     (desc?)
     >> sch:pattern [
-         id = "test15-relation-reforkeyorname-constraint-assert-62"
+         id = "test15-relation-ref-or-key-or-name-constraint-rule-78"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8345,7 +8339,7 @@ relation =
            "               "
            sch:assert [
              test = "@ref or @key or @name"
-             "One of the attributes  'name', 'ref' or 'key' must be supplied"
+             "One of the attributes @name, @ref or @key must be supplied"
            ]
            "\x{a}" ~
            "            "
@@ -8354,7 +8348,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test15-relation-activemutual-constraint-report-18"
+         id = "test15-relation-active-mutual-constraint-rule-79"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8372,7 +8366,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test15-relation-activepassive-constraint-report-19"
+         id = "test15-relation-active-passive-constraint-rule-80"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8381,7 +8375,7 @@ relation =
            "               "
            sch:report [
              test = "@passive and not(@active)"
-             "the attribute 'passive' may be supplied only if the attribute 'active' is supplied"
+             "the attribute @passive may be supplied only if the attribute @active is supplied"
            ]
            "\x{a}" ~
            "            "
@@ -8404,7 +8398,7 @@ relation =
      }?)
     >> sch:pattern [
          id =
-           "test15-relation-calendar-calendar-check-relation-constraint-rule-60"
+           "test15-relation-calendar-calendar-check-relation-constraint-rule-81"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8414,8 +8408,8 @@ relation =
            sch:assert [
              test = "string-length( normalize-space(.) ) gt 0"
              " @calendar indicates one or more\x{a}" ~
-             "                        systems or calendars to which the date represented by the content of this element belongs,\x{a}" ~
-             "                        but this "
+             "              systems or calendars to which the date represented by the content of this element belongs,\x{a}" ~
+             "              but this "
              sch:name [ ]
              " element has no textual content."
            ]
@@ -8478,7 +8472,7 @@ residence =
      }?)
     >> sch:pattern [
          id =
-           "test15-residence-calendar-calendar-check-residence-constraint-rule-61"
+           "test15-residence-calendar-calendar-check-residence-constraint-rule-82"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8519,7 +8513,7 @@ sex =
      }?)
     >> sch:pattern [
          id =
-           "test15-sex-calendar-calendar-check-sex-constraint-rule-62"
+           "test15-sex-calendar-calendar-check-sex-constraint-rule-83"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8574,7 +8568,7 @@ socecStatus =
      }?)
     >> sch:pattern [
          id =
-           "test15-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-63"
+           "test15-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-84"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8641,7 +8635,7 @@ state =
      }?)
     >> sch:pattern [
          id =
-           "test15-state-calendar-calendar-check-state-constraint-rule-64"
+           "test15-state-calendar-calendar-check-state-constraint-rule-85"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8686,7 +8680,7 @@ terrain =
      }?)
     >> sch:pattern [
          id =
-           "test15-terrain-calendar-calendar-check-terrain-constraint-rule-65"
+           "test15-terrain-calendar-calendar-check-terrain-constraint-rule-86"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8733,7 +8727,7 @@ trait =
      }?)
     >> sch:pattern [
          id =
-           "test15-trait-calendar-calendar-check-trait-constraint-rule-66"
+           "test15-trait-calendar-calendar-check-trait-constraint-rule-87"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8775,7 +8769,7 @@ objectName =
      }?)
     >> sch:pattern [
          id =
-           "test15-objectName-calendar-calendar-check-objectName-constraint-rule-67"
+           "test15-objectName-calendar-calendar-check-objectName-constraint-rule-88"
          "\x{a}" ~
          "            "
          sch:rule [
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index 49fbd07cc..72d547e26 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -125,7 +125,9 @@ att.ranging.attribute.confidence =
       ", or the proportion of observed values that fall within that range."
     ]
   ]
-  attribute confidence { xsd:double }?
+  attribute confidence {
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
+  }?
 att.dimensions.attributes =
   att.ranging.attributes,
   att.dimensions.attribute.unit,
@@ -222,7 +224,7 @@ att.damaged.attribute.degree =
     ]
   ]
   attribute degree {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -540,7 +542,7 @@ att.global.responsibility.attribute.cert =
   
   ## (certitude) donne le degré de certitude associée à l'intervention ou à l'interprétation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -2520,7 +2522,7 @@ p =
      }*)
     >> sch:pattern [
          id =
-           "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
+           "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2529,10 +2531,10 @@ p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2542,7 +2544,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
+           "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2551,10 +2553,10 @@ p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2745,7 +2747,7 @@ desc =
     macro.limitedContent
     >> sch:pattern [
          id =
-           "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
+           "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2833,7 +2835,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test21-rt-target-rt-target-not-span-constraint-report-8"
+         id = "test21-rt-target-rt-target-not-span-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2842,8 +2844,7 @@ rt =
            "               "
            sch:report [
              test = "../@from | ../@to"
-             "When target= is\x{a}" ~
-             "            present, neither from= nor to= should be."
+             "When target= is present, neither from= nor to= should be."
            ]
            "\x{a}" ~
            "            "
@@ -2857,7 +2858,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test21-rt-from-rt-from-constraint-assert-7"
+         id = "test21-rt-from-rt-from-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2866,8 +2867,7 @@ rt =
            "               "
            sch:assert [
              test = "../@to"
-             "When from= is present, the to=\x{a}" ~
-             "            attribute of "
+             "When from= is present, the to= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2883,7 +2883,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test21-rt-to-rt-to-constraint-assert-8"
+         id = "test21-rt-to-rt-to-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2892,8 +2892,7 @@ rt =
            "               "
            sch:assert [
              test = "../@from"
-             "When to= is present, the from=\x{a}" ~
-             "            attribute of "
+             "When to= is present, the from= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -3082,7 +3081,7 @@ name =
      }?)
     >> sch:pattern [
          id =
-           "test21-name-calendar-calendar-check-name-constraint-rule-12"
+           "test21-name-calendar-calendar-check-name-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3284,7 +3283,7 @@ ptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "test21-ptr-ptrAtts-constraint-report-9"
+         id = "test21-ptr-ptrAtts-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3293,8 +3292,7 @@ ptr =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "attributes @target and @cRef may be supplied on "
+             "Only one of the attributes @target and @cRef may be supplied on "
              sch:name [ ]
              "."
            ]
@@ -3328,7 +3326,7 @@ ref =
   element ref {
     macro.paraContent
     >> sch:pattern [
-         id = "test21-ref-refAtts-constraint-report-10"
+         id = "test21-ref-refAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3337,8 +3335,7 @@ ref =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "	attributes @target' and @cRef' may be supplied on "
+             "Only one of the attributes @target' and @cRef' may be supplied on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -3369,7 +3366,7 @@ ref =
      (model.divBottom, model.global*)*)
     >> sch:pattern [
          id =
-           "test21-list-gloss-list-must-have-labels-constraint-rule-13"
+           "test21-list-gloss-list-must-have-labels-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3683,7 +3680,7 @@ author =
   element author {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-author-calendar-check-author-constraint-rule-14"
+         id = "test21-author-calendar-check-author-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3719,7 +3716,7 @@ author =
      }?)
     >> sch:pattern [
          id =
-           "test21-author-calendar-calendar-check-author-constraint-rule-15"
+           "test21-author-calendar-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3748,7 +3745,7 @@ editor =
   element editor {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-editor-calendar-check-editor-constraint-rule-16"
+         id = "test21-editor-calendar-check-editor-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3796,7 +3793,7 @@ editor =
      }?)
     >> sch:pattern [
          id =
-           "test21-editor-calendar-calendar-check-editor-constraint-rule-17"
+           "test21-editor-calendar-calendar-check-editor-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3846,7 +3843,7 @@ resp =
      }?)
     >> sch:pattern [
          id =
-           "test21-resp-calendar-calendar-check-resp-constraint-rule-18"
+           "test21-resp-calendar-calendar-check-resp-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3875,7 +3872,7 @@ title =
   element title {
     ((text | hi)*)
     >> sch:pattern [
-         id = "test21-title-calendar-check-title-constraint-rule-19"
+         id = "test21-title-calendar-check-title-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3909,7 +3906,7 @@ title =
      }?)
     >> sch:pattern [
          id =
-           "test21-title-calendar-calendar-check-title-constraint-rule-20"
+           "test21-title-calendar-calendar-check-title-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3968,7 +3965,7 @@ meeting =
      }?)
     >> sch:pattern [
          id =
-           "test21-meeting-calendar-calendar-check-meeting-constraint-rule-21"
+           "test21-meeting-calendar-calendar-check-meeting-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4086,7 +4083,7 @@ relatedItem =
   element relatedItem {
     ((model.biblLike | model.ptrLike)?)
     >> sch:pattern [
-         id = "test21-relatedItem-targetorcontent1-constraint-report-11"
+         id = "test21-relatedItem-targetorcontent1-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4095,18 +4092,15 @@ relatedItem =
            "               "
            sch:report [
              test = "@target and count( child::* ) > 0"
-             "\x{a}" ~
              "If the @target attribute on "
              sch:name [ ]
-             " is used, the\x{a}" ~
-             "relatedItem element must be empty"
+             " is used, the relatedItem element must be empty"
            ]
            "\x{a}" ~
            "               "
            sch:assert [
              test = "@target or child::*"
-             "A relatedItem element should have either a 'target' attribute\x{a}" ~
-             "        or a child element to indicate the related bibliographic item"
+             "A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item"
            ]
            "\x{a}" ~
            "            "
@@ -4130,7 +4124,7 @@ l =
     ((text | model.gLike | model.phrase | model.inter | model.global)*)
     >> sch:pattern [
          id =
-           "test21-l-abstractModel-structure-l-in-l-constraint-report-12"
+           "test21-l-abstractModel-structure-l-in-l-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4140,9 +4134,7 @@ l =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain lines or lg elements.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain lines or lg elements."
            ]
            "\x{a}" ~
            "            "
@@ -4172,7 +4164,7 @@ lg =
       | lg)*,
      (model.divBottom, model.global*)*)
     >> sch:pattern [
-         id = "test21-lg-atleast1oflggapl-constraint-assert-20"
+         id = "test21-lg-atleast1oflggapl-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4182,8 +4174,7 @@ lg =
            sch:assert [
              test =
                "count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0"
-             "An lg element\x{a}" ~
-             "        must contain at least one child l, lg, or gap element."
+             "An lg element must contain at least one child l, lg, or gap element."
            ]
            "\x{a}" ~
            "            "
@@ -4193,7 +4184,7 @@ lg =
        ]
     >> sch:pattern [
          id =
-           "test21-lg-abstractModel-structure-lg-in-l-constraint-report-13"
+           "test21-lg-abstractModel-structure-lg-in-l-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4203,9 +4194,7 @@ lg =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain line groups.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain line groups."
            ]
            "\x{a}" ~
            "            "
@@ -4575,7 +4564,7 @@ orgName =
      }?)
     >> sch:pattern [
          id =
-           "test21-orgName-calendar-calendar-check-orgName-constraint-rule-22"
+           "test21-orgName-calendar-calendar-check-orgName-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4617,7 +4606,7 @@ persName =
      }?)
     >> sch:pattern [
          id =
-           "test21-persName-calendar-calendar-check-persName-constraint-rule-23"
+           "test21-persName-calendar-calendar-check-persName-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4703,7 +4692,7 @@ placeName =
     macro.phraseSeq
     >> sch:pattern [
          id =
-           "test21-placeName-calendar-check-placeName-constraint-rule-24"
+           "test21-placeName-calendar-check-placeName-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4741,7 +4730,7 @@ placeName =
      }?)
     >> sch:pattern [
          id =
-           "test21-placeName-calendar-calendar-check-placeName-constraint-rule-25"
+           "test21-placeName-calendar-calendar-check-placeName-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4782,7 +4771,7 @@ bloc =
      }?)
     >> sch:pattern [
          id =
-           "test21-bloc-calendar-calendar-check-bloc-constraint-rule-26"
+           "test21-bloc-calendar-calendar-check-bloc-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4823,7 +4812,7 @@ country =
      }?)
     >> sch:pattern [
          id =
-           "test21-country-calendar-calendar-check-country-constraint-rule-27"
+           "test21-country-calendar-calendar-check-country-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4864,7 +4853,7 @@ region =
      }?)
     >> sch:pattern [
          id =
-           "test21-region-calendar-calendar-check-region-constraint-rule-28"
+           "test21-region-calendar-calendar-check-region-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4905,7 +4894,7 @@ settlement =
      }?)
     >> sch:pattern [
          id =
-           "test21-settlement-calendar-calendar-check-settlement-constraint-rule-29"
+           "test21-settlement-calendar-calendar-check-settlement-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4946,7 +4935,7 @@ district =
      }?)
     >> sch:pattern [
          id =
-           "test21-district-calendar-calendar-check-district-constraint-rule-30"
+           "test21-district-calendar-calendar-check-district-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4989,7 +4978,7 @@ offset =
      }?)
     >> sch:pattern [
          id =
-           "test21-offset-calendar-calendar-check-offset-constraint-rule-31"
+           "test21-offset-calendar-calendar-check-offset-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5031,7 +5020,7 @@ geogName =
      }?)
     >> sch:pattern [
          id =
-           "test21-geogName-calendar-calendar-check-geogName-constraint-rule-32"
+           "test21-geogName-calendar-calendar-check-geogName-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5074,7 +5063,7 @@ geogFeat =
      }?)
     >> sch:pattern [
          id =
-           "test21-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-33"
+           "test21-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5134,7 +5123,7 @@ affiliation =
      }?)
     >> sch:pattern [
          id =
-           "test21-affiliation-calendar-calendar-check-affiliation-constraint-rule-34"
+           "test21-affiliation-calendar-calendar-check-affiliation-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5182,7 +5171,7 @@ age =
      }?)
     >> sch:pattern [
          id =
-           "test21-age-calendar-calendar-check-age-constraint-rule-35"
+           "test21-age-calendar-calendar-check-age-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5234,7 +5223,7 @@ birth =
      }?)
     >> sch:pattern [
          id =
-           "test21-birth-calendar-calendar-check-birth-constraint-rule-36"
+           "test21-birth-calendar-calendar-check-birth-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5279,7 +5268,7 @@ climate =
      }?)
     >> sch:pattern [
          id =
-           "test21-climate-calendar-calendar-check-climate-constraint-rule-37"
+           "test21-climate-calendar-calendar-check-climate-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5328,7 +5317,7 @@ death =
      }?)
     >> sch:pattern [
          id =
-           "test21-death-calendar-calendar-check-death-constraint-rule-38"
+           "test21-death-calendar-calendar-check-death-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5376,7 +5365,7 @@ education =
      }?)
     >> sch:pattern [
          id =
-           "test21-education-calendar-calendar-check-education-constraint-rule-39"
+           "test21-education-calendar-calendar-check-education-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5428,7 +5417,7 @@ event =
      }?)
     >> sch:pattern [
          id =
-           "test21-event-calendar-calendar-check-event-constraint-rule-40"
+           "test21-event-calendar-calendar-check-event-constraint-rule-51"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5476,7 +5465,7 @@ faith =
      }?)
     >> sch:pattern [
          id =
-           "test21-faith-calendar-calendar-check-faith-constraint-rule-41"
+           "test21-faith-calendar-calendar-check-faith-constraint-rule-52"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5517,7 +5506,7 @@ floruit =
      }?)
     >> sch:pattern [
          id =
-           "test21-floruit-calendar-calendar-check-floruit-constraint-rule-42"
+           "test21-floruit-calendar-calendar-check-floruit-constraint-rule-53"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5558,7 +5547,7 @@ gender =
      }?)
     >> sch:pattern [
          id =
-           "test21-gender-calendar-calendar-check-gender-constraint-rule-43"
+           "test21-gender-calendar-calendar-check-gender-constraint-rule-54"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5623,7 +5612,7 @@ langKnowledge =
      }?)
     >> sch:pattern [
          id =
-           "test21-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-44"
+           "test21-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-55"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5673,7 +5662,7 @@ langKnown =
      }?)
     >> sch:pattern [
          id =
-           "test21-langKnown-calendar-calendar-check-langKnown-constraint-rule-45"
+           "test21-langKnown-calendar-calendar-check-langKnown-constraint-rule-56"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5801,7 +5790,7 @@ location =
      }?)
     >> sch:pattern [
          id =
-           "test21-location-calendar-calendar-check-location-constraint-rule-46"
+           "test21-location-calendar-calendar-check-location-constraint-rule-57"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5849,7 +5838,7 @@ nationality =
      }?)
     >> sch:pattern [
          id =
-           "test21-nationality-calendar-calendar-check-nationality-constraint-rule-47"
+           "test21-nationality-calendar-calendar-check-nationality-constraint-rule-58"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5897,7 +5886,7 @@ occupation =
      }?)
     >> sch:pattern [
          id =
-           "test21-occupation-calendar-calendar-check-occupation-constraint-rule-48"
+           "test21-occupation-calendar-calendar-check-occupation-constraint-rule-59"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6115,7 +6104,7 @@ persPronouns =
      }?)
     >> sch:pattern [
          id =
-           "test21-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-49"
+           "test21-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-60"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6187,7 +6176,7 @@ population =
      }?)
     >> sch:pattern [
          id =
-           "test21-population-calendar-calendar-check-population-constraint-rule-50"
+           "test21-population-calendar-calendar-check-population-constraint-rule-61"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6216,7 +6205,7 @@ relation =
   element relation {
     (desc?)
     >> sch:pattern [
-         id = "test21-relation-reforkeyorname-constraint-assert-50"
+         id = "test21-relation-ref-or-key-or-name-constraint-rule-62"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6225,7 +6214,7 @@ relation =
            "               "
            sch:assert [
              test = "@ref or @key or @name"
-             "One of the attributes  'name', 'ref' or 'key' must be supplied"
+             "One of the attributes @name, @ref or @key must be supplied"
            ]
            "\x{a}" ~
            "            "
@@ -6234,7 +6223,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test21-relation-activemutual-constraint-report-14"
+         id = "test21-relation-active-mutual-constraint-rule-63"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6252,7 +6241,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test21-relation-activepassive-constraint-report-15"
+         id = "test21-relation-active-passive-constraint-rule-64"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6261,7 +6250,7 @@ relation =
            "               "
            sch:report [
              test = "@passive and not(@active)"
-             "the attribute 'passive' may be supplied only if the attribute 'active' is supplied"
+             "the attribute @passive may be supplied only if the attribute @active is supplied"
            ]
            "\x{a}" ~
            "            "
@@ -6284,7 +6273,7 @@ relation =
      }?)
     >> sch:pattern [
          id =
-           "test21-relation-calendar-calendar-check-relation-constraint-rule-51"
+           "test21-relation-calendar-calendar-check-relation-constraint-rule-65"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6294,8 +6283,8 @@ relation =
            sch:assert [
              test = "string-length( normalize-space(.) ) gt 0"
              " @calendar indicates one or more\x{a}" ~
-             "                        systems or calendars to which the date represented by the content of this element belongs,\x{a}" ~
-             "                        but this "
+             "              systems or calendars to which the date represented by the content of this element belongs,\x{a}" ~
+             "              but this "
              sch:name [ ]
              " element has no textual content."
            ]
@@ -6358,7 +6347,7 @@ residence =
      }?)
     >> sch:pattern [
          id =
-           "test21-residence-calendar-calendar-check-residence-constraint-rule-52"
+           "test21-residence-calendar-calendar-check-residence-constraint-rule-66"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6399,7 +6388,7 @@ sex =
      }?)
     >> sch:pattern [
          id =
-           "test21-sex-calendar-calendar-check-sex-constraint-rule-53"
+           "test21-sex-calendar-calendar-check-sex-constraint-rule-67"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6454,7 +6443,7 @@ socecStatus =
      }?)
     >> sch:pattern [
          id =
-           "test21-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-54"
+           "test21-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-68"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6516,7 +6505,7 @@ state =
      }?)
     >> sch:pattern [
          id =
-           "test21-state-calendar-calendar-check-state-constraint-rule-55"
+           "test21-state-calendar-calendar-check-state-constraint-rule-69"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6561,7 +6550,7 @@ terrain =
      }?)
     >> sch:pattern [
          id =
-           "test21-terrain-calendar-calendar-check-terrain-constraint-rule-56"
+           "test21-terrain-calendar-calendar-check-terrain-constraint-rule-70"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6608,7 +6597,7 @@ trait =
      }?)
     >> sch:pattern [
          id =
-           "test21-trait-calendar-calendar-check-trait-constraint-rule-57"
+           "test21-trait-calendar-calendar-check-trait-constraint-rule-71"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6650,7 +6639,7 @@ objectName =
      }?)
     >> sch:pattern [
          id =
-           "test21-objectName-calendar-calendar-check-objectName-constraint-rule-58"
+           "test21-objectName-calendar-calendar-check-objectName-constraint-rule-72"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6817,7 +6806,7 @@ sponsor =
      }?)
     >> sch:pattern [
          id =
-           "test21-sponsor-calendar-calendar-check-sponsor-constraint-rule-59"
+           "test21-sponsor-calendar-calendar-check-sponsor-constraint-rule-73"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6857,7 +6846,7 @@ funder =
      }?)
     >> sch:pattern [
          id =
-           "test21-funder-calendar-calendar-check-funder-constraint-rule-60"
+           "test21-funder-calendar-calendar-check-funder-constraint-rule-74"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6897,7 +6886,7 @@ principal =
      }?)
     >> sch:pattern [
          id =
-           "test21-principal-calendar-calendar-check-principal-constraint-rule-61"
+           "test21-principal-calendar-calendar-check-principal-constraint-rule-75"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7026,7 +7015,7 @@ idno =
      }?)
     >> sch:pattern [
          id =
-           "test21-idno-calendar-calendar-check-idno-constraint-rule-62"
+           "test21-idno-calendar-calendar-check-idno-constraint-rule-76"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7088,7 +7077,7 @@ licence =
      }?)
     >> sch:pattern [
          id =
-           "test21-licence-calendar-calendar-check-licence-constraint-rule-63"
+           "test21-licence-calendar-calendar-check-licence-constraint-rule-77"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7265,7 +7254,7 @@ quotation =
   element quotation {
     (model.pLike*)
     >> sch:pattern [
-         id = "test21-quotation-quotationContents-constraint-report-16"
+         id = "test21-quotation-quotationContents-constraint-rule-78"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7273,11 +7262,12 @@ quotation =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "not(@marks) and not (tei:p)"
+             test = "not( @marks )  and  not( tei:p )"
              "\x{a}" ~
-             "On "
+             "          On "
              sch:name [ ]
-             ", either the @marks attribute should be used, or a paragraph of description provided"
+             ", either the @marks attribute should be used, or a paragraph of description provided\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -7511,7 +7501,7 @@ citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "test21-citeStructure-match-citestructure-outer-match-constraint-rule-64"
+           "test21-citeStructure-match-citestructure-outer-match-constraint-rule-79"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7532,7 +7522,7 @@ citeStructure =
        ]
     >> sch:pattern [
          id =
-           "test21-citeStructure-match-citestructure-inner-match-constraint-rule-65"
+           "test21-citeStructure-match-citestructure-inner-match-constraint-rule-80"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7715,7 +7705,7 @@ unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "test21-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-66"
+           "test21-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-81"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7756,7 +7746,7 @@ unitDef =
      }?)
     >> sch:pattern [
          id =
-           "test21-unitDef-calendar-calendar-check-unitDef-constraint-rule-67"
+           "test21-unitDef-calendar-calendar-check-unitDef-constraint-rule-82"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7797,7 +7787,7 @@ conversion =
      }?)
     >> sch:pattern [
          id =
-           "test21-conversion-calendar-calendar-check-conversion-constraint-rule-68"
+           "test21-conversion-calendar-calendar-check-conversion-constraint-rule-83"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7863,7 +7853,7 @@ application =
      }?)
     >> sch:pattern [
          id =
-           "test21-application-calendar-calendar-check-application-constraint-rule-69"
+           "test21-application-calendar-calendar-check-application-constraint-rule-84"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7935,7 +7925,7 @@ creation =
      }?)
     >> sch:pattern [
          id =
-           "test21-creation-calendar-calendar-check-creation-constraint-rule-70"
+           "test21-creation-calendar-calendar-check-creation-constraint-rule-85"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8142,7 +8132,7 @@ change =
      }?)
     >> sch:pattern [
          id =
-           "test21-change-calendar-calendar-check-change-constraint-rule-71"
+           "test21-change-calendar-calendar-check-change-constraint-rule-86"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8271,7 +8261,7 @@ link =
   element link {
     empty
     >> sch:pattern [
-         id = "test21-link-linkTargets3-constraint-assert-72"
+         id = "test21-link-linkTargets3-constraint-rule-87"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8312,7 +8302,7 @@ ab =
     macro.abContent
     >> sch:pattern [
          id =
-           "test21-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "test21-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-88"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8323,8 +8313,8 @@ ab =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -8514,7 +8504,7 @@ join =
   element join {
     ((model.descLike | model.certLike)*)
     >> sch:pattern [
-         id = "test21-join-joinTargets3-constraint-assert-73"
+         id = "test21-join-joinTargets3-constraint-rule-89"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8522,9 +8512,9 @@ join =
            "\x{a}" ~
            "               "
            sch:assert [
-             test = "contains(@target,' ')"
+             test = "contains( normalize-space( @target ),' ')"
              "\x{a}" ~
-             "You must supply at least two values for @target on "
+             "          You must supply at least two values for @target on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -8628,7 +8618,11 @@ alt =
       ]
     ]
     attribute weights {
-      list { xsd:double, xsd:double, xsd:double* }
+      list {
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" }*
+      }
     }?,
     empty
   }
@@ -8664,7 +8658,7 @@ standOff =
     (model.standOffPart+)
     >> sch:pattern [
          id =
-           "test21-standOff-nested_standOff_should_be_typed-constraint-assert-74"
+           "test21-standOff-nested_standOff_should_be_typed-constraint-rule-90"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8674,10 +8668,10 @@ standOff =
            sch:assert [
              test = "@type or not(ancestor::tei:standOff)"
              "This\x{a}" ~
-             "      "
+             "        "
              sch:name [ ]
              " element must have a @type attribute, since it is\x{a}" ~
-             "      nested inside a "
+             "        nested inside a "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -8845,7 +8839,7 @@ msDesc =
          | msPart
          | msFrag)*))
     >> sch:pattern [
-         id = "test21-msDesc-one_ms_singleton_max-constraint-rule-72"
+         id = "test21-msDesc-one_ms_singleton_max-constraint-rule-91"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8886,8 +8880,7 @@ catchwords =
   element catchwords {
     macro.phraseSeq
     >> sch:pattern [
-         id =
-           "test21-catchwords-catchword_in_msDesc-constraint-assert-75"
+         id = "test21-catchwords-catchword_in_msDesc-constraint-rule-92"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8915,7 +8908,7 @@ dimensions =
   element dimensions {
     ((dim | model.dimLike)*)
     >> sch:pattern [
-         id = "test21-dimensions-duplicateDim-constraint-report-19"
+         id = "test21-dimensions-duplicateDim-constraint-rule-93"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8923,32 +8916,32 @@ dimensions =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "count(tei:width)> 1"
+             test = "count(tei:width) gt 1"
              "\x{a}" ~
-             "        The element "
+             "          The element "
              sch:name [ ]
              " may appear once only\x{a}" ~
-             "      "
+             "        "
            ]
            "\x{a}" ~
            "               "
            sch:report [
-             test = "count(tei:height)> 1"
+             test = "count(tei:height) gt 1"
              "\x{a}" ~
-             "        The element "
+             "          The element "
              sch:name [ ]
              " may appear once only\x{a}" ~
-             "      "
+             "        "
            ]
            "\x{a}" ~
            "               "
            sch:report [
-             test = "count(tei:depth)> 1"
+             test = "count(tei:depth) gt 1"
              "\x{a}" ~
-             "        The element "
+             "          The element "
              sch:name [ ]
              " may appear once only\x{a}" ~
-             "      "
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -9101,7 +9094,7 @@ origPlace =
      }?)
     >> sch:pattern [
          id =
-           "test21-origPlace-calendar-calendar-check-origPlace-constraint-rule-73"
+           "test21-origPlace-calendar-calendar-check-origPlace-constraint-rule-94"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9130,7 +9123,7 @@ secFol =
   element secFol {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-secFol-secFol_in_msDesc-constraint-assert-77"
+         id = "test21-secFol-secFol_in_msDesc-constraint-rule-95"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9159,7 +9152,7 @@ signatures =
     macro.specialPara
     >> sch:pattern [
          id =
-           "test21-signatures-signatures_in_msDesc-constraint-assert-78"
+           "test21-signatures-signatures_in_msDesc-constraint-rule-96"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9198,7 +9191,7 @@ stamp =
      }?)
     >> sch:pattern [
          id =
-           "test21-stamp-calendar-calendar-check-stamp-constraint-rule-74"
+           "test21-stamp-calendar-calendar-check-stamp-constraint-rule-97"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9242,7 +9235,7 @@ msIdentifier =
       idno*),
      (msName | objectName | altIdentifier)*)
     >> sch:pattern [
-         id = "test21-msIdentifier-msId_minimal-constraint-report-22"
+         id = "test21-msIdentifier-msId_minimal-constraint-rule-98"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9251,7 +9244,7 @@ msIdentifier =
            "               "
            sch:report [
              test =
-               "not(parent::tei:msPart) and (local-name(*[1])='idno' or local-name(*[1])='altIdentifier' or normalize-space(.)='')"
+               "not( parent::tei:msPart )                           and                           ( child::*[1]/self::idno  or  child::*[1]/self::altIdentifier  or  normalize-space(.) eq '')"
              "An msIdentifier must contain either a repository or location."
            ]
            "\x{a}" ~
@@ -9319,7 +9312,7 @@ altIdentifier =
      }?)
     >> sch:pattern [
          id =
-           "test21-altIdentifier-calendar-calendar-check-altIdentifier-constraint-rule-75"
+           "test21-altIdentifier-calendar-calendar-check-altIdentifier-constraint-rule-99"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9655,7 +9648,7 @@ binding =
      }?)
     >> sch:pattern [
          id =
-           "test21-binding-calendar-calendar-check-binding-constraint-rule-76"
+           "test21-binding-calendar-calendar-check-binding-constraint-rule-100"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9724,7 +9717,7 @@ seal =
      }?)
     >> sch:pattern [
          id =
-           "test21-seal-calendar-calendar-check-seal-constraint-rule-77"
+           "test21-seal-calendar-calendar-check-seal-constraint-rule-101"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9792,7 +9785,7 @@ origin =
      }?)
     >> sch:pattern [
          id =
-           "test21-origin-calendar-calendar-check-origin-constraint-rule-78"
+           "test21-origin-calendar-calendar-check-origin-constraint-rule-102"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9832,7 +9825,7 @@ provenance =
      }?)
     >> sch:pattern [
          id =
-           "test21-provenance-calendar-calendar-check-provenance-constraint-rule-79"
+           "test21-provenance-calendar-calendar-check-provenance-constraint-rule-103"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9871,7 +9864,7 @@ acquisition =
      }?)
     >> sch:pattern [
          id =
-           "test21-acquisition-calendar-calendar-check-acquisition-constraint-rule-80"
+           "test21-acquisition-calendar-calendar-check-acquisition-constraint-rule-104"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9950,7 +9943,7 @@ custEvent =
      }?)
     >> sch:pattern [
          id =
-           "test21-custEvent-calendar-calendar-check-custEvent-constraint-rule-81"
+           "test21-custEvent-calendar-calendar-check-custEvent-constraint-rule-105"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10094,7 +10087,7 @@ facsimile =
     (front?, (model.graphicLike | surface | surfaceGrp)+, back?)
     >> sch:pattern [
          id =
-           "test21-facsimile-no_facsimile_text_nodes-constraint-rule-82"
+           "test21-facsimile-no_facsimile_text_nodes-constraint-rule-106"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10203,7 +10196,7 @@ path =
   element path {
     empty
     >> sch:pattern [
-         id = "test21-path-pathmustnotbeclosed-constraint-rule-83"
+         id = "test21-path-pathmustnotbeclosed-constraint-rule-107"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10296,7 +10289,7 @@ addSpan =
     empty
     >> sch:pattern [
          id =
-           "test21-addSpan-addSpan-requires-spanTo-constraint-assert-87"
+           "test21-addSpan-addSpan-requires-spanTo-constraint-rule-108"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10317,7 +10310,7 @@ addSpan =
        ]
     >> sch:pattern [
          id =
-           "test21-addSpan-addSpan-requires-spanTo-fr-constraint-assert-88"
+           "test21-addSpan-addSpan-requires-spanTo-fr-constraint-rule-109"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10346,7 +10339,7 @@ addSpan =
     }
     >> sch:pattern [
          id =
-           "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-84"
+           "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-110"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10389,7 +10382,7 @@ damageSpan =
     empty
     >> sch:pattern [
          id =
-           "test21-damageSpan-damageSpan-requires-spanTo-constraint-assert-90"
+           "test21-damageSpan-damageSpan-requires-spanTo-constraint-rule-111"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10410,7 +10403,7 @@ damageSpan =
        ]
     >> sch:pattern [
          id =
-           "test21-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-91"
+           "test21-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-112"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10440,7 +10433,7 @@ delSpan =
     empty
     >> sch:pattern [
          id =
-           "test21-delSpan-delSpan-requires-spanTo-constraint-assert-92"
+           "test21-delSpan-delSpan-requires-spanTo-constraint-rule-113"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10461,7 +10454,7 @@ delSpan =
        ]
     >> sch:pattern [
          id =
-           "test21-delSpan-delSpan-requires-spanTo-fr-constraint-assert-93"
+           "test21-delSpan-delSpan-requires-spanTo-fr-constraint-rule-114"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10607,7 +10600,7 @@ subst =
   element subst {
     ((add | surplus | del | model.milestoneLike)+)
     >> sch:pattern [
-         id = "test21-subst-substContents1-constraint-assert-94"
+         id = "test21-subst-substContents1-constraint-rule-115"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10888,7 +10881,7 @@ group =
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "test21-div-abstractModel-structure-div-in-l-or-lg-constraint-report-25"
+           "test21-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-116"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10899,8 +10892,8 @@ group =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -10910,7 +10903,7 @@ group =
        ]
     >> sch:pattern [
          id =
-           "test21-div-abstractModel-structure-div-in-ab-or-p-constraint-report-26"
+           "test21-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-117"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10921,8 +10914,8 @@ group =
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index bc3c0162b..a4977a482 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -127,7 +127,9 @@ Tatt.ranging.attribute.confidence =
       ", or the proportion of observed values that fall within that range."
     ]
   ]
-  attribute confidence { xsd:double }?
+  attribute confidence {
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
+  }?
 Tatt.dimensions.attributes =
   Tatt.ranging.attributes,
   Tatt.dimensions.attribute.unit,
@@ -231,7 +233,7 @@ Tatt.damaged.attribute.degree =
     ]
   ]
   attribute degree {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -560,7 +562,7 @@ Tatt.global.responsibility.attribute.cert =
   
   ## (certainty) signifies the degree of certainty associated with the intervention or interpretation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -2437,7 +2439,7 @@ Tp =
     Tmacro.paraContent
     >> sch:pattern [
          id =
-           "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
+           "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2446,10 +2448,10 @@ Tp =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2459,7 +2461,7 @@ Tp =
        ]
     >> sch:pattern [
          id =
-           "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
+           "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2468,10 +2470,10 @@ Tp =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2637,7 +2639,7 @@ Tdesc =
     Tmacro.limitedContent
     >> sch:pattern [
          id =
-           "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
+           "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2729,7 +2731,7 @@ Trt =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-rt-target-rt-target-not-span-constraint-report-8"
+           "testbasic-rt-target-rt-target-not-span-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2738,8 +2740,7 @@ Trt =
            "               "
            sch:report [
              test = "../@from | ../@to"
-             "When target= is\x{a}" ~
-             "            present, neither from= nor to= should be."
+             "When target= is present, neither from= nor to= should be."
            ]
            "\x{a}" ~
            "            "
@@ -2753,7 +2754,7 @@ Trt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "testbasic-rt-from-rt-from-constraint-assert-7"
+         id = "testbasic-rt-from-rt-from-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2762,8 +2763,7 @@ Trt =
            "               "
            sch:assert [
              test = "../@to"
-             "When from= is present, the to=\x{a}" ~
-             "            attribute of "
+             "When from= is present, the to= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2779,7 +2779,7 @@ Trt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "testbasic-rt-to-rt-to-constraint-assert-8"
+         id = "testbasic-rt-to-rt-to-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2788,8 +2788,7 @@ Trt =
            "               "
            sch:assert [
              test = "../@from"
-             "When to= is present, the from=\x{a}" ~
-             "            attribute of "
+             "When to= is present, the from= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2978,7 +2977,7 @@ Tname =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-name-calendar-calendar-check-name-constraint-rule-12"
+           "testbasic-name-calendar-calendar-check-name-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3171,7 +3170,7 @@ Tptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "testbasic-ptr-ptrAtts-constraint-report-9"
+         id = "testbasic-ptr-ptrAtts-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3180,8 +3179,7 @@ Tptr =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "attributes @target and @cRef may be supplied on "
+             "Only one of the attributes @target and @cRef may be supplied on "
              sch:name [ ]
              "."
            ]
@@ -3205,7 +3203,7 @@ Tref =
   element ref {
     Tmacro.paraContent
     >> sch:pattern [
-         id = "testbasic-ref-refAtts-constraint-report-10"
+         id = "testbasic-ref-refAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3214,8 +3212,7 @@ Tref =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "	attributes @target' and @cRef' may be supplied on "
+             "Only one of the attributes @target' and @cRef' may be supplied on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -3246,7 +3243,7 @@ Tlist =
      (Tmodel.divBottom, Tmodel.global*)*)
     >> sch:pattern [
          id =
-           "testbasic-list-gloss-list-must-have-labels-constraint-rule-13"
+           "testbasic-list-gloss-list-must-have-labels-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3576,7 +3573,7 @@ Tauthor =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-author-calendar-calendar-check-author-constraint-rule-14"
+           "testbasic-author-calendar-calendar-check-author-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3616,7 +3613,7 @@ Teditor =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-editor-calendar-calendar-check-editor-constraint-rule-15"
+           "testbasic-editor-calendar-calendar-check-editor-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3667,7 +3664,7 @@ Tresp =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-resp-calendar-calendar-check-resp-constraint-rule-16"
+           "testbasic-resp-calendar-calendar-check-resp-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3696,7 +3693,7 @@ Ttitle =
   element title {
     Tmacro.paraContent
     >> sch:pattern [
-         id = "testbasic-title-calendar-check-title-constraint-rule-17"
+         id = "testbasic-title-calendar-check-title-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3748,7 +3745,7 @@ Ttitle =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-title-calendar-calendar-check-title-constraint-rule-18"
+           "testbasic-title-calendar-calendar-check-title-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3807,7 +3804,7 @@ Tmeeting =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-meeting-calendar-calendar-check-meeting-constraint-rule-19"
+           "testbasic-meeting-calendar-calendar-check-meeting-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3934,7 +3931,7 @@ TrelatedItem =
     ((Tmodel.biblLike | Tmodel.ptrLike)?)
     >> sch:pattern [
          id =
-           "testbasic-relatedItem-targetorcontent1-constraint-report-11"
+           "testbasic-relatedItem-targetorcontent1-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3943,18 +3940,15 @@ TrelatedItem =
            "               "
            sch:report [
              test = "@target and count( child::* ) > 0"
-             "\x{a}" ~
              "If the @target attribute on "
              sch:name [ ]
-             " is used, the\x{a}" ~
-             "relatedItem element must be empty"
+             " is used, the relatedItem element must be empty"
            ]
            "\x{a}" ~
            "               "
            sch:assert [
              test = "@target or child::*"
-             "A relatedItem element should have either a 'target' attribute\x{a}" ~
-             "        or a child element to indicate the related bibliographic item"
+             "A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item"
            ]
            "\x{a}" ~
            "            "
@@ -3982,7 +3976,7 @@ Tl =
       | Tmodel.global)*)
     >> sch:pattern [
          id =
-           "testbasic-l-abstractModel-structure-l-in-l-constraint-report-12"
+           "testbasic-l-abstractModel-structure-l-in-l-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3992,9 +3986,7 @@ Tl =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain lines or lg elements.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain lines or lg elements."
            ]
            "\x{a}" ~
            "            "
@@ -4024,7 +4016,7 @@ Tlg =
       | Tlg)*,
      (Tmodel.divBottom, Tmodel.global*)*)
     >> sch:pattern [
-         id = "testbasic-lg-atleast1oflggapl-constraint-assert-18"
+         id = "testbasic-lg-atleast1oflggapl-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4034,8 +4026,7 @@ Tlg =
            sch:assert [
              test =
                "count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0"
-             "An lg element\x{a}" ~
-             "        must contain at least one child l, lg, or gap element."
+             "An lg element must contain at least one child l, lg, or gap element."
            ]
            "\x{a}" ~
            "            "
@@ -4045,7 +4036,7 @@ Tlg =
        ]
     >> sch:pattern [
          id =
-           "testbasic-lg-abstractModel-structure-lg-in-l-constraint-report-13"
+           "testbasic-lg-abstractModel-structure-lg-in-l-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4055,9 +4046,7 @@ Tlg =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain line groups.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain line groups."
            ]
            "\x{a}" ~
            "            "
@@ -4269,7 +4258,7 @@ Tsponsor =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-sponsor-calendar-calendar-check-sponsor-constraint-rule-20"
+           "testbasic-sponsor-calendar-calendar-check-sponsor-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4309,7 +4298,7 @@ Tfunder =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-funder-calendar-calendar-check-funder-constraint-rule-21"
+           "testbasic-funder-calendar-calendar-check-funder-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4349,7 +4338,7 @@ Tprincipal =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-principal-calendar-calendar-check-principal-constraint-rule-22"
+           "testbasic-principal-calendar-calendar-check-principal-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4478,7 +4467,7 @@ Tidno =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-idno-calendar-calendar-check-idno-constraint-rule-23"
+           "testbasic-idno-calendar-calendar-check-idno-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4540,7 +4529,7 @@ Tlicence =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-licence-calendar-calendar-check-licence-constraint-rule-24"
+           "testbasic-licence-calendar-calendar-check-licence-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4717,8 +4706,7 @@ Tquotation =
   element quotation {
     (Tmodel.pLike*)
     >> sch:pattern [
-         id =
-           "testbasic-quotation-quotationContents-constraint-report-14"
+         id = "testbasic-quotation-quotationContents-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4726,11 +4714,12 @@ Tquotation =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "not(@marks) and not (tei:p)"
+             test = "not( @marks )  and  not( tei:p )"
              "\x{a}" ~
-             "On "
+             "          On "
              sch:name [ ]
-             ", either the @marks attribute should be used, or a paragraph of description provided"
+             ", either the @marks attribute should be used, or a paragraph of description provided\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -4969,7 +4958,7 @@ TciteStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-match-citestructure-outer-match-constraint-rule-25"
+           "testbasic-citeStructure-match-citestructure-outer-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4990,7 +4979,7 @@ TciteStructure =
        ]
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-match-citestructure-inner-match-constraint-rule-26"
+           "testbasic-citeStructure-match-citestructure-inner-match-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5172,7 +5161,7 @@ TunitDecl =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-27"
+           "testbasic-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5213,7 +5202,7 @@ TunitDef =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-unitDef-calendar-calendar-check-unitDef-constraint-rule-28"
+           "testbasic-unitDef-calendar-calendar-check-unitDef-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5254,7 +5243,7 @@ Tconversion =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-conversion-calendar-calendar-check-conversion-constraint-rule-29"
+           "testbasic-conversion-calendar-calendar-check-conversion-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5320,7 +5309,7 @@ Tapplication =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-application-calendar-calendar-check-application-constraint-rule-30"
+           "testbasic-application-calendar-calendar-check-application-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5392,7 +5381,7 @@ Tcreation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-creation-calendar-calendar-check-creation-constraint-rule-31"
+           "testbasic-creation-calendar-calendar-check-creation-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5614,7 +5603,7 @@ Tchange =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-change-calendar-calendar-check-change-constraint-rule-32"
+           "testbasic-change-calendar-calendar-check-change-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5871,7 +5860,7 @@ TorgName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-orgName-calendar-calendar-check-orgName-constraint-rule-33"
+           "testbasic-orgName-calendar-calendar-check-orgName-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5913,7 +5902,7 @@ TpersName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-persName-calendar-calendar-check-persName-constraint-rule-34"
+           "testbasic-persName-calendar-calendar-check-persName-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6014,7 +6003,7 @@ TplaceName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-placeName-calendar-calendar-check-placeName-constraint-rule-35"
+           "testbasic-placeName-calendar-calendar-check-placeName-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6055,7 +6044,7 @@ Tbloc =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-bloc-calendar-calendar-check-bloc-constraint-rule-36"
+           "testbasic-bloc-calendar-calendar-check-bloc-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6096,7 +6085,7 @@ Tcountry =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-country-calendar-calendar-check-country-constraint-rule-37"
+           "testbasic-country-calendar-calendar-check-country-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6137,7 +6126,7 @@ Tregion =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-region-calendar-calendar-check-region-constraint-rule-38"
+           "testbasic-region-calendar-calendar-check-region-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6178,7 +6167,7 @@ Tsettlement =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-settlement-calendar-calendar-check-settlement-constraint-rule-39"
+           "testbasic-settlement-calendar-calendar-check-settlement-constraint-rule-51"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6219,7 +6208,7 @@ Tdistrict =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-district-calendar-calendar-check-district-constraint-rule-40"
+           "testbasic-district-calendar-calendar-check-district-constraint-rule-52"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6262,7 +6251,7 @@ Toffset =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-offset-calendar-calendar-check-offset-constraint-rule-41"
+           "testbasic-offset-calendar-calendar-check-offset-constraint-rule-53"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6304,7 +6293,7 @@ TgeogName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-geogName-calendar-calendar-check-geogName-constraint-rule-42"
+           "testbasic-geogName-calendar-calendar-check-geogName-constraint-rule-54"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6347,7 +6336,7 @@ TgeogFeat =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-43"
+           "testbasic-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-55"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6407,7 +6396,7 @@ Taffiliation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-affiliation-calendar-calendar-check-affiliation-constraint-rule-44"
+           "testbasic-affiliation-calendar-calendar-check-affiliation-constraint-rule-56"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6455,7 +6444,7 @@ Tage =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-age-calendar-calendar-check-age-constraint-rule-45"
+           "testbasic-age-calendar-calendar-check-age-constraint-rule-57"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6507,7 +6496,7 @@ Tbirth =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-birth-calendar-calendar-check-birth-constraint-rule-46"
+           "testbasic-birth-calendar-calendar-check-birth-constraint-rule-58"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6552,7 +6541,7 @@ Tclimate =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-climate-calendar-calendar-check-climate-constraint-rule-47"
+           "testbasic-climate-calendar-calendar-check-climate-constraint-rule-59"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6601,7 +6590,7 @@ Tdeath =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-death-calendar-calendar-check-death-constraint-rule-48"
+           "testbasic-death-calendar-calendar-check-death-constraint-rule-60"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6649,7 +6638,7 @@ Teducation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-education-calendar-calendar-check-education-constraint-rule-49"
+           "testbasic-education-calendar-calendar-check-education-constraint-rule-61"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6706,7 +6695,7 @@ Tevent =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-event-calendar-calendar-check-event-constraint-rule-50"
+           "testbasic-event-calendar-calendar-check-event-constraint-rule-62"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6754,7 +6743,7 @@ Tfaith =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-faith-calendar-calendar-check-faith-constraint-rule-51"
+           "testbasic-faith-calendar-calendar-check-faith-constraint-rule-63"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6795,7 +6784,7 @@ Tfloruit =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-floruit-calendar-calendar-check-floruit-constraint-rule-52"
+           "testbasic-floruit-calendar-calendar-check-floruit-constraint-rule-64"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6836,7 +6825,7 @@ Tgender =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-gender-calendar-calendar-check-gender-constraint-rule-53"
+           "testbasic-gender-calendar-calendar-check-gender-constraint-rule-65"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6901,7 +6890,7 @@ TlangKnowledge =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-54"
+           "testbasic-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-66"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6951,7 +6940,7 @@ TlangKnown =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-langKnown-calendar-calendar-check-langKnown-constraint-rule-55"
+           "testbasic-langKnown-calendar-calendar-check-langKnown-constraint-rule-67"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7080,7 +7069,7 @@ Tlocation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-location-calendar-calendar-check-location-constraint-rule-56"
+           "testbasic-location-calendar-calendar-check-location-constraint-rule-68"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7128,7 +7117,7 @@ Tnationality =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-nationality-calendar-calendar-check-nationality-constraint-rule-57"
+           "testbasic-nationality-calendar-calendar-check-nationality-constraint-rule-69"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7176,7 +7165,7 @@ Toccupation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-occupation-calendar-calendar-check-occupation-constraint-rule-58"
+           "testbasic-occupation-calendar-calendar-check-occupation-constraint-rule-70"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7389,7 +7378,7 @@ TpersPronouns =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-59"
+           "testbasic-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-71"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7466,7 +7455,7 @@ Tpopulation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-population-calendar-calendar-check-population-constraint-rule-60"
+           "testbasic-population-calendar-calendar-check-population-constraint-rule-72"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7495,7 +7484,7 @@ Trelation =
   element relation {
     (Tdesc?)
     >> sch:pattern [
-         id = "testbasic-relation-reforkeyorname-constraint-assert-60"
+         id = "testbasic-relation-ref-or-key-or-name-constraint-rule-73"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7504,7 +7493,7 @@ Trelation =
            "               "
            sch:assert [
              test = "@ref or @key or @name"
-             "One of the attributes  'name', 'ref' or 'key' must be supplied"
+             "One of the attributes @name, @ref or @key must be supplied"
            ]
            "\x{a}" ~
            "            "
@@ -7513,7 +7502,7 @@ Trelation =
          "         "
        ]
     >> sch:pattern [
-         id = "testbasic-relation-activemutual-constraint-report-15"
+         id = "testbasic-relation-active-mutual-constraint-rule-74"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7531,7 +7520,7 @@ Trelation =
          "         "
        ]
     >> sch:pattern [
-         id = "testbasic-relation-activepassive-constraint-report-16"
+         id = "testbasic-relation-active-passive-constraint-rule-75"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7540,7 +7529,7 @@ Trelation =
            "               "
            sch:report [
              test = "@passive and not(@active)"
-             "the attribute 'passive' may be supplied only if the attribute 'active' is supplied"
+             "the attribute @passive may be supplied only if the attribute @active is supplied"
            ]
            "\x{a}" ~
            "            "
@@ -7563,7 +7552,7 @@ Trelation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-relation-calendar-calendar-check-relation-constraint-rule-61"
+           "testbasic-relation-calendar-calendar-check-relation-constraint-rule-76"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7573,8 +7562,8 @@ Trelation =
            sch:assert [
              test = "string-length( normalize-space(.) ) gt 0"
              " @calendar indicates one or more\x{a}" ~
-             "                        systems or calendars to which the date represented by the content of this element belongs,\x{a}" ~
-             "                        but this "
+             "              systems or calendars to which the date represented by the content of this element belongs,\x{a}" ~
+             "              but this "
              sch:name [ ]
              " element has no textual content."
            ]
@@ -7637,7 +7626,7 @@ Tresidence =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-residence-calendar-calendar-check-residence-constraint-rule-62"
+           "testbasic-residence-calendar-calendar-check-residence-constraint-rule-77"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7678,7 +7667,7 @@ Tsex =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-sex-calendar-calendar-check-sex-constraint-rule-63"
+           "testbasic-sex-calendar-calendar-check-sex-constraint-rule-78"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7733,7 +7722,7 @@ TsocecStatus =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-64"
+           "testbasic-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-79"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7800,7 +7789,7 @@ Tstate =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-state-calendar-calendar-check-state-constraint-rule-65"
+           "testbasic-state-calendar-calendar-check-state-constraint-rule-80"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7845,7 +7834,7 @@ Tterrain =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-terrain-calendar-calendar-check-terrain-constraint-rule-66"
+           "testbasic-terrain-calendar-calendar-check-terrain-constraint-rule-81"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7892,7 +7881,7 @@ Ttrait =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-trait-calendar-calendar-check-trait-constraint-rule-67"
+           "testbasic-trait-calendar-calendar-check-trait-constraint-rule-82"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7934,7 +7923,7 @@ TobjectName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-objectName-calendar-calendar-check-objectName-constraint-rule-68"
+           "testbasic-objectName-calendar-calendar-check-objectName-constraint-rule-83"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8121,7 +8110,7 @@ Tfacsimile =
     (Tfront?, (Tmodel.graphicLike | Tsurface | TsurfaceGrp)+, Tback?)
     >> sch:pattern [
          id =
-           "testbasic-facsimile-no_facsimile_text_nodes-constraint-rule-69"
+           "testbasic-facsimile-no_facsimile_text_nodes-constraint-rule-84"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8231,7 +8220,7 @@ Tpath =
   element path {
     empty
     >> sch:pattern [
-         id = "testbasic-path-pathmustnotbeclosed-constraint-rule-70"
+         id = "testbasic-path-pathmustnotbeclosed-constraint-rule-85"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8324,7 +8313,7 @@ TaddSpan =
     empty
     >> sch:pattern [
          id =
-           "testbasic-addSpan-addSpan-requires-spanTo-constraint-assert-69"
+           "testbasic-addSpan-addSpan-requires-spanTo-constraint-rule-86"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8345,7 +8334,7 @@ TaddSpan =
        ]
     >> sch:pattern [
          id =
-           "testbasic-addSpan-addSpan-requires-spanTo-fr-constraint-assert-70"
+           "testbasic-addSpan-addSpan-requires-spanTo-fr-constraint-rule-87"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8387,7 +8376,7 @@ TdamageSpan =
     empty
     >> sch:pattern [
          id =
-           "testbasic-damageSpan-damageSpan-requires-spanTo-constraint-assert-71"
+           "testbasic-damageSpan-damageSpan-requires-spanTo-constraint-rule-88"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8408,7 +8397,7 @@ TdamageSpan =
        ]
     >> sch:pattern [
          id =
-           "testbasic-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-72"
+           "testbasic-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-89"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8438,7 +8427,7 @@ TdelSpan =
     empty
     >> sch:pattern [
          id =
-           "testbasic-delSpan-delSpan-requires-spanTo-constraint-assert-73"
+           "testbasic-delSpan-delSpan-requires-spanTo-constraint-rule-90"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8459,7 +8448,7 @@ TdelSpan =
        ]
     >> sch:pattern [
          id =
-           "testbasic-delSpan-delSpan-requires-spanTo-fr-constraint-assert-74"
+           "testbasic-delSpan-delSpan-requires-spanTo-fr-constraint-rule-91"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8606,7 +8595,7 @@ Tsubst =
   element subst {
     ((Tadd | Tsurplus | Tdel | Tmodel.milestoneLike)+)
     >> sch:pattern [
-         id = "testbasic-subst-substContents1-constraint-assert-75"
+         id = "testbasic-subst-substContents1-constraint-rule-92"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8902,7 +8891,7 @@ Tlink =
   element link {
     empty
     >> sch:pattern [
-         id = "testbasic-link-linkTargets3-constraint-assert-76"
+         id = "testbasic-link-linkTargets3-constraint-rule-93"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8943,7 +8932,7 @@ Tab =
     Tmacro.abContent
     >> sch:pattern [
          id =
-           "testbasic-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-19"
+           "testbasic-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-94"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8954,8 +8943,8 @@ Tab =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -9119,7 +9108,7 @@ Tjoin =
   element join {
     ((Tmodel.descLike | Tmodel.certLike)*)
     >> sch:pattern [
-         id = "testbasic-join-joinTargets3-constraint-assert-77"
+         id = "testbasic-join-joinTargets3-constraint-rule-95"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9127,9 +9116,9 @@ Tjoin =
            "\x{a}" ~
            "               "
            sch:assert [
-             test = "contains(@target,' ')"
+             test = "contains( normalize-space( @target ),' ')"
              "\x{a}" ~
-             "You must supply at least two values for @target on "
+             "          You must supply at least two values for @target on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -9231,7 +9220,11 @@ Talt =
       ]
     ]
     attribute weights {
-      list { xsd:double, xsd:double, xsd:double* }
+      list {
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" }*
+      }
     }?,
     empty
   }
@@ -9267,7 +9260,7 @@ TstandOff =
     (Tmodel.standOffPart+)
     >> sch:pattern [
          id =
-           "testbasic-standOff-nested_standOff_should_be_typed-constraint-assert-78"
+           "testbasic-standOff-nested_standOff_should_be_typed-constraint-rule-96"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9277,10 +9270,10 @@ TstandOff =
            sch:assert [
              test = "@type or not(ancestor::tei:standOff)"
              "This\x{a}" ~
-             "      "
+             "        "
              sch:name [ ]
              " element must have a @type attribute, since it is\x{a}" ~
-             "      nested inside a "
+             "        nested inside a "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -9523,7 +9516,7 @@ Tdiv =
       (Tmodel.divBottom, Tmodel.global*)*)?)
     >> sch:pattern [
          id =
-           "testbasic-div-abstractModel-structure-div-in-l-or-lg-constraint-report-20"
+           "testbasic-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-97"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9534,8 +9527,8 @@ Tdiv =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -9545,7 +9538,7 @@ Tdiv =
        ]
     >> sch:pattern [
          id =
-           "testbasic-div-abstractModel-structure-div-in-ab-or-p-constraint-report-21"
+           "testbasic-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-98"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9556,8 +9549,8 @@ Tdiv =
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -9977,7 +9970,7 @@ TMenu =
   }
 start = TTEI | Tdiv
 sch:pattern [
-  id = "testbasic-outerconstraint-constraint-rule-71"
+  id = "testbasic-outerconstraint-constraint-rule-99"
   "\x{a}" ~
   "      "
   sch:rule [
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index 2d0621cbd..f5619bce1 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -130,7 +130,9 @@ tei_att.ranging.attribute.confidence =
       ", or the proportion of observed values that fall within that range."
     ]
   ]
-  attribute confidence { xsd:double }?
+  attribute confidence {
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
+  }?
 tei_att.dimensions.attributes =
   tei_att.ranging.attributes,
   tei_att.dimensions.attribute.unit,
@@ -514,7 +516,7 @@ tei_att.global.responsibility.attribute.cert =
   
   ## (certainty) signifies the degree of certainty associated with the intervention or interpretation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -2148,7 +2150,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2157,10 +2159,10 @@ tei_p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2170,7 +2172,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2179,10 +2181,10 @@ tei_p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2359,7 +2361,7 @@ tei_desc =
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2453,7 +2455,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-report-8"
+         id = "foo-rt-target-rt-target-not-span-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2462,8 +2464,7 @@ tei_rt =
            "               "
            sch:report [
              test = "../@from | ../@to"
-             "When target= is\x{a}" ~
-             "            present, neither from= nor to= should be."
+             "When target= is present, neither from= nor to= should be."
            ]
            "\x{a}" ~
            "            "
@@ -2477,7 +2478,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-from-rt-from-constraint-assert-7"
+         id = "foo-rt-from-rt-from-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2486,8 +2487,7 @@ tei_rt =
            "               "
            sch:assert [
              test = "../@to"
-             "When from= is present, the to=\x{a}" ~
-             "            attribute of "
+             "When from= is present, the to= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2503,7 +2503,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-to-rt-to-constraint-assert-8"
+         id = "foo-rt-to-rt-to-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2512,8 +2512,7 @@ tei_rt =
            "               "
            sch:assert [
              test = "../@from"
-             "When to= is present, the from=\x{a}" ~
-             "            attribute of "
+             "When to= is present, the from= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2705,7 +2704,7 @@ tei_name =
        }
      }?)
     >> sch:pattern [
-         id = "foo-name-calendar-calendar-check-name-constraint-rule-12"
+         id = "foo-name-calendar-calendar-check-name-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2904,7 +2903,7 @@ tei_ptr =
   element tei:ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-report-9"
+         id = "foo-ptr-ptrAtts-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2913,8 +2912,7 @@ tei_ptr =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "attributes @target and @cRef may be supplied on "
+             "Only one of the attributes @target and @cRef may be supplied on "
              sch:name [ ]
              "."
            ]
@@ -2938,7 +2936,7 @@ tei_ref =
   element tei:ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-report-10"
+         id = "foo-ref-refAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2947,8 +2945,7 @@ tei_ref =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "	attributes @target' and @cRef' may be supplied on "
+             "Only one of the attributes @target' and @cRef' may be supplied on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -2978,7 +2975,7 @@ tei_list =
          (tei_label, tei_model.global*, tei_item, tei_model.global*)+)),
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-list-gloss-list-must-have-labels-constraint-rule-13"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3320,7 +3317,7 @@ tei_author =
      }?)
     >> sch:pattern [
          id =
-           "foo-author-calendar-calendar-check-author-constraint-rule-14"
+           "foo-author-calendar-calendar-check-author-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3360,7 +3357,7 @@ tei_editor =
      }?)
     >> sch:pattern [
          id =
-           "foo-editor-calendar-calendar-check-editor-constraint-rule-15"
+           "foo-editor-calendar-calendar-check-editor-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3410,7 +3407,7 @@ tei_resp =
        }
      }?)
     >> sch:pattern [
-         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-16"
+         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3457,7 +3454,7 @@ tei_title =
      }?)
     >> sch:pattern [
          id =
-           "foo-title-calendar-calendar-check-title-constraint-rule-17"
+           "foo-title-calendar-calendar-check-title-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3516,7 +3513,7 @@ tei_meeting =
      }?)
     >> sch:pattern [
          id =
-           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-18"
+           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3644,7 +3641,7 @@ tei_relatedItem =
   element tei:relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-report-11"
+         id = "foo-relatedItem-targetorcontent1-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3653,18 +3650,15 @@ tei_relatedItem =
            "               "
            sch:report [
              test = "@target and count( child::* ) > 0"
-             "\x{a}" ~
              "If the @target attribute on "
              sch:name [ ]
-             " is used, the\x{a}" ~
-             "relatedItem element must be empty"
+             " is used, the relatedItem element must be empty"
            ]
            "\x{a}" ~
            "               "
            sch:assert [
              test = "@target or child::*"
-             "A relatedItem element should have either a 'target' attribute\x{a}" ~
-             "        or a child element to indicate the related bibliographic item"
+             "A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item"
            ]
            "\x{a}" ~
            "            "
@@ -3691,8 +3685,7 @@ tei_l =
       | tei_model.inter
       | tei_model.global)*)
     >> sch:pattern [
-         id =
-           "foo-l-abstractModel-structure-l-in-l-constraint-report-12"
+         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3702,9 +3695,7 @@ tei_l =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain lines or lg elements.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain lines or lg elements."
            ]
            "\x{a}" ~
            "            "
@@ -3734,7 +3725,7 @@ tei_lg =
       | tei_lg)*,
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-lg-atleast1oflggapl-constraint-assert-17"
+         id = "foo-lg-atleast1oflggapl-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3744,8 +3735,7 @@ tei_lg =
            sch:assert [
              test =
                "count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0"
-             "An lg element\x{a}" ~
-             "        must contain at least one child l, lg, or gap element."
+             "An lg element must contain at least one child l, lg, or gap element."
            ]
            "\x{a}" ~
            "            "
@@ -3755,7 +3745,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-13"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3765,9 +3755,7 @@ tei_lg =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain line groups.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain line groups."
            ]
            "\x{a}" ~
            "            "
@@ -3982,7 +3970,7 @@ tei_sponsor =
      }?)
     >> sch:pattern [
          id =
-           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-19"
+           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4022,7 +4010,7 @@ tei_funder =
      }?)
     >> sch:pattern [
          id =
-           "foo-funder-calendar-calendar-check-funder-constraint-rule-20"
+           "foo-funder-calendar-calendar-check-funder-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4062,7 +4050,7 @@ tei_principal =
      }?)
     >> sch:pattern [
          id =
-           "foo-principal-calendar-calendar-check-principal-constraint-rule-21"
+           "foo-principal-calendar-calendar-check-principal-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4194,7 +4182,7 @@ tei_idno =
        }
      }?)
     >> sch:pattern [
-         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-22"
+         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4256,7 +4244,7 @@ tei_licence =
      }?)
     >> sch:pattern [
          id =
-           "foo-licence-calendar-calendar-check-licence-constraint-rule-23"
+           "foo-licence-calendar-calendar-check-licence-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4439,7 +4427,7 @@ tei_quotation =
   element tei:quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-report-14"
+         id = "foo-quotation-quotationContents-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4447,11 +4435,12 @@ tei_quotation =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "not(@marks) and not (tei:p)"
+             test = "not( @marks )  and  not( tei:p )"
              "\x{a}" ~
-             "On "
+             "          On "
              sch:name [ ]
-             ", either the @marks attribute should be used, or a paragraph of description provided"
+             ", either the @marks attribute should be used, or a paragraph of description provided\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -4693,7 +4682,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-24"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4714,7 +4703,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-25"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4899,7 +4888,7 @@ tei_unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-26"
+           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4943,7 +4932,7 @@ tei_unitDef =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-27"
+           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4984,7 +4973,7 @@ tei_conversion =
      }?)
     >> sch:pattern [
          id =
-           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-28"
+           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5050,7 +5039,7 @@ tei_application =
      }?)
     >> sch:pattern [
          id =
-           "foo-application-calendar-calendar-check-application-constraint-rule-29"
+           "foo-application-calendar-calendar-check-application-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5113,7 +5102,7 @@ tei_creation =
      }?)
     >> sch:pattern [
          id =
-           "foo-creation-calendar-calendar-check-creation-constraint-rule-30"
+           "foo-creation-calendar-calendar-check-creation-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5337,7 +5326,7 @@ tei_change =
      }?)
     >> sch:pattern [
          id =
-           "foo-change-calendar-calendar-check-change-constraint-rule-31"
+           "foo-change-calendar-calendar-check-change-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5503,7 +5492,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5514,8 +5503,8 @@ tei_div =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5525,7 +5514,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5536,8 +5525,8 @@ tei_div =
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5995,7 +5984,7 @@ tei_link =
   element tei:link {
     empty
     >> sch:pattern [
-         id = "foo-link-linkTargets3-constraint-assert-31"
+         id = "foo-link-linkTargets3-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6036,7 +6025,7 @@ tei_ab =
     tei_macro.abContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6047,8 +6036,8 @@ tei_ab =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -6212,7 +6201,7 @@ tei_join =
   element tei:join {
     ((tei_model.descLike | tei_model.certLike)*)
     >> sch:pattern [
-         id = "foo-join-joinTargets3-constraint-assert-32"
+         id = "foo-join-joinTargets3-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6220,9 +6209,9 @@ tei_join =
            "\x{a}" ~
            "               "
            sch:assert [
-             test = "contains(@target,' ')"
+             test = "contains( normalize-space( @target ),' ')"
              "\x{a}" ~
-             "You must supply at least two values for @target on "
+             "          You must supply at least two values for @target on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -6324,7 +6313,11 @@ tei_alt =
       ]
     ]
     attribute weights {
-      list { xsd:double, xsd:double, xsd:double* }
+      list {
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" }*
+      }
     }?,
     empty
   }
@@ -6360,7 +6353,7 @@ tei_standOff =
     (tei_model.standOffPart+)
     >> sch:pattern [
          id =
-           "foo-standOff-nested_standOff_should_be_typed-constraint-assert-33"
+           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6370,10 +6363,10 @@ tei_standOff =
            sch:assert [
              test = "@type or not(ancestor::tei:standOff)"
              "This\x{a}" ~
-             "      "
+             "        "
              sch:name [ ]
              " element must have a @type attribute, since it is\x{a}" ~
-             "      nested inside a "
+             "        nested inside a "
              sch:name [ ]
              "\x{a}" ~
              "               "
diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json
index 5b974f3e2..1b258c20a 100644
--- a/Test/expected-results/test34.combined.json
+++ b/Test/expected-results/test34.combined.json
@@ -6715,8 +6715,8 @@
         "type" : "elementSpec",
         "module" : "core",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2012-04-17\" xml:lang=\"en\">contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain,\n        verse paragraph, etc.<\/desc>" ],
-        "shortDesc" : "(line group) contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain,\n        verse paragraph, etc.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2012-04-17\" xml:lang=\"en\">contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain, verse paragraph, etc.<\/desc>" ],
+        "shortDesc" : "(line group) contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain, verse paragraph, etc.",
         "gloss" : 
         [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-01-14\" xml:lang=\"en\">line group<\/gloss>" ],
         "altIdent" : 
@@ -9210,8 +9210,8 @@
         "type" : "elementSpec",
         "module" : "core",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-03-19\" xml:lang=\"en\">contains or references some other bibliographic item which is related to the present one in\n    some specified manner, for example as a constituent or alternative version of it.<\/desc>" ],
-        "shortDesc" : "contains or references some other bibliographic item which is related to the present one in\n    some specified manner, for example as a constituent or alternative version of it.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-03-19\" xml:lang=\"en\">contains or references some other bibliographic item which is related to the present one in some specified manner, for example as a constituent or alternative version of it.<\/desc>" ],
+        "shortDesc" : "contains or references some other bibliographic item which is related to the present one in some specified manner, for example as a constituent or alternative version of it.",
         "gloss" : 
         [  ],
         "altIdent" : 
@@ -10430,8 +10430,8 @@
         "type" : "elementSpec",
         "module" : "linking",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2018-10-31\">Functions as a\n  container element for linked data, contextual information, and\n  stand-off annotations embedded in a TEI document.<\/desc>" ],
-        "shortDesc" : "Functions as a\n  container element for linked data, contextual information, and\n  stand-off annotations embedded in a TEI document.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2018-10-31\">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.<\/desc>" ],
+        "shortDesc" : "Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.",
         "gloss" : 
         [  ],
         "altIdent" : 
@@ -17874,8 +17874,8 @@
         "type" : "dataSpec",
         "module" : "tei",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-10-18\" xml:lang=\"en\">defines a range of attribute values which can be expressed either as a numeric probability or as a coded certainty value.<\/desc>" ],
-        "shortDesc" : "defines a range of attribute values which can be expressed either as a numeric probability or as a coded certainty value.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-10-18\" xml:lang=\"en\">defines a range of attribute values which can be expressed either as a numeric\n    probability or as a coded certainty value.<\/desc>" ],
+        "shortDesc" : "defines a range of attribute values which can be expressed either as a numeric\n    probability or as a coded certainty value.",
         "gloss" : 
         [  ],
         "altIdent" : 
@@ -17907,7 +17907,14 @@
         "content" : 
         [ 
           { "type" : "dataRef",
-            "name" : "double" } ] },
+            "name" : "double",
+            "dataFacet" : 
+            [ 
+              { "name" : "minInclusive",
+                "value" : "0" },
+              
+              { "name" : "maxInclusive",
+                "value" : "1" } ] } ] },
       
       { "ident" : "teidata.replacement",
         "ns" : "http:\/\/foo.foo\/foo",
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 366fdbb4f..307da35c1 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -131,7 +131,9 @@ tei_att.ranging.attribute.confidence =
       ", or the proportion of observed values that fall within that range."
     ]
   ]
-  attribute confidence { xsd:double }?
+  attribute confidence {
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
+  }?
 tei_att.dimensions.attributes =
   tei_att.ranging.attributes,
   tei_att.dimensions.attribute.unit,
@@ -515,7 +517,7 @@ tei_att.global.responsibility.attribute.cert =
   
   ## (certainty) signifies the degree of certainty associated with the intervention or interpretation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -2153,7 +2155,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2162,10 +2164,10 @@ tei_p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2175,7 +2177,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2184,10 +2186,10 @@ tei_p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2364,7 +2366,7 @@ tei_desc =
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2458,7 +2460,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-report-8"
+         id = "foo-rt-target-rt-target-not-span-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2467,8 +2469,7 @@ tei_rt =
            "               "
            sch:report [
              test = "../@from | ../@to"
-             "When target= is\x{a}" ~
-             "            present, neither from= nor to= should be."
+             "When target= is present, neither from= nor to= should be."
            ]
            "\x{a}" ~
            "            "
@@ -2482,7 +2483,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-from-rt-from-constraint-assert-7"
+         id = "foo-rt-from-rt-from-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2491,8 +2492,7 @@ tei_rt =
            "               "
            sch:assert [
              test = "../@to"
-             "When from= is present, the to=\x{a}" ~
-             "            attribute of "
+             "When from= is present, the to= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2508,7 +2508,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-to-rt-to-constraint-assert-8"
+         id = "foo-rt-to-rt-to-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2517,8 +2517,7 @@ tei_rt =
            "               "
            sch:assert [
              test = "../@from"
-             "When to= is present, the from=\x{a}" ~
-             "            attribute of "
+             "When to= is present, the from= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2710,7 +2709,7 @@ tei_name =
        }
      }?)
     >> sch:pattern [
-         id = "foo-name-calendar-calendar-check-name-constraint-rule-12"
+         id = "foo-name-calendar-calendar-check-name-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2909,7 +2908,7 @@ tei_ptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-report-9"
+         id = "foo-ptr-ptrAtts-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2918,8 +2917,7 @@ tei_ptr =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "attributes @target and @cRef may be supplied on "
+             "Only one of the attributes @target and @cRef may be supplied on "
              sch:name [ ]
              "."
            ]
@@ -2943,7 +2941,7 @@ tei_ref =
   element ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-report-10"
+         id = "foo-ref-refAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2952,8 +2950,7 @@ tei_ref =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "	attributes @target' and @cRef' may be supplied on "
+             "Only one of the attributes @target' and @cRef' may be supplied on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -2983,7 +2980,7 @@ tei_list =
          (tei_label, tei_model.global*, tei_item, tei_model.global*)+)),
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-list-gloss-list-must-have-labels-constraint-rule-13"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3325,7 +3322,7 @@ tei_author =
      }?)
     >> sch:pattern [
          id =
-           "foo-author-calendar-calendar-check-author-constraint-rule-14"
+           "foo-author-calendar-calendar-check-author-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3365,7 +3362,7 @@ tei_editor =
      }?)
     >> sch:pattern [
          id =
-           "foo-editor-calendar-calendar-check-editor-constraint-rule-15"
+           "foo-editor-calendar-calendar-check-editor-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3415,7 +3412,7 @@ tei_resp =
        }
      }?)
     >> sch:pattern [
-         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-16"
+         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3462,7 +3459,7 @@ tei_title =
      }?)
     >> sch:pattern [
          id =
-           "foo-title-calendar-calendar-check-title-constraint-rule-17"
+           "foo-title-calendar-calendar-check-title-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3521,7 +3518,7 @@ tei_meeting =
      }?)
     >> sch:pattern [
          id =
-           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-18"
+           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3649,7 +3646,7 @@ tei_relatedItem =
   element relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-report-11"
+         id = "foo-relatedItem-targetorcontent1-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3658,18 +3655,15 @@ tei_relatedItem =
            "               "
            sch:report [
              test = "@target and count( child::* ) > 0"
-             "\x{a}" ~
              "If the @target attribute on "
              sch:name [ ]
-             " is used, the\x{a}" ~
-             "relatedItem element must be empty"
+             " is used, the relatedItem element must be empty"
            ]
            "\x{a}" ~
            "               "
            sch:assert [
              test = "@target or child::*"
-             "A relatedItem element should have either a 'target' attribute\x{a}" ~
-             "        or a child element to indicate the related bibliographic item"
+             "A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item"
            ]
            "\x{a}" ~
            "            "
@@ -3696,8 +3690,7 @@ tei_l =
       | tei_model.inter
       | tei_model.global)*)
     >> sch:pattern [
-         id =
-           "foo-l-abstractModel-structure-l-in-l-constraint-report-12"
+         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3707,9 +3700,7 @@ tei_l =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain lines or lg elements.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain lines or lg elements."
            ]
            "\x{a}" ~
            "            "
@@ -3739,7 +3730,7 @@ tei_lg =
       | tei_lg)*,
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-lg-atleast1oflggapl-constraint-assert-17"
+         id = "foo-lg-atleast1oflggapl-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3749,8 +3740,7 @@ tei_lg =
            sch:assert [
              test =
                "count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0"
-             "An lg element\x{a}" ~
-             "        must contain at least one child l, lg, or gap element."
+             "An lg element must contain at least one child l, lg, or gap element."
            ]
            "\x{a}" ~
            "            "
@@ -3760,7 +3750,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-13"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3770,9 +3760,7 @@ tei_lg =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain line groups.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain line groups."
            ]
            "\x{a}" ~
            "            "
@@ -3987,7 +3975,7 @@ tei_sponsor =
      }?)
     >> sch:pattern [
          id =
-           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-19"
+           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4027,7 +4015,7 @@ tei_funder =
      }?)
     >> sch:pattern [
          id =
-           "foo-funder-calendar-calendar-check-funder-constraint-rule-20"
+           "foo-funder-calendar-calendar-check-funder-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4067,7 +4055,7 @@ tei_principal =
      }?)
     >> sch:pattern [
          id =
-           "foo-principal-calendar-calendar-check-principal-constraint-rule-21"
+           "foo-principal-calendar-calendar-check-principal-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4199,7 +4187,7 @@ tei_idno =
        }
      }?)
     >> sch:pattern [
-         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-22"
+         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4261,7 +4249,7 @@ tei_licence =
      }?)
     >> sch:pattern [
          id =
-           "foo-licence-calendar-calendar-check-licence-constraint-rule-23"
+           "foo-licence-calendar-calendar-check-licence-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4444,7 +4432,7 @@ tei_quotation =
   element quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-report-14"
+         id = "foo-quotation-quotationContents-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4452,11 +4440,12 @@ tei_quotation =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "not(@marks) and not (tei:p)"
+             test = "not( @marks )  and  not( tei:p )"
              "\x{a}" ~
-             "On "
+             "          On "
              sch:name [ ]
-             ", either the @marks attribute should be used, or a paragraph of description provided"
+             ", either the @marks attribute should be used, or a paragraph of description provided\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -4698,7 +4687,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-24"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4719,7 +4708,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-25"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4902,7 +4891,7 @@ tei_unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-26"
+           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4946,7 +4935,7 @@ tei_unitDef =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-27"
+           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4987,7 +4976,7 @@ tei_conversion =
      }?)
     >> sch:pattern [
          id =
-           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-28"
+           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5053,7 +5042,7 @@ tei_application =
      }?)
     >> sch:pattern [
          id =
-           "foo-application-calendar-calendar-check-application-constraint-rule-29"
+           "foo-application-calendar-calendar-check-application-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5116,7 +5105,7 @@ tei_creation =
      }?)
     >> sch:pattern [
          id =
-           "foo-creation-calendar-calendar-check-creation-constraint-rule-30"
+           "foo-creation-calendar-calendar-check-creation-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5340,7 +5329,7 @@ tei_change =
      }?)
     >> sch:pattern [
          id =
-           "foo-change-calendar-calendar-check-change-constraint-rule-31"
+           "foo-change-calendar-calendar-check-change-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5506,7 +5495,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5517,8 +5506,8 @@ tei_div =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5528,7 +5517,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5539,8 +5528,8 @@ tei_div =
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5998,7 +5987,7 @@ tei_link =
   element link {
     empty
     >> sch:pattern [
-         id = "foo-link-linkTargets3-constraint-assert-31"
+         id = "foo-link-linkTargets3-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6039,7 +6028,7 @@ tei_ab =
     tei_macro.abContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6050,8 +6039,8 @@ tei_ab =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -6215,7 +6204,7 @@ tei_join =
   element join {
     ((tei_model.descLike | tei_model.certLike)*)
     >> sch:pattern [
-         id = "foo-join-joinTargets3-constraint-assert-32"
+         id = "foo-join-joinTargets3-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6223,9 +6212,9 @@ tei_join =
            "\x{a}" ~
            "               "
            sch:assert [
-             test = "contains(@target,' ')"
+             test = "contains( normalize-space( @target ),' ')"
              "\x{a}" ~
-             "You must supply at least two values for @target on "
+             "          You must supply at least two values for @target on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -6327,7 +6316,11 @@ tei_alt =
       ]
     ]
     attribute weights {
-      list { xsd:double, xsd:double, xsd:double* }
+      list {
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" }*
+      }
     }?,
     empty
   }
@@ -6363,7 +6356,7 @@ tei_standOff =
     (tei_model.standOffPart+)
     >> sch:pattern [
          id =
-           "foo-standOff-nested_standOff_should_be_typed-constraint-assert-33"
+           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6373,10 +6366,10 @@ tei_standOff =
            sch:assert [
              test = "@type or not(ancestor::tei:standOff)"
              "This\x{a}" ~
-             "      "
+             "        "
              sch:name [ ]
              " element must have a @type attribute, since it is\x{a}" ~
-             "      nested inside a "
+             "        nested inside a "
              sch:name [ ]
              "\x{a}" ~
              "               "
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index 4abb1f9c4..052c71539 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -131,7 +131,9 @@ tei_att.ranging.attribute.confidence =
       ", or the proportion of observed values that fall within that range."
     ]
   ]
-  attribute confidence { xsd:double }?
+  attribute confidence {
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
+  }?
 tei_att.dimensions.attributes =
   tei_att.ranging.attributes,
   tei_att.dimensions.attribute.unit,
@@ -515,7 +517,7 @@ tei_att.global.responsibility.attribute.cert =
   
   ## (certainty) signifies the degree of certainty associated with the intervention or interpretation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -2148,7 +2150,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2157,10 +2159,10 @@ tei_p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2170,7 +2172,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2179,10 +2181,10 @@ tei_p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -2359,7 +2361,7 @@ tei_desc =
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2453,7 +2455,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-report-8"
+         id = "foo-rt-target-rt-target-not-span-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2462,8 +2464,7 @@ tei_rt =
            "               "
            sch:report [
              test = "../@from | ../@to"
-             "When target= is\x{a}" ~
-             "            present, neither from= nor to= should be."
+             "When target= is present, neither from= nor to= should be."
            ]
            "\x{a}" ~
            "            "
@@ -2477,7 +2478,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-from-rt-from-constraint-assert-7"
+         id = "foo-rt-from-rt-from-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2486,8 +2487,7 @@ tei_rt =
            "               "
            sch:assert [
              test = "../@to"
-             "When from= is present, the to=\x{a}" ~
-             "            attribute of "
+             "When from= is present, the to= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2503,7 +2503,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-to-rt-to-constraint-assert-8"
+         id = "foo-rt-to-rt-to-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2512,8 +2512,7 @@ tei_rt =
            "               "
            sch:assert [
              test = "../@from"
-             "When to= is present, the from=\x{a}" ~
-             "            attribute of "
+             "When to= is present, the from= attribute of "
              sch:name [ ]
              " is required."
            ]
@@ -2705,7 +2704,7 @@ tei_name =
        }
      }?)
     >> sch:pattern [
-         id = "foo-name-calendar-calendar-check-name-constraint-rule-12"
+         id = "foo-name-calendar-calendar-check-name-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2904,7 +2903,7 @@ tei_ptr =
   element tei:ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-report-9"
+         id = "foo-ptr-ptrAtts-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2913,8 +2912,7 @@ tei_ptr =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "attributes @target and @cRef may be supplied on "
+             "Only one of the attributes @target and @cRef may be supplied on "
              sch:name [ ]
              "."
            ]
@@ -2938,7 +2936,7 @@ tei_ref =
   element tei:ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-report-10"
+         id = "foo-ref-refAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2947,8 +2945,7 @@ tei_ref =
            "               "
            sch:report [
              test = "@target and @cRef"
-             "Only one of the\x{a}" ~
-             "	attributes @target' and @cRef' may be supplied on "
+             "Only one of the attributes @target' and @cRef' may be supplied on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -2978,7 +2975,7 @@ tei_list =
          (tei_label, tei_model.global*, tei_item, tei_model.global*)+)),
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-list-gloss-list-must-have-labels-constraint-rule-13"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3320,7 +3317,7 @@ tei_author =
      }?)
     >> sch:pattern [
          id =
-           "foo-author-calendar-calendar-check-author-constraint-rule-14"
+           "foo-author-calendar-calendar-check-author-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3360,7 +3357,7 @@ tei_editor =
      }?)
     >> sch:pattern [
          id =
-           "foo-editor-calendar-calendar-check-editor-constraint-rule-15"
+           "foo-editor-calendar-calendar-check-editor-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3410,7 +3407,7 @@ tei_resp =
        }
      }?)
     >> sch:pattern [
-         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-16"
+         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3457,7 +3454,7 @@ tei_title =
      }?)
     >> sch:pattern [
          id =
-           "foo-title-calendar-calendar-check-title-constraint-rule-17"
+           "foo-title-calendar-calendar-check-title-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3516,7 +3513,7 @@ tei_meeting =
      }?)
     >> sch:pattern [
          id =
-           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-18"
+           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3644,7 +3641,7 @@ tei_relatedItem =
   element tei:relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-report-11"
+         id = "foo-relatedItem-targetorcontent1-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3653,18 +3650,15 @@ tei_relatedItem =
            "               "
            sch:report [
              test = "@target and count( child::* ) > 0"
-             "\x{a}" ~
              "If the @target attribute on "
              sch:name [ ]
-             " is used, the\x{a}" ~
-             "relatedItem element must be empty"
+             " is used, the relatedItem element must be empty"
            ]
            "\x{a}" ~
            "               "
            sch:assert [
              test = "@target or child::*"
-             "A relatedItem element should have either a 'target' attribute\x{a}" ~
-             "        or a child element to indicate the related bibliographic item"
+             "A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item"
            ]
            "\x{a}" ~
            "            "
@@ -3691,8 +3685,7 @@ tei_l =
       | tei_model.inter
       | tei_model.global)*)
     >> sch:pattern [
-         id =
-           "foo-l-abstractModel-structure-l-in-l-constraint-report-12"
+         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3702,9 +3695,7 @@ tei_l =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain lines or lg elements.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain lines or lg elements."
            ]
            "\x{a}" ~
            "            "
@@ -3734,7 +3725,7 @@ tei_lg =
       | tei_lg)*,
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-lg-atleast1oflggapl-constraint-assert-17"
+         id = "foo-lg-atleast1oflggapl-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3744,8 +3735,7 @@ tei_lg =
            sch:assert [
              test =
                "count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0"
-             "An lg element\x{a}" ~
-             "        must contain at least one child l, lg, or gap element."
+             "An lg element must contain at least one child l, lg, or gap element."
            ]
            "\x{a}" ~
            "            "
@@ -3755,7 +3745,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-13"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3765,9 +3755,7 @@ tei_lg =
            sch:report [
              test =
                "ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]"
-             "\x{a}" ~
-             "        Abstract model violation: Lines may not contain line groups.\x{a}" ~
-             "      "
+             "Abstract model violation: Lines may not contain line groups."
            ]
            "\x{a}" ~
            "            "
@@ -3963,7 +3951,7 @@ tei_sponsor =
      }?)
     >> sch:pattern [
          id =
-           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-19"
+           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4003,7 +3991,7 @@ tei_funder =
      }?)
     >> sch:pattern [
          id =
-           "foo-funder-calendar-calendar-check-funder-constraint-rule-20"
+           "foo-funder-calendar-calendar-check-funder-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4043,7 +4031,7 @@ tei_principal =
      }?)
     >> sch:pattern [
          id =
-           "foo-principal-calendar-calendar-check-principal-constraint-rule-21"
+           "foo-principal-calendar-calendar-check-principal-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4175,7 +4163,7 @@ tei_idno =
        }
      }?)
     >> sch:pattern [
-         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-22"
+         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4237,7 +4225,7 @@ tei_licence =
      }?)
     >> sch:pattern [
          id =
-           "foo-licence-calendar-calendar-check-licence-constraint-rule-23"
+           "foo-licence-calendar-calendar-check-licence-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4420,7 +4408,7 @@ tei_quotation =
   element tei:quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-report-14"
+         id = "foo-quotation-quotationContents-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4428,11 +4416,12 @@ tei_quotation =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "not(@marks) and not (tei:p)"
+             test = "not( @marks )  and  not( tei:p )"
              "\x{a}" ~
-             "On "
+             "          On "
              sch:name [ ]
-             ", either the @marks attribute should be used, or a paragraph of description provided"
+             ", either the @marks attribute should be used, or a paragraph of description provided\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -4674,7 +4663,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-24"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4695,7 +4684,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-25"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4880,7 +4869,7 @@ tei_unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-26"
+           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4924,7 +4913,7 @@ tei_unitDef =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-27"
+           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4965,7 +4954,7 @@ tei_conversion =
      }?)
     >> sch:pattern [
          id =
-           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-28"
+           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5031,7 +5020,7 @@ tei_application =
      }?)
     >> sch:pattern [
          id =
-           "foo-application-calendar-calendar-check-application-constraint-rule-29"
+           "foo-application-calendar-calendar-check-application-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5094,7 +5083,7 @@ tei_creation =
      }?)
     >> sch:pattern [
          id =
-           "foo-creation-calendar-calendar-check-creation-constraint-rule-30"
+           "foo-creation-calendar-calendar-check-creation-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5318,7 +5307,7 @@ tei_change =
      }?)
     >> sch:pattern [
          id =
-           "foo-change-calendar-calendar-check-change-constraint-rule-31"
+           "foo-change-calendar-calendar-check-change-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5484,7 +5473,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5495,8 +5484,8 @@ tei_div =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5506,7 +5495,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5517,8 +5506,8 @@ tei_div =
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -5976,7 +5965,7 @@ tei_link =
   element tei:link {
     empty
     >> sch:pattern [
-         id = "foo-link-linkTargets3-constraint-assert-31"
+         id = "foo-link-linkTargets3-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6017,7 +6006,7 @@ tei_ab =
     tei_macro.abContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6028,8 +6017,8 @@ tei_ab =
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -6193,7 +6182,7 @@ tei_join =
   element tei:join {
     ((tei_model.descLike | tei_model.certLike)*)
     >> sch:pattern [
-         id = "foo-join-joinTargets3-constraint-assert-32"
+         id = "foo-join-joinTargets3-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6201,9 +6190,9 @@ tei_join =
            "\x{a}" ~
            "               "
            sch:assert [
-             test = "contains(@target,' ')"
+             test = "contains( normalize-space( @target ),' ')"
              "\x{a}" ~
-             "You must supply at least two values for @target on "
+             "          You must supply at least two values for @target on "
              sch:name [ ]
              "\x{a}" ~
              "               "
@@ -6305,7 +6294,11 @@ tei_alt =
       ]
     ]
     attribute weights {
-      list { xsd:double, xsd:double, xsd:double* }
+      list {
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" },
+        xsd:double { minInclusive = "0" maxInclusive = "1" }*
+      }
     }?,
     empty
   }
@@ -6341,7 +6334,7 @@ tei_standOff =
     (tei_model.standOffPart+)
     >> sch:pattern [
          id =
-           "foo-standOff-nested_standOff_should_be_typed-constraint-assert-33"
+           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6351,10 +6344,10 @@ tei_standOff =
            sch:assert [
              test = "@type or not(ancestor::tei:standOff)"
              "This\x{a}" ~
-             "      "
+             "        "
              sch:name [ ]
              " element must have a @type attribute, since it is\x{a}" ~
-             "      nested inside a "
+             "        nested inside a "
              sch:name [ ]
              "\x{a}" ~
              "               "
diff --git a/Test/expected-results/testClass.rnc b/Test/expected-results/testClass.rnc
index ddaff567d..8c3ffbefa 100644
--- a/Test/expected-results/testClass.rnc
+++ b/Test/expected-results/testClass.rnc
@@ -97,7 +97,7 @@ att.global.responsibility.attribute.cert =
   
   ## (certainty) signifies the degree of certainty associated with the intervention or interpretation.
   attribute cert {
-    xsd:double
+    xsd:double { minInclusive = "0" maxInclusive = "1" }
     | (
        ##
        "high"
@@ -615,7 +615,7 @@ model.divGenLike = notAllowed
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "testClassRef-div-abstractModel-structure-div-in-l-or-lg-constraint-report-2"
+           "testClassRef-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-3"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -626,8 +626,8 @@ model.divGenLike = notAllowed
              test =
                "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -637,7 +637,7 @@ model.divGenLike = notAllowed
        ]
     >> sch:pattern [
          id =
-           "testClassRef-div-abstractModel-structure-div-in-ab-or-p-constraint-report-3"
+           "testClassRef-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-4"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -648,8 +648,8 @@ model.divGenLike = notAllowed
              test =
                "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"
              "\x{a}" ~
-             "        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -671,7 +671,7 @@ p =
     macro.paraContent
     >> sch:pattern [
          id =
-           "testClassRef-p-abstractModel-structure-p-in-ab-or-p-constraint-report-4"
+           "testClassRef-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-5"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -680,10 +680,10 @@ p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
+               "(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )"
              "\x{a}" ~
-             "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
-             "      "
+             "          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
@@ -693,7 +693,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "testClassRef-p-abstractModel-structure-p-in-l-or-lg-constraint-report-5"
+           "testClassRef-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -702,10 +702,10 @@ p =
            "               "
            sch:report [
              test =
-               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
+               "( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )"
              "\x{a}" ~
-             "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
-             "      "
+             "          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
+             "        "
            ]
            "\x{a}" ~
            "            "
diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
index 40ccaeace..3c7ff81d9 100644
--- a/Test/expected-results/testdrama.compiled.xml
+++ b/Test/expected-results/testdrama.compiled.xml
@@ -5840,14 +5840,14 @@ used for transcribing extant documents.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STEC">1.3. The TEI Class System</ref>
   </listRef>
 </macroSpec><dataSpec module="tei" ident="teidata.certainty">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a degree of certainty.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확실성 정도를 표현하는 속성 값의 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示正確度的屬性值範圍</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">確信度を示す属性値の程度を示す。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant un degré de certitude</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un grado de certeza.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi che esprimono un grado di certezza</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a degree of certainty.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확실성 정도를 표현하는 속성 값의 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示正確度的屬性值範圍</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">確信度を示す属性値の程度を示す。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant un degré de certitude</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un grado de certeza.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi che esprimono un grado di certezza</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
     <valList type="closed">
       <valItem ident="high"/>
       <valItem ident="medium"/>
@@ -5855,67 +5855,70 @@ used for transcribing extant documents.</desc>
       <valItem ident="unknown"/>
     </valList>
   </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2011-02-26" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2011-02-26" xml:lang="en">
     <p>Certainty may be expressed by one of the predefined symbolic values <val>high</val>,
     <val>medium</val>, or <val>low</val>. The value
     <val>unknown</val> should be used in cases where the encoder
     does not wish to assert an opinion about the matter. 
     </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
     <p> 確信度は、<val>high</val>、<val>medium</val>、<val>low</val>のうち の1つが選択される。より詳細に示したい場合には、 <ident type="datatype">teidata.probability</ident>を単独または追加と して使用することができる。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
     <p>Le degré de certitude peut être exprimé par l'une des valeurs symboliques prédéfinies
     <val>high</val>, <val>medium</val>, ou <val>low</val>. </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.probability">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a probability.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확률을 표현하는 속성 값의 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示可能性的屬性值範圍</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">出現度を示す属性値の範囲を定義する。 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs exprimant une
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a probability.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확률을 표현하는 속성 값의 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示可能性的屬性值範圍</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">出現度を示す属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs exprimant une
     probabilité.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un
     grado de probabilida.d</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi che esprimono
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi che esprimono
     una probabilità</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <dataRef name="double"/>
-   </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2005-10-18" xml:lang="en">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
+    <dataRef name="double">
+      <dataFacet name="minInclusive" value="0"/>
+      <dataFacet name="maxInclusive" value="1"/>
+    </dataRef>
+  </content>
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2005-10-18" xml:lang="en">
       <p>Probability is expressed
        as a real number between 0 and 1;  0  representing <mentioned>certainly false</mentioned> and 1 representing <mentioned>certainly
         true</mentioned>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>出現度は、0から1までの実数で表現される。0は <mentioned>確実に偽</mentioned>、1は、 <mentioned>確実に真</mentioned>を示す。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>Le degré de probabilité est exprimé
        par un nombre réel entre 0 et 1 ;
      0       représentant <mentioned>certainement faux</mentioned> et 1 <mentioned>certainement
         vrai</mentioned>.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.numeric">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for numeric values.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">수치에 사용되는 속성 값의 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義用於數值的屬性值範圍</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">数値をとる属性値の範囲を定義する。 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs utilisées pour
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for numeric values.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">수치에 사용되는 속성 값의 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義用於數值的屬性值範圍</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">数値をとる属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs utilisées pour
     des valeurs numériques</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos para valores
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos para valores
     numéricos.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
     valori numerici</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate>
          <dataRef name="double"/>
          <dataRef name="token" restriction="(\-?[\d]+/\-?[\d]+)"/>
          <dataRef name="decimal"/>
       </alternate>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-06-01" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-06-01" xml:lang="en">
       <p>Any numeric value, represented as a decimal number, in floating point format, or as a ratio.</p>
       <p>To represent a floating point number, expressed in scientific notation, <soCalled>E
       notation</soCalled>, a variant of <soCalled>exponential notation</soCalled>, may be used. In
@@ -5928,7 +5931,7 @@ used for transcribing extant documents.</desc>
       character. Thus, the value represented in decimal notation as 0.5 might be represented as a
       ratio by the string 1/2.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 10進数を作る数値。 </p>
       <p> また、IEEE倍精度浮動小数点(64bit長)をとることもできる。例えば、 ±10⁻³²³ から ±10³⁰⁸など。 </p>
       <p> 科学的数値を評点する際、<soCalled>指数表現</soCalled>は、属性値と して記述される。
@@ -5950,7 +5953,7 @@ used for transcribing extant documents.</desc>
       <p> 仮数部と指数部を分ける記号は<mentioned>e</mentioned>または <mentioned>E</mentioned>のどちらでもよいが、当ガイドラインでは
         <mentioned>E</mentioned>を使うことを推奨する。これは、他の規格との 整合性を保ち、数学における定数との混同を避けるためである。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-10-06" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-10-06" xml:lang="fr">
       <p> Toute valeur numérique, représentée en nombre décimal, notée en virgule flottante ou
       en fraction.</p>
       <p>Pour représenter un nombre en virgule flottante, exprimé en notation scientifique,
@@ -5966,8 +5969,8 @@ used for transcribing extant documents.</desc>
       représentée en fraction par la chaîne de caractères 1/2.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.interval">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">defines attribute values used to express an interval value.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">defines attribute values used to express an interval value.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate>
          <dataRef name="float"/>
          <valList>
@@ -5977,48 +5980,48 @@ used for transcribing extant documents.</desc>
          </valList>
       </alternate>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">
       <p>Any value greater than zero or any one of the values
     <val>regular</val>, <val>irregular</val>, <val>unknown</val>.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.count">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for a non-negative
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for a non-negative
 integer value used as a count.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">계산으로 사용된 음이 아닌 정수 값의 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍，用於作為總數的非負整數值
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">계산으로 사용된 음이 아닌 정수 값의 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍，用於作為總數的非負整數值
 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">非負整数値を採る属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">非負整数値を採る属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs des attributs exprimant une valeur entière et non négative  utilisé pour des calculs.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos para números enteros no negativos usados como un cálculo.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per un numero intero non negativo impiegato come computo</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos para números enteros no negativos usados como un cálculo.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per un numero intero non negativo impiegato come computo</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="nonNegativeInteger"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-12-01" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-12-01" xml:lang="en">
       <p>Any positive integer value or zero is permitted</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>非負整数値のみが許される。</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>Seules des valeurs positives entières sont autorisées.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.temporal.w3c">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-08" xml:lang="en">defines the range of attribute values expressing a temporal
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-08" xml:lang="en">defines the range of attribute values expressing a temporal
   expression such as a date, a time, or a combination of them, that
   conform to the W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>
   specification.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">날짜, 시간 또는 이들의 조합과 같은 시간 표현을 나타내는 속성 값 범위를 정의하며, 이는 W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref> 명시를 따른다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示時間的屬性值範圍，如日期、時間或兩者的結合，依照W3C<ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>specification標準所定義。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">日付や時間などの時間表現をとる属性値の範囲を定義する。これは、W3Cの
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">날짜, 시간 또는 이들의 조합과 같은 시간 표현을 나타내는 속성 값 범위를 정의하며, 이는 W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref> 명시를 따른다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示時間的屬性值範圍，如日期、時間或兩者的結合，依照W3C<ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>specification標準所定義。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">日付や時間などの時間表現をとる属性値の範囲を定義する。これは、W3Cの
     <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>に従ったものになる。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs propre à
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs propre à
       exprimer une valeur temporelle comme une date, une période, ou une combinaison des deux
       conformément aux spécifications <ref target="#XSD2">XML Schema Part 2:
   Datatypes Second Edition</ref> du W3C.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que expresan un valor temporal del tipo fecha, hora, o combinación de ambas, de acuerdo con la especificación de W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que expresan un valor temporal del tipo fecha, hora, o combinación de ambas, de acuerdo con la especificación de W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate>
          <dataRef name="date"/>
          <dataRef name="gYear"/>
@@ -6030,71 +6033,71 @@ integer value used as a count.</desc>
          <dataRef name="dateTime"/>
       </alternate>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-08" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-08" xml:lang="en">
       <p>If it is likely that the value used is to be compared with
     another, then a time zone indicator should always be included, and
     only the dateTime representation should be used.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>
     当該属性値が他の値と比較される場合、時間帯は必ず示されるべきである。
     またはdateTimeを使うべきである(訳注：この文は修正されるかもしれな
     い)。
     </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
       <p>S'il est probable que la valeur utilisée doive être comparée à 
       d’autres, alors une indication de fuseau horaire sera  toujours incluse, et 
       seule la représentation de dateTime sera employée.
     </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.duration.w3c">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values available for representation of a duration in time using W3C datatypes.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">W3C 데이터 유형을 사용해서 시간 지속을 나타내는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">以W3C datatypes標準格式來定義表示一段持續性時間的屬性值範圍</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">W3Cのデータ型を使い、時間幅を表現する当該属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values available for representation of a duration in time using W3C datatypes.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">W3C 데이터 유형을 사용해서 시간 지속을 나타내는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">以W3C datatypes標準格式來定義表示一段持續性時間的屬性值範圍</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">W3Cのデータ型を使い、時間幅を表現する当該属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant une durée temporaraire utilisant les types de données W3C</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos disponibles para la representación de un periodo de tiempo usando tipos de datos W3C</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos disponibles para la representación de un periodo de tiempo usando tipos de datos W3C</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="duration"/>
    </content>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <time dur="PT45M">forty-five minutes</time>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur="P1DT12H">a day and a half</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur="P7D">a week</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <time dur="PT45M">quarante-cinq minutes</time>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur="P1DT12H">une journée et demie</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur="P7D">une semaine</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="und">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="und">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <time dur="PT0.02S">20 ms</time>
       </egXML>
   </exemplum>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-20" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-20" xml:lang="en">
       <p>A duration is expressed as a sequence of number-letter pairs,
     preceded by the letter P; the letter gives the unit and may be Y
     (year), M (month), D (day), H (hour), M (minute), or S (second),
@@ -6109,7 +6112,7 @@ integer value used as a count.</desc>
       <p>For complete details, see the <ref target="https://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#duration">W3C
     specification</ref>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>
     時間幅は、先頭文字Pに続いて、数値-文字のペア列で示される。
     文字は単位を示している。Y(年)、M(月)、D(日)、H(時間)、M(分)、S(秒)
@@ -6126,7 +6129,7 @@ integer value used as a count.</desc>
     W3C specification</ref>を参照のこと。
     </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>Une durée est exprimée par une suite de paires alphanumériques, précédée par la lettre P ; la lettre donne l'unité et peut être Y
       (année), M (mois), D (jour), H (heure), M (minute), ou S (seconde),
       dans cet ordre. Les nombres sont des entiers non signés à l'exception du dernier, qui peut comporter une décimale (en utilisant soit 
@@ -6139,19 +6142,19 @@ integer value used as a count.</desc>
       specification</ref>.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.truthValue">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-22" xml:lang="en">defines the range of attribute values used to express a truth
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-22" xml:lang="en">defines the range of attribute values used to express a truth
 value.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">진리값을 표현하는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個可能未知的真實值</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">真偽値を示す属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">진리값을 표현하는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個可能未知的真實值</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">真偽値を示す属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant la vérité d'une proposition.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para expresar un valor cierto.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per esprimere un valore di verità</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para expresar un valor cierto.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per esprimere un valore di verità</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="boolean"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-11-01" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-11-01" xml:lang="en">
       <p>The possible values of this datatype are <val>1</val> or
     <val>true</val>, or <val>0</val> or <val>false</val>.</p>
       <p>This datatype applies only for cases where uncertainty is
@@ -6160,14 +6163,14 @@ value.</desc>
     <val>inapplicable</val>, it should have the extended version of
     this datatype: <ident type="datatype">teidata.xTruthValue</ident>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>
     曖昧な値が許されない場合に使われるデータ型になる。属性値が真偽値で
     ない場合、例えば"unknown"や"inapplicable"の場合には、当該データ型
     の拡張版であるteidata.xTruthValueを使うべきである。
     </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
       <p>Ce type de données ne s'applique que dans les cas où l'incertitude est 
       inappropriée ; c’est-à-dire si l'attribut concerné peut avoir une valeur autre 
       que vrai ou faux, par ex. <val>inconnu</val>, ou <val>inapplicable</val>, il devrait  alors y
@@ -6175,20 +6178,20 @@ value.</desc>
     </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.xTruthValue">
-  <gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-07-04" xml:lang="en">extended truth value</gloss>
-  <gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확장 진리값</gloss>
-  <gloss xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW"/>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to express a truth value which may be unknown.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">알려지지 않을 수 있는 진리값을 표현하는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個可能未知的真實值</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">不明の場合もある真偽値をとる属性値の範囲を定義する。 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <gloss xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-07-04" xml:lang="en">extended truth value</gloss>
+  <gloss xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확장 진리값</gloss>
+  <gloss xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW"/>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to express a truth value which may be unknown.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">알려지지 않을 수 있는 진리값을 표현하는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個可能未知的真實值</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">不明の場合もある真偽値をとる属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant une vérité potentiellement inconnue.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
     expresar un valor cierto potencialmente desconocido.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
     esprimere un valore di verità potenzialmente sconosciuto</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate>
          <dataRef name="boolean"/>
          <valList>
@@ -6197,31 +6200,31 @@ value.</desc>
          </valList>
       </alternate>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2010-10-29" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2010-10-29" xml:lang="en">
       <p>In cases where where uncertainty is inappropriate, use the
     datatype <ident type="datatype">teidata.TruthValue</ident>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 不明な場合がなければ、データ型teidata.TruthValueを使用する。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
       <p>Dans le cas où l'incertitude n’est pas adaptée, employer plutot
     le type de données <ident>teidata.TruthValue</ident>.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.language">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to identify a particular combination of human
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to identify a particular combination of human
     language and writing system.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">인간의 언어와 문자 체계의 특별한 조합을 식별하는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍標明人類語言與寫作系統的特殊結合</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">自然言語を示す属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">인간의 언어와 문자 체계의 특별한 조합을 식별하는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍標明人類語言與寫作系統的特殊結合</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">自然言語を示す属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant 
     une combinaison particulière du langage humain avec un système d'écriture.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
     identificar una combinación determinada de lenguaje y escritura humanos.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
     identificare una determinata combinazione di linguaggio e sistema di scrittura umani</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <alternate>
          <dataRef name="language"/>
          <valList>
@@ -6229,7 +6232,7 @@ value.</desc>
          </valList>
       </alternate>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-06-29" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-06-29" xml:lang="en">
       <p>The values for this attribute are language <soCalled>tags</soCalled> as defined in <ref target="https://tools.ietf.org/html/bcp47">BCP 47</ref>. Currently BCP 47 comprises RFC 5646
       and RFC 4647; over time, other IETF documents may succeed these as the best current practice.</p>
       <p>A <soCalled>language tag</soCalled>, per BCP 47, is assembled from a sequence of components
@@ -6313,7 +6316,7 @@ value.</desc>
       <p>The W3C Internationalization Activity has published a useful introduction to BCP 47, <ref target="https://www.w3.org/International/articles/language-tags/Overview.en.php">Language
         tags in HTML and XML</ref>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 当該属性値は、 <ref target="https://tools.ietf.org/html/bcp47">BCP 47</ref>
       で定義されている言語<soCalled>タグ</soCalled>になる。 現行のBCPには、RFC4646とRFC4647の内容が含まれている。
       今後は、他のIETF文書も採用されるかもしれない。 </p>
@@ -6384,7 +6387,7 @@ value.</desc>
       <p> W3Cの国際化活動では、BCP 47の解説を以下に用意している。 <ref target="https://www.w3.org/International/articles/language-tags/Overview.en.php">
         HTMLとXMLで使用される言語タグ</ref>。</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-10-06" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-10-06" xml:lang="fr">
       <p>Les valeurs pour cet attribut sont les <soCalled>étiquettes</soCalled> de langue définies
         dans la norme <ref target="https://tools.ietf.org/html/bcp47">BCP 47</ref>. Actuellement, la norme BCP 47
       intègre les normes RFC 4646 et RFC 4647 ; à l'avenir, d'autres documents de l'IETF pourront leur succéder en
@@ -6474,66 +6477,66 @@ value.</desc>
         tags in HTML and XML</ref>.</p>
       
   </remarks>
-  <listRef xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <listRef xmlns:xi="http://www.w3.org/2001/XInclude">
       <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CH.html#CHSH">6.1. Language Identification</ref>
   </listRef>
 </dataSpec><dataSpec module="tei" ident="teidata.namespace">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-14" xml:lang="en">defines the range of attribute values used to indicate XML namespaces as defined by the W3C
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-14" xml:lang="en">defines the range of attribute values used to indicate XML namespaces as defined by the W3C
     <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</ref>
     Technical Recommendation.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">W3C <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</ref> 기술적 권고안에 의해
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">W3C <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</ref> 기술적 권고안에 의해
     정의된 XML 이름공간을 나타내는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍指出XML名稱空間，由XML technical
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍指出XML名稱空間，由XML technical
     recommendation中的W3C名稱空間所定義。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">W3Cの<ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">W3Cの<ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">
     XML名前空間</ref>で定義されている名前空間を示す属性値の範囲を示す。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant une espace de noms XML tels qu'ils
   sont définis par le
       W3C.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
     indicar los nombres de los espacios en XML como establecen las recomendaciones técnicas del W3C
     para los <ptr target="https://www.w3.org/TR/1999/REC-xml-names-19990114/"/>
    </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
     indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
     <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">spazi dei nomi in XML</ref>.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef restriction="\S+" name="anyURI"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-02-08" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-02-08" xml:lang="en">
       <p>The range of syntactically valid values is defined by <ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986 <title>Uniform Resource Identifier
           (URI): Generic Syntax</title>
          </ref>
       </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 当該データ値は、<ref target="https://www.ietf.org/rfc/rfc2396.txt">RFC 2396 <title>Uniform Resource
           Identifier (URI) Reference</title>
          </ref> に定義されている。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>La gamme des valeurs  syntaxiquement valides est définie par <ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986 <title>Uniform Resource Identifier
           (URI): Generic Syntax</title>
          </ref>.</p>
       
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.outputMeasurement">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-03-26" xml:lang="en">defines a range of values for use in specifying the size of an object that is intended for
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-03-26" xml:lang="en">defines a range of values for use in specifying the size of an object that is intended for
     display.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">웹에서 디스플레이 목적의 대상 크기를 명시하는 값의 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍說明預定呈現在網路上之物件大小</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">webページ上で表示する際の大きさを定義する値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs exprimant
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">웹에서 디스플레이 목적의 대상 크기를 명시하는 값의 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍說明預定呈現在網路上之物件大小</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">webページ上で表示する際の大きさを定義する値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs exprimant
     les dimensions d'un objet destiné à être affiché</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores para emplearlos en la
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores para emplearlos en la
     especificación de las dimensiones de un objeto que se ha de incluir in la red.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce una gamma di valori da impiegare nello
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce una gamma di valori da impiegare nello
     specificare le dimensioni di un oggetto da inserire in rete</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="token" restriction="[\-+]?\d+(\.\d+)?(%|cm|mm|in|pt|pc|px|em|ex|ch|rem|vw|vh|vmin|vmax)"/>
    </content>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <figure>
             <head>The TEI Logo</head>
@@ -6544,7 +6547,7 @@ value.</desc>
          </figure>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <figure>
             <head>Le logo TEI</head>
@@ -6552,16 +6555,16 @@ value.</desc>
          </figure>
       </egXML>
   </exemplum>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-09-27" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-09-27" xml:lang="en">
       <p> These values map directly onto the values used by XSL-FO and CSS. For definitions of the
       units see those specifications; at the time of this writing the most complete list is in the
         <ref target="https://www.w3.org/TR/css-values-3/">CSS3 working draft</ref>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-09-27" xml:lang="ja">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-09-27" xml:lang="ja">
       <p> 当該値は、XSLFOやCSSで使用される値になる。詳細は各規格を参照のこと。 現時点で一番詳細なリストは、 <ref target="https://www.w3.org/TR/css-values-3/"> CSS3 working
       draft</ref>になる。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-09-27" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-09-27" xml:lang="fr">
       <p> Ces valeurs peuvent être reportées directement sur des valeurs utilisées par XSL-FO et CSS. Pour les
       définitions des unités, voir ces spécifications ; à ce jour la
       liste la plus complète est dans un
@@ -6636,21 +6639,21 @@ value.</desc>
     </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.pointer">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-01-19" xml:lang="en">defines the range of attribute values used to provide a single
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-01-19" xml:lang="en">defines the range of attribute values used to provide a single
   URI, absolute or relative, pointing to some other
 resource, either within the current document or elsewhere.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">현 문서 또는 다른 곳 어디서든 다른 자원에 대한 단일 포인터를 제공하는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍提供單一指標，連結到其他位於目前文件或他處的資源</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">他の資源へのポインタをとる属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-29" xml:lang="fr">définit la gamme des valeurs d'attributs utilisées
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">현 문서 또는 다른 곳 어디서든 다른 자원에 대한 단일 포인터를 제공하는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍提供單一指標，連結到其他位於目前文件或他處的資源</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">他の資源へのポインタをとる属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-29" xml:lang="fr">définit la gamme des valeurs d'attributs utilisées
       pour fournir un pointeur URI unique sur une autre ressource, soit dans le document courant, soit
       dans un autre document</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores de atributos usados para proporcionar un indicador de cualquier recurso, bien en el documento corriente o en otro.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per indicare un unico puntatore rispetto a qualsiasi altra risorsa all'interno del documento corrente o altrove</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores de atributos usados para proporcionar un indicador de cualquier recurso, bien en el documento corriente o en otro.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per indicare un unico puntatore rispetto a qualsiasi altra risorsa all'interno del documento corrente o altrove</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef restriction="\S+" name="anyURI"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2011-12-12" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2011-12-12" xml:lang="en">
       <p>The range of syntactically valid values is defined by
     <ref target="https://www.ietf.org/rfc/rfc3986.txt"> RFC 3986</ref>
          <title>Uniform Resource Identifier (URI): Generic
@@ -6665,7 +6668,7 @@ resource, either within the current document or elsewhere.</desc>
     <code>http://xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c/</code>
       </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>
     当該属性値は、
     <ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986
@@ -6674,7 +6677,7 @@ resource, either within the current document or elsewhere.</desc>
     に定義されている。
     </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>La gamme des valeurs valides syntaxiquement est définie par<ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986
       <title>Uniform Resource Identifier (URI): Generic
         Syntax</title>
@@ -6682,28 +6685,28 @@ resource, either within the current document or elsewhere.</desc>
       </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.authority">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2020-02-12" xml:lang="en">defines attribute values which derive from an 
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2020-02-12" xml:lang="en">defines attribute values which derive from an 
     authority list, which may be an enumerated list defined in the document's schema, a list 
     or taxonomy elsewhere in the document, or an online taxonomy, gazetteer, or other authority.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
     <alternate>
       <dataRef key="teidata.enumerated"/>
       <dataRef key="teidata.pointer"/>
     </alternate>
   </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2020-02-12" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2020-02-12" xml:lang="en">
     <p>Attribute values with this datatype should either come from a value list in the attribute
       specification (<ident type="datatype">teidata.enumerated</ident>) or be a valid URI (<ident type="datatype">teidata.pointer</ident>).</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.version">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-11-20" xml:lang="en">defines the range of attribute values which may be used to
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-11-20" xml:lang="en">defines the range of attribute values which may be used to
   specify a TEI or Unicode version number.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">définit la gamme des valeurs d'attribut
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">définit la gamme des valeurs d'attribut
   exprimant un numéro de version TEI.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="token" restriction="[\d]+(\.[\d]+){0,2}"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2012-06-17" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2012-06-17" xml:lang="en">
       <p>The value of this attribute follows the pattern specified by
     the Unicode consortium for its version number (<ptr target="https://unicode.org/versions/"/>). A version number
     contains digits and fullstop characters only. The first number
@@ -6712,7 +6715,7 @@ resource, either within the current document or elsewhere.</desc>
     supplied.
 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
       <p>La valeur de cet attribut devrait suivre le format proposé par
     le Consortium Unicode pour identifier les versions (<ptr target="https://unicode.org/versions/"/>). Un numéro de version
     ne contient que des chiffres et des points. Le numéro
@@ -6722,28 +6725,28 @@ resource, either within the current document or elsewhere.</desc>
 </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.versionNumber">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">defines the range of attribute values used for version numbers.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">defines the range of attribute values used for version numbers.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="token" restriction="[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">
       <p/>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.replacement">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">defines attribute values which contain a replacement template.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">defines attribute values which contain a replacement template.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <textNode/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">
       <p/>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.xpath">
-<desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">defines attribute values
+<desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">defines attribute values
 which contain an XPath expression.</desc>
-<content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<content xmlns:xi="http://www.w3.org/2001/XInclude">
   <textNode/>
 </content>
-<remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">
+<remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-14" xml:lang="en">
   <p>Any XPath expression using the syntax
   defined in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/BIB.html#XSLT2">6.2. </ref>.</p>
   <p>When writing programs that evaluate XPath expressions,
@@ -6753,32 +6756,32 @@ which contain an XPath expression.</desc>
   OWASP</ref>.</p>
 </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.word">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-22" xml:lang="en">defines the range of attribute values expressed as a single
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-22" xml:lang="en">defines the range of attribute values expressed as a single
   word or token.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">단일 단어 또는 토큰으로 표현된 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個單字或代號</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">いち単語またはトークンをとる属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">단일 단어 또는 토큰으로 표현된 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個單字或代號</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">いち単語またはトークンをとる属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant un seul mot ou signe</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores de atributos expresados como una única palabra o señal.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi espressi come singola parola o singolo token</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores de atributos expresados como una única palabra o señal.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi espressi come singola parola o singolo token</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="token" restriction="[^\p{C}\p{Z}]+"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2005-10-18" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2005-10-18" xml:lang="en">
       <p>Attributes using this datatype must contain a single
     <soCalled>word</soCalled> which contains only letters, digits,
     punctuation characters, or symbols: thus it cannot include
     whitespace.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p>
     当該データ型を使用する属性値は、ひとつの<soCalled>単語</soCalled>
     になる。単語とは、文字、数字、句読点などの記号から構成されている。
     空白文字は含むことができない。
     </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">
       <p>Les attributs employant ce type de données doivent contenir un 
       <soCalled>mot</soCalled> simple  ne contenant que des lettres, des chiffres, 
       des signes de ponctuation, ou des symboles : ils ne peuvent donc pas inclure 
@@ -6786,62 +6789,62 @@ which contain an XPath expression.</desc>
     </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.text">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2012-06-17" xml:lang="en">defines the range of attribute values used to express some
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2012-06-17" xml:lang="en">defines the range of attribute values used to express some
   kind of identifying string as a single sequence
   of Unicode characters possibly including whitespace.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">définit la gamme des valeurs d'attributs 
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr" versionDate="2007-06-12">définit la gamme des valeurs d'attributs 
       exprimant une chaine de caracteres Unicode, y compris des
   espaces blancs.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="string"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2012-06-17" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2012-06-17" xml:lang="en">
       <p>Attributes using this datatype must contain a single
     <soCalled>token</soCalled> in which whitespace and other
     punctuation characters are permitted. </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.name">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressed as an XML Name.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">XML 이름으로 표현되는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以XML名稱或識別符碼表示</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">XML名前としてある属性値の範囲を定義する。 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-29" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressed as an XML Name.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">XML 이름으로 표현되는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以XML名稱或識別符碼表示</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">XML名前としてある属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-29" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant
     un nom XML</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos expresados como
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos expresados como
     identificador o un nombre en XML.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi espressi come
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi espressi come
     identificatore o nome XML</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="Name"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">
       <p>Attributes using this datatype must contain a single word which follows the rules defining a
       legal XML name (see <ptr target="https://www.w3.org/TR/REC-xml/#dt-name"/>): for example they
       cannot include whitespace or begin with digits. </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 当該属性は、妥当なXML名前(詳細は <ptr target="https://www.w3.org/TR/REC-xml/#dt-name"/>を参照)である
       ひとつの単語をとる。例えば、空白文字を含まず、数字が先頭文字にこな いもの。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>Les attributs utilisant ce type de données doivent contenir un seul mot, qui suit les règles
       de définition d'un nom XML valide (voir <ptr target="https://www.w3.org/TR/REC-xml/#dt-name"/>) :
       par exemple ils ne peuvent contenir de blancs ou commencer par des chiffres. </p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.xmlName">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">defines attribute values which contain an XML name.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">defines attribute values which contain an XML name.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="NCName"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2013-04-13" xml:lang="en">
       <p>The rules defining an XML name form a part of the XML Specification.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.prefix">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-11-28" xml:lang="en">defines a range of values that may function as a URI scheme name.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-11-28" xml:lang="en">defines a range of values that may function as a URI scheme name.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
     <dataRef name="token" restriction="[a-z][a-z0-9\+\.\-]*"/>
   </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-11-28" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-11-28" xml:lang="en">
     <p>This datatype is used to constrain a string of characters to
     one that can be used as a URI scheme name according to <ref target="https://www.ietf.org/rfc/rfc3986.txt">RFC 3986</ref>, <ref target="https://tools.ietf.org/html/rfc3986#section-3.1">section
     3.1</ref>. Thus only the 26 lowercase letters a–z, the 10
@@ -6849,22 +6852,22 @@ which contain an XPath expression.</desc>
     permitted, and the value must start with a letter.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.enumerated">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-22" xml:lang="en">defines the range of attribute values expressed as a single XML name taken from a list of
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-22" xml:lang="en">defines the range of attribute values expressed as a single XML name taken from a list of
     documented possibilities.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">기록된 확률의 목록으로부터 얻어진 단일 XML 이름으로 표현된 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以單字或代號呈現，該單字或代號出自於一份紀錄所有可能性的列表</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">符号化されている記述にある、ひつとのXML名前を示す属性値の範囲を定義する。</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">기록된 확률의 목록으로부터 얻어진 단일 XML 이름으로 표현된 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以單字或代號呈現，該單字或代號出自於一份紀錄所有可能性的列表</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">符号化されている記述にある、ひつとのXML名前を示す属性値の範囲を定義する。</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de
   valeurs des attributs exprimant un nom XML
     extrait d'une liste de possibilités documentées</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos expresados como
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos expresados como
     una única palabra o señal tomada de una lista de posibilidades documentadas.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi espressi come
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi espressi come
     singola parola o token tratto da una lista di possibilità attestate</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef key="teidata.word"/>
    </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-12-01" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2016-12-01" xml:lang="en">
     <p>Attributes using this datatype must contain a single
       <soCalled>word</soCalled> which contains only letters, digits,
       punctuation characters, or symbols: thus it cannot include
@@ -6872,12 +6875,12 @@ which contain an XPath expression.</desc>
       <p>Typically, the list of documented possibilities will be provided (or exemplified) by a value
       list in the associated attribute specification, expressed with a <gi>valList</gi> element.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 当該データ型は、妥当なXML名前 (詳細は<ptr target="https://www.w3.org/TR/REC-xml/#dt-name"/>
       を参照のこと)である単語でなくてはならない。例えば、 属性値として空白文字、または数値で始まる名前をとることはできない。 </p>
       <p> 典型例は、可能な記述またはその例のリストが、要素<gi>valList</gi> 中に属性定義として示されている。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>Les attributs utilisant ce type de données doivent contenir un mot qui suit les règles de
       définition d'un nom XML valide (voir <ptr target="https://www.w3.org/TR/REC-xml/#dt-name"/>):
       par exemple ils ne peuvent pas contenir des blancs ni commencer par des chiffres. </p>
@@ -6886,46 +6889,47 @@ which contain an XPath expression.</desc>
       <gi>valList</gi>.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.gender">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-17" xml:lang="en">defines the range of attribute values used to
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-17" xml:lang="en">defines the range of attribute values used to
     represent the gender of a person, persona, or character.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
     <dataRef key="teidata.enumerated"/>
   </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-08-27" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-08-27" xml:lang="en">
     <p>Values for attributes using this datatype may be defined locally by a project, or they may refer to an external standard.</p>
     <p>Values for this datatype should not be used to encode morphological gender (cf. <gi>gen</gi>,
         <att>msd</att> as defined in <ident type="class">att.linguistic</ident>, and <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</ref>).</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.sex">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="en">defines the range of attribute values used to identify
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="en">defines the range of attribute values used to identify
     the sex of an organism.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">인간 또는 동물의 성을 식별하는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍用以識別人類或動物的性別</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">人間または動物の性を示す属性値の範囲を定義する。 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="fr">définit la gamme des valeurs d'attributs employés
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">인간 또는 동물의 성을 식별하는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍用以識別人類或動物的性別</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">人間または動物の性を示す属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="fr">définit la gamme des valeurs d'attributs employés
     pour identifier le sexe d’un organisme.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="es">define la gama de valores de atributos usados para
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="es">define la gama de valores de atributos usados para
     identificar el sexo de un organismo.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="it">definisce una gamma di valori di attributi usati per
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="it">definisce una gamma di valori di attributi usati per
     identificare il sesso di un organismo.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
     <dataRef key="teidata.enumerated"/>
   </content>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-08-27" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-08-27" xml:lang="en">
     <p>Values for attributes using this datatype may be defined locally by a project, or they may refer to an external standard.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-03" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-03" xml:lang="fr">
     <p>Les valeurs de cet attribut peuvent être définies localement par un projet ou peuvent faire
       référence à un standard externe.</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.probCert">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines a range of attribute values which can be expressed either as a numeric probability or as a coded certainty value.</desc>
-<content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">  
-  <alternate><dataRef key="teidata.probability"/>
-  <dataRef key="teidata.certainty"/>
-  </alternate>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines a range of attribute values which can be expressed either as a numeric
+    probability or as a coded certainty value.</desc>
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
+    <alternate>
+      <dataRef key="teidata.probability"/>
+      <dataRef key="teidata.certainty"/>
+    </alternate>
   </content>
-  
 </dataSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.formula">
   <desc versionDate="2019-06-25" xml:lang="en">provides attributes for defining a mathematical formula.</desc>
   <attList>
@@ -7200,53 +7204,53 @@ one initial.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</ref>
   </listRef>
 </classSpec><dataSpec module="tei" ident="teidata.duration.iso">
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-09" xml:lang="en">defines the range of attribute values available for representation of a duration in time
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-09" xml:lang="en">defines the range of attribute values available for representation of a duration in time
     using ISO 8601 standard formats</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。 </desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601.</desc>
-  <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos posibles para
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601.</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos posibles para
     representar la duración en el tiempo usando formatos estàndards ISO 8601.</desc>
-  <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <content xmlns:xi="http://www.w3.org/2001/XInclude">
       <dataRef name="token" restriction="[0-9.,DHMPRSTWYZ/:+\-]+"/>
    </content>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <time dur-iso="PT0,75H">three-quarters of an hour</time>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur-iso="P1,5D">a day and a half</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur-iso="P14D">a fortnight</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <time dur-iso="PT0,75H">trois quarts d'une heure</time>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur-iso="P1,5D">une journee et demie</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="fr">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <date dur-iso="P14D">une quinzaine</date>
       </egXML>
   </exemplum>
-  <exemplum xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="und">
+  <exemplum xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="und">
       <egXML xmlns="http://www.tei-c.org/ns/Examples">
          <time dur-iso="PT0.02S">20 ms</time>
       </egXML>
   </exemplum>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-20" xml:lang="en">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-20" xml:lang="en">
       <p>A duration is expressed as a sequence of number-letter pairs, preceded by the letter P; the
       letter gives the unit and may be Y (year), M (month), D (day), H (hour), M (minute), or S
       (second), in that order. The numbers are all unsigned integers, except for the last, which may
@@ -7258,7 +7262,7 @@ one initial.</desc>
       <p>For complete details, see ISO 8601 <title>Data elements and interchange formats — Information
         interchange — Representation of dates and times</title>.</p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="ja" versionDate="2008-04-05">
       <p> 時間幅は、先頭文字Pに続いて、数値-文字のペア列で示される。 文字は単位を示している。Y(年)、M(月)、D(日)、H(時間)、M(分)、S(秒)
       の順番になる。数値は符号のない整数である。但し、最後に10進数の 表記記号(小数点を示す<code>.</code>または<code>,</code>。後者が望
         ましい)をとることはある。数値が<mentioned>0</mentioned>の場合、 数値-文字のペアは省略されることがある。 H(時間)、M(分)、
@@ -7266,7 +7270,7 @@ one initial.</desc>
       <p> 詳細については、ISO 8601<title>Data elements and interchange formats - Information interchange -
         Representation of dates and times</title>を参照のこと。 </p>
   </remarks>
-  <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
+  <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-25" xml:lang="fr">
       <p>Une durée est exprimée par une suite de paires alphanumériques, précédée par la lettre P ;
       la lettre donne l'unité et peut être Y (année), M (mois), D (jour), H (heure), M (minute), ou
       S (seconde), dans cet ordre. Les nombres sont des entiers sans
@@ -7491,16 +7495,20 @@ Elements</ref>
   </content>
   <constraintSpec ident="abstractModel-structure-p-in-ab-or-p" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
-        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
-      </sch:report>
+      <sch:rule context="tei:p">
+        <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
+          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="abstractModel-structure-p-in-l-or-lg" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:p">
+        <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -8328,6 +8336,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2009-01-06" xml:lang="fr">citation</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">citazione</gloss>
   <gloss versionDate="2016-11-24" xml:lang="de">Zitat mit Referenz</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">引用内容</gloss>
   <desc versionDate="2007-09-23" xml:lang="en">contains a quotation from some other document, together with a bibliographic reference to
     its source. In a dictionary it may contain an example text with at least one occurrence of the
     word form, used in the sense being described, or a translation of the headword, or an example.</desc>
@@ -8986,8 +8995,9 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
           <att>target</att> in combination with either
           <att>from</att> or <att>to</att>.</desc>
         <constraint>
-          <sch:report test="../@from | ../@to">When target= is
-            present, neither from= nor to= should be.</sch:report>
+          <sch:rule context="tei:rt/@target">
+            <sch:report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</sch:report>
+          </sch:rule>
         </constraint>
       </constraintSpec>
       <remarks xml:lang="en" versionDate="2020-02-01">
@@ -9009,8 +9019,9 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         <desc>Enforce the presence of <att>to</att> iff there
           is a <att>from</att>.</desc>
         <constraint>
-          <sch:assert test="../@to">When from= is present, the to=
-            attribute of <sch:name/> is required.</sch:assert>
+          <sch:rule context="tei:rt/@from">
+            <sch:assert test="../@to">When from= is present, the to= attribute of <sch:name/> is required.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </attDef>
@@ -9026,8 +9037,9 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         <desc>Enforce the presence of <att>from</att> iff there
           is a <att>to</att>.</desc>
         <constraint>
-          <sch:assert test="../@from">When to= is present, the from=
-            attribute of <sch:name/> is required.</sch:assert>
+          <sch:rule context="tei:rt/@to">
+            <sch:assert test="../@from">When to= is present, the from= attribute of <sch:name/> is required.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </attDef>
@@ -9161,6 +9173,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2007-05-04" xml:lang="es">corrección</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">correzione</gloss>
   <gloss versionDate="2016-11-24" xml:lang="de">Korrektur</gloss>  
+  <gloss versionDate="2024-02-28" xml:lang="ja">修正</gloss>
   <desc versionDate="2006-03-20" xml:lang="en">contains the correct form of a passage apparently erroneous in the copy text.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">복사된 텍스트에서 오류로 보이는 단락의 정정 형식을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含文本中看似錯誤並加以更正過後的文字。</desc>
@@ -9325,18 +9338,13 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <p>Se Observa también que los elementos <gi>opción</gi> pueden ser uno mismo-jerarquía.</p>
     <p>Para una versión especializada de la <gi>opción</gi> para codificar los testimonios múltiples de un único trabajo, ver la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref>.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
-    <p>
-            要素<gi>choice</gi>の子要素は全て、選択的な符号化方法を示している。
-            従って、それらは互いに排他的であるとするのが自然である。けれども、
-            並列的に符号化されていると考えられる場合もあるだろう。
-        </p>
-    <p>要素<gi>choice</gi>は、入れ子化できることにも注意して欲しい。
-        </p>
+  <remarks xml:lang="ja" versionDate="2024-02-28">
     <p>
-            1つの作品にある複数の現存資料を要素<gi>choice</gi>符号化することに
-            ついては、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref>を参照のこと。
-        </p>
+      <gi>choice</gi>要素の子要素は全て、同じ部分の異なる選択肢を示しているので、それらは択一的であるとするのが自然である。
+      けれども、テキストを完全に表現するには複数の選択肢を並列的に扱う必要がある場合もあるだろう。</p>
+      <p><gi>choice</gi>要素は、自らを入れ子にできることにも注意して欲しい。</p>
+      <p>符号化時にありうる選択肢ではなく、1つの作品にある複数の本文を記録する目的では、
+      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref>で扱われている<gi>app</gi>要素などが望ましい。</p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-24">
       <p>
@@ -9359,7 +9367,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2005-01-14" xml:lang="en">regularization</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">정규화</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">一般化</gloss>
-  <gloss versionDate="2008-04-06" xml:lang="ja"/>
+  <gloss versionDate="2024-02-14" xml:lang="ja">規則化</gloss>
   <gloss versionDate="2009-01-06" xml:lang="fr">régularisation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">regularización</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">regolarizzazione</gloss>
@@ -9367,7 +9375,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <desc versionDate="2005-01-14" xml:lang="en">contains a reading which has been regularized or normalized in some sense.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">어떤 면에서 정규화 또는 표준화된 해석을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標誌一般化或規格化處理過的文字。</desc>
-  <desc versionDate="2008-04-06" xml:lang="ja">正規化された読みを示す。</desc>
+  <desc versionDate="2024-02-14" xml:lang="ja">規則化された読みを示す。</desc>
   <desc versionDate="2009-01-06" xml:lang="fr">contient une partie qui a été régularisée ou normalisée
         de façon quelconque</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una lectura que ha sido regularizada o
@@ -11933,7 +11941,7 @@ Measures</ref>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAB">3.6.5. Abbreviations and Their Expansions</ref>
   </listRef>
-</elementSpec><elementSpec module="core" ident="ptr">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="ptr">
   <gloss versionDate="2007-07-04" xml:lang="en">pointer</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">포인터</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
@@ -11960,8 +11968,9 @@ Measures</ref>
   <content><empty/></content>
   <constraintSpec scheme="schematron" ident="ptrAtts">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
-attributes @target and @cRef may be supplied on <name/>.</report>
+      <sch:rule context="tei:ptr">
+        <sch:report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <sch:name/>.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="und">
@@ -11975,24 +11984,22 @@ attributes @target and @cRef may be supplied on <name/>.</report>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</ref>
   </listRef>
-</elementSpec><elementSpec module="core" ident="ref">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="ref">
   <gloss versionDate="2007-07-04" xml:lang="en">reference</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">참조</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
   <gloss versionDate="2008-04-06" xml:lang="es">referencia</gloss>
   <gloss versionDate="2009-01-06" xml:lang="fr">référence</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">riferimento</gloss>
-    <gloss versionDate="2016-11-25" xml:lang="de">Referenz</gloss>
+  <gloss versionDate="2016-11-25" xml:lang="de">Referenz</gloss>
   <desc versionDate="2006-01-11" xml:lang="en">defines a reference to another location, possibly modified by additional text or comment.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">부가적인 텍스트 또는 해설로 수정될 수 있는, 다른 위치로 참조를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標明與其他位置互相參照的符號，或許包含附加的文字或註解。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">他の場所への参照を定義する。多くは、追加テキストまたはコメントを含む。</desc>
   <desc versionDate="2009-01-06" xml:lang="fr">définit une référence vers un autre emplacement, la référence étant éventuellement modifiée ou complétée par un texte ou un commentaire.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">define una referencia a otra localización, posiblemente
-    modificada por un texto o comentario adicional.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">definisce un riferimento ad un'altra posizione, può
-    essere modificata da un commento o testo ulteriore</desc>
-    <desc versionDate="2016-11-25" xml:lang="de">definiert einen externen oder internen Verweis, der auch durch einen zusätzlichen Text oder Kommentar ergänzt werden kann.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">define una referencia a otra localización, posiblemente modificada por un texto o comentario adicional.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">definisce un riferimento ad un'altra posizione, può essere modificata da un commento o testo ulteriore</desc>
+  <desc versionDate="2016-11-25" xml:lang="de">definiert einen externen oder internen Verweis, der auch durch einen zusätzlichen Text oder Kommentar ergänzt werden kann.</desc>
   <classes>
     <memberOf key="att.cReferencing"/>
     <memberOf key="att.declaring"/>
@@ -12008,9 +12015,9 @@ attributes @target and @cRef may be supplied on <name/>.</report>
   </content>
   <constraintSpec scheme="schematron" ident="refAtts">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
-	attributes @target' and @cRef' may be supplied on <name/>
-         </report>
+      <sch:rule context="tei:ref">
+        <sch:report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <sch:name/></sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -12028,12 +12035,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
   <exemplum versionDate="2008-04-06" xml:lang="fr">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">Cf. tout particulièrement 
     <ref cRef="B1/234">le vers 234 du Livre I</ref>
-      </egXML>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
     <egXML xmlns="http://www.tei-c.org/ns/Examples"><ref target="http://www.natcorp.ox.ac.uk/Texts/A02.xml#s2"> 關於第二行，</ref> 請參考 <ref>下列
-        <term>慣用語</term>
-         </ref>.</egXML>
+    <term>慣用語</term>
+    </ref>.</egXML>
   </exemplum>
   <remarks versionDate="2005-10-13" xml:lang="en">
     <p>The <att>target</att> and <att>cRef</att> attributes are mutually exclusive.</p>
@@ -12045,7 +12052,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
     <p> 属性<att>target</att>と<att>cRef</att>は、排他的に使用される。 </p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-25">
-      <p>Die <att>target</att> und <att>cRef</att>-Attribute schließen sich gegenseitig aus.</p>
+    <p>Die <att>target</att> und <att>cRef</att>-Attribute schließen sich gegenseitig aus.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</ref>
@@ -15813,7 +15820,9 @@ epistemology, methodology and history of
   </listRef>
 </elementSpec><elementSpec module="core" ident="citedRange">
   <gloss versionDate="2012-12-13" xml:lang="en">cited range</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">引用範囲</gloss>
   <desc versionDate="2012-12-13" xml:lang="en">defines the range of cited content, often represented by pages or other units</desc>
+  <desc versionDate="2024-02-28" xml:lang="ja">しばしばページやその他の単位で表される、引用の範囲を定める。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing"/>
@@ -15842,7 +15851,9 @@ epistemology, methodology and history of
       an identical value. When no clear endpoint is provided, the <att>from</att> attribute may be
       used without <att>to</att>; for example a citation such as <q>p. 3ff</q> might be encoded
       <code>&lt;citedRange from="3"&gt;p. 3ff&lt;/citedRange&gt;</code>.</p>
-  </remarks> <listRef>
+  </remarks>
+  <remarks versionDate="2024-02-28" xml:lang="ja"><p>1頁だけ引用された時は、同一の値を伴う<att>from</att>と<att>to</att>の属性を用いる。引用の終わりが与えられていない場合は、<att>from</att>属性は、<att>to</att>なしで用いることが許されている。例えば、<q>p. 3ff</q>のような引用は<code>&lt;citedRange from="3"&gt;p. 3ff&lt;/citedRange&gt;</code>と符号化されうる。</p></remarks>
+  <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOB">3.12.2.5. Scopes and Ranges in Bibliographic Citations</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="pubPlace">
@@ -16265,42 +16276,31 @@ epistemology, methodology and history of
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="relatedItem" module="core">
-  <desc versionDate="2007-03-19" xml:lang="en">contains or references some other bibliographic item which is related to the present one in
-    some specified manner, for example as a constituent or alternative version of it.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko">구성물이나 대체 버전과 같이 현 항목과 특정 방식으로 관련된 다른 서지 항목을 명시적 방식에 따라
-    포함하거나 지시한다.</desc>
+  <desc versionDate="2007-03-19" xml:lang="en">contains or references some other bibliographic item which is related to the present one in some specified manner, for example as a constituent or alternative version of it.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko">구성물이나 대체 버전과 같이 현 항목과 특정 방식으로 관련된 다른 서지 항목을 명시적 방식에 따라 포함하거나 지시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含或參照到其他書目項目，該些項目與目前的書目項目在某種程度上相關，例如作為其組成或者替代項目。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">当該内容と関連する書誌情報項目を示す、または参照する。例えば、構成要 素または他の版など。</desc>
-  <desc versionDate="2009-01-06" xml:lang="fr">contient ou référe à un autre élément bibliographique
-    ayant une relation quelconque avec l'objet décrit, par exemple comme faisant partie d'une version alternative de celui-ci, ou bien en étant une version alternative.</desc>
-  <desc versionDate="2007-11-06" xml:lang="it">contiene o si riferisce ad altra entità bibliografica
-    legata alla presente tramite una relazione specificata quale, per esempio, versione costitutiva
-    o alternativa</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene o refiere algún otro elemento bibliográfico que
-    se relaciona con el actual de alguna manera, por ejemplo como un versión complementaria o
-    alternativa de este.</desc>
-  <desc versionDate="2017-06-13" xml:lang="de">enthält oder verweist auf ein anderes bibliografisches Objekt, welches zu dem aktuellen in einer
-    bestimmten Beziehung steht, z. B. als Bestandteil oder Alternativfassung.</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient ou référe à un autre élément bibliographique ayant une relation quelconque avec l'objet décrit, par exemple comme faisant partie d'une version alternative de celui-ci, ou bien en étant une version alternative.</desc>
+  <desc versionDate="2007-11-06" xml:lang="it">contiene o si riferisce ad altra entità bibliografica legata alla presente tramite una relazione specificata quale, per esempio, versione costitutiva o alternativa</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene o refiere algún otro elemento bibliográfico que se relaciona con el actual de alguna manera, por ejemplo como un versión complementaria o alternativa de este.</desc>
+  <desc versionDate="2017-06-13" xml:lang="de">enthält oder verweist auf ein anderes bibliografisches Objekt, welches zu dem aktuellen in einer bestimmten Beziehung steht, z. B. als Bestandteil oder Alternativfassung.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.biblPart"/>
     <memberOf key="att.typed"/>
   </classes>
   <content>
-    
-      <alternate minOccurs="0">
-        <classRef key="model.biblLike"/>
-        <classRef key="model.ptrLike"/>
-      </alternate>
-    
+    <alternate minOccurs="0">
+      <classRef key="model.biblLike"/>
+      <classRef key="model.ptrLike"/>
+    </alternate>
   </content>
   <constraintSpec ident="targetorcontent1" scheme="schematron">
     <constraint>
-      <sch:report test="@target and count( child::* ) &gt; 0">
-If the @target attribute on <sch:name/> is used, the
-relatedItem element must be empty</sch:report>
-      <sch:assert test="@target or child::*">A relatedItem element should have either a 'target' attribute
-        or a child element to indicate the related bibliographic item</sch:assert>
+      <sch:rule context="tei:relatedItem">
+        <sch:report test="@target and count( child::* ) &gt; 0">If the @target attribute on <sch:name/> is used, the relatedItem element must be empty</sch:report>
+        <sch:assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -16392,9 +16392,9 @@ relatedItem element must be empty</sch:report>
   </content>
   <constraintSpec ident="abstractModel-structure-l-in-l" scheme="schematron">
     <constraint>
-      <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
-        Abstract model violation: Lines may not contain lines or lg elements.
-      </sch:report>
+      <sch:rule context="tei:l">
+        <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="und">
@@ -16426,17 +16426,13 @@ relatedItem element must be empty</sch:report>
   <gloss versionDate="2007-05-04" xml:lang="es">grupo de versos</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">un gruppo di versi</gloss>
   <gloss versionDate="2017-06-13" xml:lang="de">Gruppe von Vers(zeil)en</gloss>
-  <desc versionDate="2012-04-17" xml:lang="en">contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain,
-        verse paragraph, etc.</desc>
+  <desc versionDate="2012-04-17" xml:lang="en">contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain, verse paragraph, etc.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">예를 들어, 연, 후렴구, 운문 단락과 같이 형식적 단위로 기능하는 운문 행군을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含形式上視為一組的詩行，例如詩節、疊句、韻文段落等。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">形式単位としてある、ある韻文の行をまとまりを示す。例えば、連、リフレ イン、詩節など。</desc>
-  <desc versionDate="2009-01-06" xml:lang="fr">contient un groupe de vers fonctionnant comme une unité
-        formelle, par exemple une strophe, un refrain, un paragraphe en vers, etc.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene un grupo de versos que funcionan como una
-        unidad formal, p.ej. una estrofa, un refrán, un estribillo, etc.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene un gruppo di versi che costituiscono un'unità
-        formale, per esempio una stanza, un refrain, un paragrafo in versi, ecc.</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient un groupe de vers fonctionnant comme une unité formelle, par exemple une strophe, un refrain, un paragraphe en vers, etc.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene un grupo de versos que funcionan como una unidad formal, p.ej. una estrofa, un refrán, un estribillo, etc.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene un gruppo di versi che costituiscono un'unità formale, per esempio una stanza, un refrain, un paragrafo in versi, ecc.</desc>
   <desc versionDate="2017-06-13" xml:lang="de">enthält eine oder mehrere Verse bzw. Verszeilen, die zusammen eine formale Einheit (z. B. Strophe, Refrain) bilden.</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -16475,15 +16471,16 @@ relatedItem element must be empty</sch:report>
   </content>
   <constraintSpec scheme="schematron" ident="atleast1oflggapl">
     <constraint>
-      <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
-        must contain at least one child l, lg, or gap element.</sch:assert>
+      <sch:rule context="tei:lg">
+        <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="abstractModel-structure-lg-in-l" scheme="schematron">
     <constraint>
-      <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
-        Abstract model violation: Lines may not contain line groups.
-      </sch:report>
+      <sch:rule context="tei:lg">
+        <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -16544,12 +16541,10 @@ relatedItem element must be empty</sch:report>
     </egXML>
   </exemplum>
   <remarks versionDate="2005-01-14" xml:lang="en">
-    <p rend="dataDesc">contains verse lines or nested line groups only, possibly prefixed by a
-            heading.</p>
+    <p rend="dataDesc">contains verse lines or nested line groups only, possibly prefixed by a heading.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
-    <p rend="dataDesc">ne contient que des vers ou des groupes de vers enchâssés,
-            éventuellement précédés d'un titre.</p>
+    <p rend="dataDesc">ne contient que des vers ou des groupes de vers enchâssés, éventuellement précédés d'un titre.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p rend="dataDesc"> 韻文の行または(普通は見出しが付く)入れ子化された行グループのみを示 す。 </p>
@@ -19892,6 +19887,7 @@ during the encoding of a text.</desc>
   <gloss versionDate="2006-10-18" xml:lang="de">Korrekturverfahren</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">principios de corrección</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">principi di correzione</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">修正の原則</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">states how and under what circumstances corrections have been made in the text.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">établit comment et dans quelles circonstances des
     corrections ont été apportées au texte.</desc>
@@ -20185,31 +20181,28 @@ during the encoding of a text.</desc>
   <gloss xml:lang="en" versionDate="2007-06-12">quotation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">citation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">specifies editorial practice adopted with respect to quotation marks in the original.</desc>
-  <desc versionDate="2009-01-05" xml:lang="fr">décrit la pratique éditoriale adoptée par rapport aux
-    guillements dans l’original.</desc>
+  <desc versionDate="2009-01-05" xml:lang="fr">décrit la pratique éditoriale adoptée par rapport aux guillements dans l’original.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원본 인용 부호에 관해 채택한 편집 방식을 명시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">說明在編輯上是如何處理來源文件中的引文符號。</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">元資料にあった引用をどのように編集したのかを示す。</desc>
-  <desc versionDate="2006-10-18" xml:lang="de">beschreibt die editorische Praxis bezüglich der
-    Anführungszeichen im Originaltext.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">indica las prácticas editoriales adoptadas respecto al
-    entrecomillado en el original.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">specifica le pratiche editoriali rispetto all'uso delle
-    virgolette nell'originale</desc>
+  <desc versionDate="2006-10-18" xml:lang="de">beschreibt die editorische Praxis bezüglich der Anführungszeichen im Originaltext.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">indica las prácticas editoriales adoptadas respecto al entrecomillado en el original.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">specifica le pratiche editoriali rispetto all'uso delle virgolette nell'originale</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.declarable"/>
     <memberOf key="model.editorialDeclPart"/>
   </classes>
   <content>
-    
-      <classRef key="model.pLike" minOccurs="0" maxOccurs="unbounded"/>
-    
+    <classRef key="model.pLike" minOccurs="0" maxOccurs="unbounded"/>
   </content>
   <constraintSpec ident="quotationContents" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="not(@marks) and not (tei:p)">
-On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
+      <sch:rule context="tei:quotation">
+        <sch:report test="not( @marks )  and  not( tei:p )">
+          On <sch:name/>, either the @marks attribute should be used, or a paragraph of description provided
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -20262,8 +20255,6 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
         </valItem>
       </valList>
     </attDef>
-
-    
   </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
@@ -21155,7 +21146,7 @@ the target element</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54">2.3.6. The Reference System Declaration</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="citeStructure">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="citeStructure">
   <gloss versionDate="2020-02-03" xml:lang="en">citation structure</gloss>
   <desc versionDate="2020-02-03" xml:lang="en">declares a structure and method for citing the current document.</desc>
   <classes>
@@ -21192,16 +21183,16 @@ the target element</desc>
       </datatype>
       <constraintSpec ident="citestructure-outer-match" scheme="schematron">
         <constraint>
-          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:citeStructure[not(parent::tei:citeStructure)]">
-            <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
-          </rule>
+          <sch:rule context="tei:citeStructure[not(parent::tei:citeStructure)]">
+            <sch:assert test="starts-with(@match,'/')">An XPath in @match on the outer <sch:name/> must start with '/'.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
       <constraintSpec ident="citestructure-inner-match" scheme="schematron">
         <constraint>
-          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:citeStructure[parent::tei:citeStructure]">
-            <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
-          </rule>
+          <sch:rule context="tei:citeStructure[parent::tei:citeStructure]">
+            <sch:assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <sch:name/>.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </attDef>
@@ -21529,7 +21520,8 @@ the target element</desc>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration de classification</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">분류 선언</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">分類宣告</gloss>
-    <gloss versionDate="2016-11-17" xml:lang="de">Angabe zur Klassifikation</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">分類法宣言</gloss>
+  <gloss versionDate="2016-11-17" xml:lang="de">Angabe zur Klassifikation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">declaraciones de clasificación</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">dichiarazioni sulla ckassificazione</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains one or more taxonomies defining any classificatory
@@ -21537,8 +21529,8 @@ codes used elsewhere in the text.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">contient une ou plusieurs taxinomies définissant les codes de classification utilisés n’importe où dans le texte.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트 내 어디서든 사용될 수 있는 분류 부호를 정의하는 분류법을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一個或多個分類法，用來定義在文件中他處所使用之任何分類碼。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">当該テキスト中で使用されている分類コードを定義する、ひとつ以上の分類
-  法を示す。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">当該テキスト中で使用されている分類コードを定義する、
+    ひとつ以上の分類法を示す。</desc>
     <desc versionDate="2016-11-17" xml:lang="de">enthält eine oder mehrere Taxonomien, die im Text verwendete Klassifikationscodes definieren.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una o más taxonomías que definen cualquier código usado en algún punto del texto.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una o più tassonomie che definiscono un qualsiasi codice classificatorio usato in un'altra porzione del testo.</desc>
@@ -23308,6 +23300,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
   <gloss versionDate="2008-04-06" xml:lang="es">código de clasificación</gloss>
   <gloss versionDate="2016-11-24" xml:lang="de">Klassifikationscode</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">codice di clasificazione</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">分類コード</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the classification code used for this text in some standard classification system.</desc>
   <desc versionDate="2009-04-22" xml:lang="fr">contient le code de classification attribué à ce texte en
     référence à un système standard de classification.</desc>
@@ -23334,7 +23327,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
         taxinomie utilisée.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">사용하고 있는 분류 체계 또는 분류법을 표시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">說明使用中的分類系統或分類法。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該分類法を定義する。</desc>
+      <desc versionDate="2024-02-28" xml:lang="ja">用いられている分類体系を定義する<gi>taxonomy</gi>要素や他の資料などを指す。</desc>
         <desc versionDate="2016-11-24" xml:lang="de">benennt das verwendete Klassifikationssystem, definiert z. B. durch Verweis auf ein 
             <gi>taxonomy</gi>-Element oder eine andere Ressource</desc>
       <desc versionDate="2007-05-04" xml:lang="es">identifica el sistema de clasificación o taxonomía en
@@ -23795,19 +23788,19 @@ should be supplied for the <att>scheme</att> attribute.</p>
         </valItem>
         <valItem ident="transmitted">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</desc>
-        <desc versionDate="2022-06-02" xml:lang="ja">メッセージの転送に関する情報。発送者と次の受信者、転送等。
+          <desc versionDate="2024-03-07" xml:lang="ja">メッセージの伝達手段に関する情報。発信とその後の受信・転送等の間の情報。
 	    </desc>
 	      </valItem>
         <valItem ident="redirected">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  redirection of an unread message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">未読なままに転送されるメッセージに関する情報。
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封せずに〕未読のままに転送されるメッセージに関する情報。
 	    </desc>
         </valItem>
         <valItem ident="forwarded">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  forwarding of a message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの転送に関する情報。
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封後の〕メッセージの転送に関する情報。
 	    </desc>
         </valItem>
       </valList>
@@ -25259,13 +25252,10 @@ during the evolution of the encoded representation of that text.</p>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트의 전면부, 본문, 후면부의 하위 구역을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">文本的正文前資訊、正文、及正文後資訊的分段。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">前付、本文、後付中のテキスト部分を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">contient une subdivision dans le texte préliminaire, dans le
-  corps d’un texte ou dans le texte postliminaire.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">contient une subdivision dans le texte préliminaire, dans le corps d’un texte ou dans le texte postliminaire.</desc>
   <desc versionDate="2017-06-13" xml:lang="de">enthält einen Unterabschnitt in Vorspann (front), Textkörper oder Nachspann (back) eines Textes.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene una subdivisión del paratexto inicial, del
-  cuerpo del texto o del paratexto final.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene una suddivisione del peritesto iniziale, del
-  corpo del testo, o del peritesto finale</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene una subdivisión del paratexto inicial, del cuerpo del texto o del paratexto final.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene una suddivisione del peritesto iniziale, del corpo del testo, o del peritesto finale</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.divLike"/>
@@ -25316,16 +25306,20 @@ during the evolution of the encoded representation of that text.</p>
   </content>
   <constraintSpec ident="abstractModel-structure-div-in-l-or-lg" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:div">
+        <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="abstractModel-structure-div-in-ab-or-p" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:div">
+        <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -26906,7 +26900,7 @@ Tubes formed by Lightning — House struck</p>
   <desc versionDate="2007-12-20" xml:lang="ko">구역의 마지막, 특히 편지의 종료부에 발문으로 나타나는 인사말, 날짜 표시란, 그리고 유사 구를 합하여
     모아 놓는다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集日期地點、署名、稱呼語、及其他在區段結尾出現的類似措辭，尤指信件結尾。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">挨拶文言、日付欄など、ある区分の終わり、特に手紙の終わりにある一連の 文言をまとめる。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">挨拶文言、日付欄など、ある区分の終わり、特に手紙の終わりにある一連の文言をまとめる。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">regroupe une formule de politesse, une indication d'une
     date et d'autres expressions semblables figurant comme expression à la fin d’une division, en
     particulier à la fin d’une lettre.</desc>
@@ -28659,7 +28653,9 @@ reserved for the element likely to be used more often.</p>
   <content><empty/></content>
   <constraintSpec ident="linkTargets3" scheme="schematron">
     <constraint>
-      <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/></sch:assert>
+      <sch:rule context="tei:link">
+        <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/></sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -28830,9 +28826,11 @@ reserved for the element likely to be used more often.</p>
   </content>
   <constraintSpec ident="abstractModel-structure-ab-in-l-or-lg" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:ab">
+        <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -29308,7 +29306,7 @@ reserved for the element likely to be used more often.</p>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="join">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="join">
   <gloss xml:lang="en" versionDate="2009-10-06">join</gloss>
   <gloss versionDate="2009-10-06" xml:lang="fr">jointure</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it.</desc>
@@ -29324,19 +29322,19 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
   </classes>
-  <content>
-    
-      <alternate minOccurs="0" maxOccurs="unbounded">
-        <classRef key="model.descLike"/>
-        <classRef key="model.certLike"/>
-      </alternate>
-    
+  <content>    
+    <alternate minOccurs="0" maxOccurs="unbounded">
+      <classRef key="model.descLike"/>
+      <classRef key="model.certLike"/>
+    </alternate>
   </content>
   <constraintSpec ident="joinTargets3" scheme="schematron">
     <constraint>
-      <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="contains(@target,' ')">
-You must supply at least two values for @target on <name/>
-         </assert>
+      <sch:rule context="tei:join">
+        <sch:assert test="contains( normalize-space( @target ),' ')">
+          You must supply at least two values for @target on <sch:name/>
+        </sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -29869,12 +29867,8 @@ You must supply at least two values for @target on <name/>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="standOff" mode="add" module="linking">
-  <desc xml:lang="en" versionDate="2018-10-31">Functions as a
-  container element for linked data, contextual information, and
-  stand-off annotations embedded in a TEI document.</desc>
-	  <desc xml:lang="ja" versionDate="2023-07-29">
-		  リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。
-		  </desc>
+  <desc xml:lang="en" versionDate="2018-10-31">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</desc>
+  <desc xml:lang="ja" versionDate="2023-07-29">リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。 </desc>
   <classes>
     <memberOf key="model.resource"/>
     <memberOf key="att.global"/>
@@ -29886,9 +29880,11 @@ You must supply at least two values for @target on <name/>
   </content>
   <constraintSpec ident="nested_standOff_should_be_typed" scheme="schematron" mode="add">
     <constraint>
-      <sch:assert test="@type or not(ancestor::tei:standOff)">This
-      <sch:name/> element must have a @type attribute, since it is
-      nested inside a <sch:name/></sch:assert>
+      <sch:rule context="tei:standOff">
+        <sch:assert test="@type or not(ancestor::tei:standOff)">This
+        <sch:name/> element must have a @type attribute, since it is
+        nested inside a <sch:name/></sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en" versionDate="2019-12-25">
@@ -29954,43 +29950,43 @@ You must supply at least two values for @target on <name/>
     information which is referred to from the main text.</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en" source="#MLK01" valid="feasible">
       <TEI>
-	<teiHeader> <!-- ... --> </teiHeader>
-	<standOff>
-	  <listPlace>
-	    <place xml:id="LATL">
-	      <placeName>Atlanta</placeName>
-	      <location>
-		<region key="US-GA">Georgia</region>
-		<country key="USA">United States of America</country>
-		<geo>33.755 -84.39</geo>
-	      </location>
-	      <population when="1963" type="interpolatedCensus" quantity="489359" source="https://www.biggestuscities.com/city/atlanta-georgia"/>
-	    </place>
-	    <place xml:id="LBHM">
-	      <placeName>Birmingham</placeName>
-	      <location>
-		<region key="US-AL">Alabama</region>
-		<country key="USA">United States of America</country>
-		<geo>33.653333 -86.808889</geo>
-	      </location>
-	      <population when="1963" type="interpolatedCensus" quantity="332891" source="https://www.biggestuscities.com/city/birmingham-alabama"/>
-	    </place>
-	  </listPlace>
-	</standOff>
-	<text>
-	  <body>
-	    <!-- ... -->
-	    <p>Moreover, I am <choice><sic>congnizant</sic><corr>cognizant</corr></choice> of the interrelatedness of all communities and
-	    <lb/>states.  I cannot sit idly by in <placeName ref="#LATL">Atlanta</placeName> and not be concerned about what happens
-	    <lb/>in <placeName ref="#LBHM">Birmingham</placeName>.  <seg xml:id="FQ17">Injustice anywhere is a threat to justice everywhere.</seg>  We
-	    <lb/>are caught in an inescapable network of mutuality, tied in a single garment
-	    <lb/>of destiny.  Whatever affects one directly affects all indirectly. Never
-	    <lb/>again can we afford to live with the narrow, provincial <soCalled rendition="#Rqms">outside agitator</soCalled>
-	    <lb/>idea.  Anyone who lives inside the United States can never be considered
-	    <lb/>an outsider anywhere in this country.</p>
-	    <!-- ... -->
-	  </body>
-	</text>
+        <teiHeader> <!-- ... --> </teiHeader>
+        <standOff>
+          <listPlace>
+            <place xml:id="LATL">
+              <placeName>Atlanta</placeName>
+              <location>
+                <region key="US-GA">Georgia</region>
+                <country key="USA">United States of America</country>
+                <geo>33.755 -84.39</geo>
+              </location>
+              <population when="1963" type="interpolatedCensus" quantity="489359" source="https://www.biggestuscities.com/city/atlanta-georgia"/>
+            </place>
+            <place xml:id="LBHM">
+              <placeName>Birmingham</placeName>
+              <location>
+                <region key="US-AL">Alabama</region>
+                <country key="USA">United States of America</country>
+                <geo>33.653333 -86.808889</geo>
+              </location>
+              <population when="1963" type="interpolatedCensus" quantity="332891" source="https://www.biggestuscities.com/city/birmingham-alabama"/>
+            </place>
+          </listPlace>
+        </standOff>
+        <text>
+          <body>
+            <!-- ... -->
+            <p>Moreover, I am <choice><sic>congnizant</sic><corr>cognizant</corr></choice> of the interrelatedness of all communities and
+            <lb/>states.  I cannot sit idly by in <placeName ref="#LATL">Atlanta</placeName> and not be concerned about what happens
+            <lb/>in <placeName ref="#LBHM">Birmingham</placeName>.  <seg xml:id="FQ17">Injustice anywhere is a threat to justice everywhere.</seg>  We
+            <lb/>are caught in an inescapable network of mutuality, tied in a single garment
+            <lb/>of destiny.  Whatever affects one directly affects all indirectly. Never
+            <lb/>again can we afford to live with the narrow, provincial <soCalled rendition="#Rqms">outside agitator</soCalled>
+            <lb/>idea.  Anyone who lives inside the United States can never be considered
+            <lb/>an outsider anywhere in this country.</p>
+            <!-- ... -->
+          </body>
+        </text>
       </TEI>
     </egXML>
   </exemplum>
@@ -32142,7 +32138,7 @@ Out the window the body of a dead man suddenly slams into frame
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DR.html#DROTH">7.3. Other Types of Performance Text</ref>
   </listRef>
 </elementSpec><elementSpec module="drama" ident="caption">
-  <gloss xml:lang="en" versionDate="2007-06-12">caption</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">caption</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">sous-titre</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the text of a caption or other text displayed as part of
 a film script or screenplay.</desc>
@@ -32205,10 +32201,10 @@ laughing affectedly and drinking champagne.</view>
   <remarks versionDate="2005-01-14" xml:lang="en">
     <p>A specialized form of stage direction.</p>
   </remarks>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
+  <remarks versionDate="2007-06-12" xml:lang="fr">
     <p>Forme particulière d'indication scénique.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p>ト書きの特別な形。</p>
   </remarks>
   <listRef>
diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index 129dc8c9e..5743e7c62 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -232,7 +232,10 @@
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml"
                      xmlns:rng="http://relaxng.org/ns/structure/1.0">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml"
                      xmlns:rng="http://relaxng.org/ns/structure/1.0">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
-            <data type="double"/>
+            <data type="double">
+               <param name="minInclusive">0</param>
+               <param name="maxInclusive">1</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -675,7 +678,10 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
          <attribute name="cert">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(certainty) signifies the degree of certainty associated with the intervention or interpretation.</a:documentation>
             <choice>
-               <data type="double"/>
+               <data type="double">
+                  <param name="minInclusive">0</param>
+                  <param name="maxInclusive">1</param>
+               </data>
                <choice>
                   <value>high</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
@@ -3539,25 +3545,25 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
-            <rule context="tei:p">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
-        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
-      </sch:report>
-            </rule>
+                  id="tavq-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:p">
+               <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
+          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
-            <rule context="tei:p">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="tavq-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:p">
+               <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
@@ -3755,7 +3761,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <ref name="macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
+                  id="tavq-desc-deprecationInfo-only-in-deprecated-constraint-rule-13">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:desc[ @type eq 'deprecationInfo']">
@@ -3852,13 +3858,12 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-rt-target-rt-target-not-span-constraint-report-8">
-            <rule context="tei:rt/@target">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="../@from | ../@to">When target= is
-            present, neither from= nor to= should be.</sch:report>
-            </rule>
+                  id="tavq-rt-target-rt-target-not-span-constraint-rule-14">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:rt/@target">
+               <sch:report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</sch:report>
+            </sch:rule>
          </pattern>
          <optional>
             <attribute name="from">
@@ -3870,13 +3875,12 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-rt-from-rt-from-constraint-assert-7">
-            <rule context="tei:rt/@from">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="../@to">When from= is present, the to=
-            attribute of <sch:name/> is required.</sch:assert>
-            </rule>
+                  id="tavq-rt-from-rt-from-constraint-rule-15">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:rt/@from">
+               <sch:assert test="../@to">When from= is present, the to= attribute of <sch:name/> is required.</sch:assert>
+            </sch:rule>
          </pattern>
          <optional>
             <attribute name="to">
@@ -3888,13 +3892,12 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-rt-to-rt-to-constraint-assert-8">
-            <rule context="tei:rt/@to">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="../@from">When to= is present, the from=
-            attribute of <sch:name/> is required.</sch:assert>
-            </rule>
+                  id="tavq-rt-to-rt-to-constraint-rule-16">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:rt/@to">
+               <sch:assert test="../@from">When to= is present, the from= attribute of <sch:name/> is required.</sch:assert>
+            </sch:rule>
          </pattern>
          <empty/>
       </element>
@@ -4116,7 +4119,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-name-calendar-calendar-check-name-constraint-rule-12">
+                  id="tavq-name-calendar-calendar-check-name-constraint-rule-17">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4360,11 +4363,12 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-ptr-ptrAtts-constraint-report-9">
-            <rule context="tei:ptr">
-               <report test="@target and @cRef">Only one of the
-attributes @target and @cRef may be supplied on <name/>.</report>
-            </rule>
+                  id="tavq-ptr-ptrAtts-constraint-rule-18">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:ptr">
+               <sch:report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <sch:name/>.</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.cReferencing.attributes"/>
          <ref name="att.declaring.attributes"/>
@@ -4381,12 +4385,13 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-ref-refAtts-constraint-report-10">
-            <rule context="tei:ref">
-               <report test="@target and @cRef">Only one of the
-	attributes @target' and @cRef' may be supplied on <name/>
-               </report>
-            </rule>
+                  id="tavq-ref-refAtts-constraint-rule-19">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:ref">
+               <sch:report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <sch:name/>
+               </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.cReferencing.attributes"/>
          <ref name="att.declaring.attributes"/>
@@ -4445,7 +4450,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-list-gloss-list-must-have-labels-constraint-rule-13">
+                  id="tavq-list-gloss-list-must-have-labels-constraint-rule-20">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:list[@type='gloss']">
@@ -4878,7 +4883,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-author-calendar-calendar-check-author-constraint-rule-14">
+                  id="tavq-author-calendar-calendar-check-author-constraint-rule-21">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4911,7 +4916,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-editor-calendar-calendar-check-editor-constraint-rule-15">
+                  id="tavq-editor-calendar-calendar-check-editor-constraint-rule-22">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4975,7 +4980,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-resp-calendar-calendar-check-resp-constraint-rule-16">
+                  id="tavq-resp-calendar-calendar-check-resp-constraint-rule-23">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5018,7 +5023,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-title-calendar-calendar-check-title-constraint-rule-17">
+                  id="tavq-title-calendar-calendar-check-title-constraint-rule-24">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5068,7 +5073,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-meeting-calendar-calendar-check-meeting-constraint-rule-18">
+                  id="tavq-meeting-calendar-calendar-check-meeting-constraint-rule-25">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5242,18 +5247,13 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-relatedItem-targetorcontent1-constraint-report-11">
-            <rule context="tei:relatedItem">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="@target and count( child::* ) &gt; 0">
-If the @target attribute on <sch:name/> is used, the
-relatedItem element must be empty</sch:report>
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="@target or child::*">A relatedItem element should have either a 'target' attribute
-        or a child element to indicate the related bibliographic item</sch:assert>
-            </rule>
+                  id="tavq-relatedItem-targetorcontent1-constraint-rule-26">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:relatedItem">
+               <sch:report test="@target and count( child::* ) &gt; 0">If the @target attribute on <sch:name/> is used, the relatedItem element must be empty</sch:report>
+               <sch:assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</sch:assert>
+            </sch:rule>
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attributes"/>
@@ -5282,14 +5282,12 @@ relatedItem element must be empty</sch:report>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-l-abstractModel-structure-l-in-l-constraint-report-12">
-            <rule context="tei:l">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
-        Abstract model violation: Lines may not contain lines or lg elements.
-      </sch:report>
-            </rule>
+                  id="tavq-l-abstractModel-structure-l-in-l-constraint-rule-27">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:l">
+               <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.fragmentable.attributes"/>
@@ -5332,24 +5330,21 @@ relatedItem element must be empty</sch:report>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-lg-atleast1oflggapl-constraint-assert-17">
-            <rule context="tei:lg">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
-        must contain at least one child l, lg, or gap element.</sch:assert>
-            </rule>
+                  id="tavq-lg-atleast1oflggapl-constraint-rule-28">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:lg">
+               <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</sch:assert>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-lg-abstractModel-structure-lg-in-l-constraint-report-13">
-            <rule context="tei:lg">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
-        Abstract model violation: Lines may not contain line groups.
-      </sch:report>
-            </rule>
+                  id="tavq-lg-abstractModel-structure-lg-in-l-constraint-rule-29">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:lg">
+               <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.divLike.attributes"/>
@@ -5636,7 +5631,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-sponsor-calendar-calendar-check-sponsor-constraint-rule-19">
+                  id="tavq-sponsor-calendar-calendar-check-sponsor-constraint-rule-30">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5670,7 +5665,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-funder-calendar-calendar-check-funder-constraint-rule-20">
+                  id="tavq-funder-calendar-calendar-check-funder-constraint-rule-31">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5704,7 +5699,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-principal-calendar-calendar-check-principal-constraint-rule-21">
+                  id="tavq-principal-calendar-calendar-check-principal-constraint-rule-32">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5845,7 +5840,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-idno-calendar-calendar-check-idno-constraint-rule-22">
+                  id="tavq-idno-calendar-calendar-check-idno-constraint-rule-33">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5906,7 +5901,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-licence-calendar-calendar-check-licence-constraint-rule-23">
+                  id="tavq-licence-calendar-calendar-check-licence-constraint-rule-34">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6157,13 +6152,15 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-quotation-quotationContents-constraint-report-14">
-            <rule context="tei:quotation">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       xmlns:xi="http://www.w3.org/2001/XInclude"
-                       test="not(@marks) and not (tei:p)">
-On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
-            </rule>
+                  id="tavq-quotation-quotationContents-constraint-rule-35">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:quotation">
+               <sch:report test="not( @marks )  and  not( tei:p )">
+          On <sch:name/>, either the @marks attribute should be used, or a paragraph of description provided
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.declarable.attributes"/>
@@ -6440,19 +6437,23 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-citeStructure-match-citestructure-outer-match-constraint-rule-24">
-            <rule xmlns:xi="http://www.w3.org/2001/XInclude"
-                  context="tei:citeStructure[not(parent::tei:citeStructure)]">
-               <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
-            </rule>
+                  id="tavq-citeStructure-match-citestructure-outer-match-constraint-rule-36">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:citeStructure[not(parent::tei:citeStructure)]">
+               <sch:assert test="starts-with(@match,'/')">An XPath in @match on the outer <sch:name/> must start with '/'.</sch:assert>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-citeStructure-match-citestructure-inner-match-constraint-rule-25">
-            <rule xmlns:xi="http://www.w3.org/2001/XInclude"
-                  context="tei:citeStructure[parent::tei:citeStructure]">
-               <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
-            </rule>
+                  id="tavq-citeStructure-match-citestructure-inner-match-constraint-rule-37">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:citeStructure[parent::tei:citeStructure]">
+               <sch:assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <sch:name/>.</sch:assert>
+            </sch:rule>
          </pattern>
          <optional>
             <attribute name="unit">
@@ -6695,7 +6696,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-26">
+                  id="tavq-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6743,7 +6744,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-unitDef-calendar-calendar-check-unitDef-constraint-rule-27">
+                  id="tavq-unitDef-calendar-calendar-check-unitDef-constraint-rule-39">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6778,7 +6779,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-conversion-calendar-calendar-check-conversion-constraint-rule-28">
+                  id="tavq-conversion-calendar-calendar-check-conversion-constraint-rule-40">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6848,7 +6849,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-application-calendar-calendar-check-application-constraint-rule-29">
+                  id="tavq-application-calendar-calendar-check-application-constraint-rule-41">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6921,7 +6922,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-creation-calendar-calendar-check-creation-constraint-rule-30">
+                  id="tavq-creation-calendar-calendar-check-creation-constraint-rule-42">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7190,7 +7191,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-change-calendar-calendar-check-change-constraint-rule-31">
+                  id="tavq-change-calendar-calendar-check-change-constraint-rule-43">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7561,25 +7562,25 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15">
-            <rule context="tei:div">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="tavq-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:div">
+               <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16">
-            <rule context="tei:div">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="tavq-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:div">
+               <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.divLike.attributes"/>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 1dae51b5c..1c703dc4b 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -207,7 +207,7 @@
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e51019-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e51144-constraint">
          <rule context="tei:ab">
             <report test="descendant::*[not(namespace-uri(.) =               ('http://www.loc.gov/mods/v3', 'http://www.tei-c.org/ns/1.0'))]">ab descendants must be in the
               namespaces
@@ -319,7 +319,7 @@
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e51030-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e51155-constraint">
          <rule context="tei:ab">
             <report test="descendant::*[not(namespace-uri(.) =               ('http://www.w3.org/2000/svg', 'http://www.tei-c.org/ns/1.0'))]">ab descendants must be in the
               namespaces
@@ -548,7 +548,10 @@
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by <code xmlns="http://www.w3.org/1999/xhtml"
                      xmlns:rng="http://relaxng.org/ns/structure/1.0">@min</code> and <code xmlns="http://www.w3.org/1999/xhtml"
                      xmlns:rng="http://relaxng.org/ns/structure/1.0">@max</code>, or the proportion of observed values that fall within that range.</a:documentation>
-            <data type="double"/>
+            <data type="double">
+               <param name="minInclusive">0</param>
+               <param name="maxInclusive">1</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -991,7 +994,10 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
          <attribute name="cert">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(certainty) signifies the degree of certainty associated with the intervention or interpretation.</a:documentation>
             <choice>
-               <data type="double"/>
+               <data type="double">
+                  <param name="minInclusive">0</param>
+                  <param name="maxInclusive">1</param>
+               </data>
                <choice>
                   <value>high</value>
                   <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
@@ -4284,25 +4290,25 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
-            <rule context="tei:p">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
-        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
-      </sch:report>
-            </rule>
+                  id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:p">
+               <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
+          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
-            <rule context="tei:p">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:p">
+               <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
@@ -4500,7 +4506,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <ref name="t_macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
+                  id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-13">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:desc[ @type eq 'deprecationInfo']">
@@ -4596,13 +4602,12 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-rt-target-rt-target-not-span-constraint-report-8">
-            <rule context="tei:rt/@target">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="../@from | ../@to">When target= is
-            present, neither from= nor to= should be.</sch:report>
-            </rule>
+                  id="testPure1-rt-target-rt-target-not-span-constraint-rule-14">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:rt/@target">
+               <sch:report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</sch:report>
+            </sch:rule>
          </pattern>
          <optional>
             <attribute name="from">
@@ -4614,13 +4619,12 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-rt-from-rt-from-constraint-assert-7">
-            <rule context="tei:rt/@from">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="../@to">When from= is present, the to=
-            attribute of <sch:name/> is required.</sch:assert>
-            </rule>
+                  id="testPure1-rt-from-rt-from-constraint-rule-15">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:rt/@from">
+               <sch:assert test="../@to">When from= is present, the to= attribute of <sch:name/> is required.</sch:assert>
+            </sch:rule>
          </pattern>
          <optional>
             <attribute name="to">
@@ -4632,13 +4636,12 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-rt-to-rt-to-constraint-assert-8">
-            <rule context="tei:rt/@to">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="../@from">When to= is present, the from=
-            attribute of <sch:name/> is required.</sch:assert>
-            </rule>
+                  id="testPure1-rt-to-rt-to-constraint-rule-16">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:rt/@to">
+               <sch:assert test="../@from">When to= is present, the from= attribute of <sch:name/> is required.</sch:assert>
+            </sch:rule>
          </pattern>
          <empty/>
       </element>
@@ -4860,7 +4863,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-name-calendar-calendar-check-name-constraint-rule-12">
+                  id="testPure1-name-calendar-calendar-check-name-constraint-rule-17">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5141,11 +5144,12 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-ptr-ptrAtts-constraint-report-9">
-            <rule context="tei:ptr">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
-attributes @target and @cRef may be supplied on <name/>.</report>
-            </rule>
+                  id="testPure1-ptr-ptrAtts-constraint-rule-18">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:ptr">
+               <sch:report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <sch:name/>.</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.cReferencing.attributes"/>
          <ref name="t_att.declaring.attributes"/>
@@ -5162,12 +5166,13 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-ref-refAtts-constraint-report-10">
-            <rule context="tei:ref">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
-	attributes @target' and @cRef' may be supplied on <name/>
-               </report>
-            </rule>
+                  id="testPure1-ref-refAtts-constraint-rule-19">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:ref">
+               <sch:report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <sch:name/>
+               </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.cReferencing.attributes"/>
          <ref name="t_att.declaring.attributes"/>
@@ -5226,7 +5231,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-list-gloss-list-must-have-labels-constraint-rule-13">
+                  id="testPure1-list-gloss-list-must-have-labels-constraint-rule-20">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:list[@type='gloss']">
@@ -5526,7 +5531,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-author-calendar-calendar-check-author-constraint-rule-14">
+                  id="testPure1-author-calendar-calendar-check-author-constraint-rule-21">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5559,7 +5564,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-editor-calendar-calendar-check-editor-constraint-rule-15">
+                  id="testPure1-editor-calendar-calendar-check-editor-constraint-rule-22">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5623,7 +5628,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-resp-calendar-calendar-check-resp-constraint-rule-16">
+                  id="testPure1-resp-calendar-calendar-check-resp-constraint-rule-23">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5641,7 +5646,7 @@ Elements]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-title-calendar-check-title-constraint-rule-17">
+                  id="testPure1-title-calendar-check-title-constraint-rule-24">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5690,7 +5695,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-title-calendar-calendar-check-title-constraint-rule-18">
+                  id="testPure1-title-calendar-calendar-check-title-constraint-rule-25">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5740,7 +5745,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-meeting-calendar-calendar-check-meeting-constraint-rule-19">
+                  id="testPure1-meeting-calendar-calendar-check-meeting-constraint-rule-26">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5921,18 +5926,13 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-relatedItem-targetorcontent1-constraint-report-11">
-            <rule context="tei:relatedItem">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="@target and count( child::* ) &gt; 0">
-If the @target attribute on <sch:name/> is used, the
-relatedItem element must be empty</sch:report>
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="@target or child::*">A relatedItem element should have either a 'target' attribute
-        or a child element to indicate the related bibliographic item</sch:assert>
-            </rule>
+                  id="testPure1-relatedItem-targetorcontent1-constraint-rule-27">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:relatedItem">
+               <sch:report test="@target and count( child::* ) &gt; 0">If the @target attribute on <sch:name/> is used, the relatedItem element must be empty</sch:report>
+               <sch:assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</sch:assert>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
@@ -5961,14 +5961,12 @@ relatedItem element must be empty</sch:report>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-l-abstractModel-structure-l-in-l-constraint-report-12">
-            <rule context="tei:l">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
-        Abstract model violation: Lines may not contain lines or lg elements.
-      </sch:report>
-            </rule>
+                  id="testPure1-l-abstractModel-structure-l-in-l-constraint-rule-28">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:l">
+               <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.fragmentable.attributes"/>
@@ -6011,24 +6009,21 @@ relatedItem element must be empty</sch:report>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-lg-atleast1oflggapl-constraint-assert-18">
-            <rule context="tei:lg">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
-        must contain at least one child l, lg, or gap element.</sch:assert>
-            </rule>
+                  id="testPure1-lg-atleast1oflggapl-constraint-rule-29">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:lg">
+               <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</sch:assert>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-report-13">
-            <rule context="tei:lg">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
-        Abstract model violation: Lines may not contain line groups.
-      </sch:report>
-            </rule>
+                  id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-rule-30">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:lg">
+               <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.divLike.attributes"/>
@@ -6314,7 +6309,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-sponsor-calendar-calendar-check-sponsor-constraint-rule-20">
+                  id="testPure1-sponsor-calendar-calendar-check-sponsor-constraint-rule-31">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6348,7 +6343,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-funder-calendar-calendar-check-funder-constraint-rule-21">
+                  id="testPure1-funder-calendar-calendar-check-funder-constraint-rule-32">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6382,7 +6377,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-principal-calendar-calendar-check-principal-constraint-rule-22">
+                  id="testPure1-principal-calendar-calendar-check-principal-constraint-rule-33">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6522,7 +6517,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-idno-calendar-calendar-check-idno-constraint-rule-23">
+                  id="testPure1-idno-calendar-calendar-check-idno-constraint-rule-34">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6583,7 +6578,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-licence-calendar-calendar-check-licence-constraint-rule-24">
+                  id="testPure1-licence-calendar-calendar-check-licence-constraint-rule-35">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6974,13 +6969,15 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-quotation-quotationContents-constraint-report-14">
-            <rule context="tei:quotation">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       xmlns:xi="http://www.w3.org/2001/XInclude"
-                       test="not(@marks) and not (tei:p)">
-On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
-            </rule>
+                  id="testPure1-quotation-quotationContents-constraint-rule-36">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:quotation">
+               <sch:report test="not( @marks )  and  not( tei:p )">
+          On <sch:name/>, either the @marks attribute should be used, or a paragraph of description provided
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declarable.attributes"/>
@@ -7257,21 +7254,23 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-25">
-            <rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                  xmlns:xi="http://www.w3.org/2001/XInclude"
-                  context="tei:citeStructure[not(parent::tei:citeStructure)]">
-               <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
-            </rule>
+                  id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-37">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:citeStructure[not(parent::tei:citeStructure)]">
+               <sch:assert test="starts-with(@match,'/')">An XPath in @match on the outer <sch:name/> must start with '/'.</sch:assert>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-26">
-            <rule xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                  xmlns:xi="http://www.w3.org/2001/XInclude"
-                  context="tei:citeStructure[parent::tei:citeStructure]">
-               <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
-            </rule>
+                  id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-38">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:citeStructure[parent::tei:citeStructure]">
+               <sch:assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <sch:name/>.</sch:assert>
+            </sch:rule>
          </pattern>
          <optional>
             <attribute name="unit">
@@ -7514,7 +7513,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-27">
+                  id="testPure1-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7562,7 +7561,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-unitDef-calendar-calendar-check-unitDef-constraint-rule-28">
+                  id="testPure1-unitDef-calendar-calendar-check-unitDef-constraint-rule-40">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7597,7 +7596,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-conversion-calendar-calendar-check-conversion-constraint-rule-29">
+                  id="testPure1-conversion-calendar-calendar-check-conversion-constraint-rule-41">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7667,7 +7666,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-application-calendar-calendar-check-application-constraint-rule-30">
+                  id="testPure1-application-calendar-calendar-check-application-constraint-rule-42">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7740,7 +7739,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-creation-calendar-calendar-check-creation-constraint-rule-31">
+                  id="testPure1-creation-calendar-calendar-check-creation-constraint-rule-43">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -8008,7 +8007,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-change-calendar-calendar-check-change-constraint-rule-32">
+                  id="testPure1-change-calendar-calendar-check-change-constraint-rule-44">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -8171,11 +8170,12 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-s-noNestedS-constraint-report-15">
-            <rule context="tei:s">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="tei:s">You may not nest one s element within
-      another: use seg instead</report>
-            </rule>
+                  id="testPure1-s-noNestedS-constraint-rule-45">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:s">
+               <sch:report test="tei:s">You may not nest one s element within another: use seg instead</sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.segLike.attributes"/>
@@ -8351,45 +8351,47 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_macro.phraseSeq.limited"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-targetfrom-constraint-report-16">
-            <rule context="tei:span">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       xmlns:xi="http://www.w3.org/2001/XInclude"
-                       test="@from and @target">
-Only one of the attributes @target and @from may be supplied on <name/>
-               </report>
-            </rule>
+                  id="testPure1-span-target-from-constraint-rule-46">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:span">
+               <sch:report test="@from and @target">
+          Only one of the attributes @target and @from may be supplied on <sch:name/>
+               </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-targetto-constraint-report-17">
-            <rule context="tei:span">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       xmlns:xi="http://www.w3.org/2001/XInclude"
-                       test="@to and @target">
-Only one of the attributes @target and @to may be supplied on <name/>
-               </report>
-            </rule>
+                  id="testPure1-span-targetto-constraint-rule-47">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:span">
+               <sch:report test="@to and @target">
+          Only one of the attributes @target and @to may be supplied on <sch:name/>
+               </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-tonotfrom-constraint-report-18">
-            <rule context="tei:span">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       xmlns:xi="http://www.w3.org/2001/XInclude"
-                       test="@to and not(@from)">
-If @to is supplied on <name/>, @from must be supplied as well</report>
-            </rule>
+                  id="testPure1-span-tonotfrom-constraint-rule-48">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:span">
+               <sch:report test="@to and not(@from)">
+          If @to is supplied on <sch:name/>, @from must be supplied as well
+        </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-tofrom-constraint-report-19">
-            <rule context="tei:span">
-               <report xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                       xmlns:xi="http://www.w3.org/2001/XInclude"
-                       test="contains(normalize-space(@to),' ') or contains(normalize-space(@from),' ')">
-The attributes @to and @from on <name/> may each contain only a single value</report>
-            </rule>
+                  id="testPure1-span-tofrom-constraint-rule-49">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:span">
+               <sch:report test="contains(normalize-space(@to),' ') or contains(normalize-space(@from),' ')">
+          The attributes @to and @from on <sch:name/> may each contain only a single value
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.interpLike.attributes"/>
@@ -8559,14 +8561,14 @@ The attributes @to and @from on <name/> may each contain only a single value</re
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-link-linkTargets3-constraint-assert-32">
-            <rule context="tei:link">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns:xi="http://www.w3.org/2001/XInclude"
-                           test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
+                  id="testPure1-link-linkTargets3-constraint-rule-50">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:link">
+               <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
                </sch:assert>
-            </rule>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.pointing.attributes"/>
@@ -8715,15 +8717,15 @@ The attributes @to and @from on <name/> may each contain only a single value</re
          <ref name="t_gb"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-21">
-            <rule context="tei:ab">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns:xi="http://www.w3.org/2001/XInclude"
-                           test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-51">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:ab">
+               <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
@@ -8924,10 +8926,19 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                         xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is excl, each weight states the probability that the corresponding alternative occurs. If <code xmlns="http://www.w3.org/1999/xhtml"
                         xmlns:rng="http://relaxng.org/ns/structure/1.0">@mode</code> is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs.</a:documentation>
                <list>
-                  <data type="double"/>
-                  <data type="double"/>
+                  <data type="double">
+                     <param name="minInclusive">0</param>
+                     <param name="maxInclusive">1</param>
+                  </data>
+                  <data type="double">
+                     <param name="minInclusive">0</param>
+                     <param name="maxInclusive">1</param>
+                  </data>
                   <zeroOrMore>
-                     <data type="double"/>
+                     <data type="double">
+                        <param name="minInclusive">0</param>
+                        <param name="maxInclusive">1</param>
+                     </data>
                   </zeroOrMore>
                </list>
             </attribute>
@@ -9146,16 +9157,16 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-standOff-nested_standOff_should_be_typed-constraint-assert-33">
-            <rule context="tei:standOff">
-               <sch:assert xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           xmlns:xi="http://www.w3.org/2001/XInclude"
-                           test="@type or not(ancestor::tei:standOff)">This
-      <sch:name/> element must have a @type attribute, since it is
-      nested inside a <sch:name/>
+                  id="testPure1-standOff-nested_standOff_should_be_typed-constraint-rule-52">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      xmlns:xi="http://www.w3.org/2001/XInclude"
+                      context="tei:standOff">
+               <sch:assert test="@type or not(ancestor::tei:standOff)">This
+        <sch:name/> element must have a @type attribute, since it is
+        nested inside a <sch:name/>
                </sch:assert>
-            </rule>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
@@ -9602,25 +9613,25 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-report-22">
-            <rule context="tei:div">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-53">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:div">
+               <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-report-23">
-            <rule context="tei:div">
-               <sch:report xmlns="http://www.tei-c.org/ns/1.0"
-                           xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                           test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
-            </rule>
+                  id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-54">
+            <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                      xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                      context="tei:div">
+               <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+            </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.divLike.attributes"/>
@@ -10083,7 +10094,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-orgName-calendar-calendar-check-orgName-constraint-rule-33">
+                  id="testPure1-orgName-calendar-calendar-check-orgName-constraint-rule-55">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -10119,7 +10130,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-persName-calendar-calendar-check-persName-constraint-rule-34">
+                  id="testPure1-persName-calendar-calendar-check-persName-constraint-rule-56">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -10155,7 +10166,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-placeName-calendar-calendar-check-placeName-constraint-rule-35">
+                  id="testPure1-placeName-calendar-calendar-check-placeName-constraint-rule-57">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/source/p5subset.xml b/source/p5subset.xml
index f7cfd90b3..9d9ec7f26 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -7,7 +7,7 @@
       </titleStmt>
       <editionStmt>
         <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.8.0.html">4.8.0a</ref>. Last updated on
-        <date when="2024-01-22">22nd January 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/a6432f272">a6432f272</ref></edition>
+        <date when="2024-05-01">1st May 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/2b31965c4">2b31965c4</ref></edition>
       </editionStmt>
       <publicationStmt>
         <distributor>TEI Consortium</distributor>
@@ -7552,7 +7552,7 @@ used for transcribing extant documents.</desc>
   </content>
 </macroSpec></div>
 <div type="div3" xml:id="DTYPES"><head>Datatype Specifications</head>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.certainty">
+<dataSpec module="tei" ident="teidata.certainty">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a degree of certainty.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">확실성 정도를 표현하는 속성 값의 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義表示正確度的屬性值範圍</desc>
@@ -7584,7 +7584,7 @@ used for transcribing extant documents.</desc>
     <val>high</val>, <val>medium</val>, ou <val>low</val>. <!--Pour une indication précise, <ident type="datatype">data.probability</ident> peut être utilisé en remplacement ou en complément.--></p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.probability">
+<dataSpec module="tei" ident="teidata.probability">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a probability.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">확률을 표현하는 속성 값의 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義表示可能性的屬性值範圍</desc>
@@ -7596,8 +7596,11 @@ used for transcribing extant documents.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi che esprimono
     una probabilità</desc>
   <content>
-      <dataRef name="double"/>
-   </content>
+    <dataRef name="double">
+      <dataFacet name="minInclusive" value="0"/>
+      <dataFacet name="maxInclusive" value="1"/>
+    </dataRef>
+  </content>
   <remarks versionDate="2005-10-18" xml:lang="en">
       <p>Probability is expressed
        as a real number between 0 and 1;  0  representing <mentioned>certainly false</mentioned> and 1 representing <mentioned>certainly
@@ -7613,7 +7616,7 @@ used for transcribing extant documents.</desc>
         vrai</mentioned>.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.numeric">
+<dataSpec module="tei" ident="teidata.numeric">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for numeric values.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">수치에 사용되는 속성 값의 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義用於數值的屬性值範圍</desc>
@@ -7683,7 +7686,7 @@ used for transcribing extant documents.</desc>
       représentée en fraction par la chaîne de caractères 1/2.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.interval">
+<dataSpec module="tei" ident="teidata.interval">
   <desc versionDate="2013-04-13" xml:lang="en">defines attribute values used to express an interval value.</desc>
   <content>
       <alternate>
@@ -7700,7 +7703,7 @@ used for transcribing extant documents.</desc>
     <val>regular</val>, <val>irregular</val>, <val>unknown</val>.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.count">
+<dataSpec module="tei" ident="teidata.count">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for a non-negative
 integer value used as a count.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">계산으로 사용된 음이 아닌 정수 값의 속성 값 범위를 정의한다.</desc>
@@ -7724,7 +7727,7 @@ integer value used as a count.</desc>
       <p>Seules des valeurs positives entières sont autorisées.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.temporal.w3c">
+<dataSpec module="tei" ident="teidata.temporal.w3c">
   <desc versionDate="2007-04-08" xml:lang="en">defines the range of attribute values expressing a temporal
   expression such as a date, a time, or a combination of them, that
   conform to the W3C <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>
@@ -7795,7 +7798,7 @@ integer value used as a count.</desc>
     or 1970-01-01T00:00:00Z.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.duration.w3c">
+<dataSpec module="tei" ident="teidata.duration.w3c">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values available for representation of a duration in time using W3C datatypes.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">W3C 데이터 유형을 사용해서 시간 지속을 나타내는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">以W3C datatypes標準格式來定義表示一段持續性時間的屬性值範圍</desc>
@@ -7886,7 +7889,7 @@ integer value used as a count.</desc>
       specification</ref>.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.truthValue">
+<dataSpec module="tei" ident="teidata.truthValue">
   <desc versionDate="2007-10-22" xml:lang="en">defines the range of attribute values used to express a truth
 value.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">진리값을 표현하는 속성 값 범위를 정의한다.</desc>
@@ -7923,7 +7926,7 @@ value.</desc>
     </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.xTruthValue">
+<dataSpec module="tei" ident="teidata.xTruthValue">
   <gloss versionDate="2007-07-04" xml:lang="en">extended truth value</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">확장 진리값</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
@@ -7958,7 +7961,7 @@ value.</desc>
     le type de données <ident>teidata.TruthValue</ident>.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.language">
+<dataSpec module="tei" ident="teidata.language">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to identify a particular combination of human
     language and writing system.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">인간의 언어와 문자 체계의 특별한 조합을 식별하는 속성 값 범위를 정의한다.</desc>
@@ -8230,7 +8233,7 @@ value.</desc>
       <ptr target="#CHSH"/>
   </listRef>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.namespace">
+<dataSpec module="tei" ident="teidata.namespace">
   <desc versionDate="2007-10-14" xml:lang="en">defines the range of attribute values used to indicate XML namespaces as defined by the W3C
     <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">Namespaces in XML</ref>
     Technical Recommendation.</desc>
@@ -8272,7 +8275,7 @@ value.</desc>
       <!-- this ref should be in the TEI bibliog -->
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.namespaceOrName">
+<dataSpec module="tei" ident="teidata.namespaceOrName">
   <desc versionDate="2017-05-23" xml:lang="en">defines attribute values which contain either an absolute namespace URI or a qualified XML name.</desc>
   <content>
     <!--
@@ -8301,7 +8304,7 @@ value.</desc>
   <!-- would require that the prefix 'mid' in 'mid:night' be in scope -->
   <!-- wherever this was used. -->
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.outputMeasurement">
+<dataSpec module="tei" ident="teidata.outputMeasurement">
   <desc versionDate="2013-03-26" xml:lang="en">defines a range of values for use in specifying the size of an object that is intended for
     display.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">웹에서 디스플레이 목적의 대상 크기를 명시하는 값의 범위를 정의한다.</desc>
@@ -8426,7 +8429,7 @@ bibliography and link to that (LB 2013-03-13) -->
     </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tei" ident="teidata.point">
+<dataSpec module="tei" ident="teidata.point">
   <desc versionDate="2010-10-17" xml:lang="en">defines the data type used to express a point in cartesian space.</desc>
   <content>
     <dataRef name="token" restriction="(-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?)"/>
@@ -8451,7 +8454,7 @@ bibliography and link to that (LB 2013-03-13) -->
     </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.pointer">
+<dataSpec module="tei" ident="teidata.pointer">
   <desc versionDate="2013-01-19" xml:lang="en">defines the range of attribute values used to provide a single
   URI, absolute or relative, pointing to some other
 resource, either within the current document or elsewhere.</desc>
@@ -8498,7 +8501,7 @@ resource, either within the current document or elsewhere.</desc>
       </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.authority">
+<dataSpec module="tei" ident="teidata.authority">
   <desc versionDate="2020-02-12" xml:lang="en">defines attribute values which derive from an 
     authority list, which may be an enumerated list defined in the document's schema, a list 
     or taxonomy elsewhere in the document, or an online taxonomy, gazetteer, or other authority.</desc>
@@ -8513,7 +8516,7 @@ resource, either within the current document or elsewhere.</desc>
       specification (<ident type="datatype">teidata.enumerated</ident>) or be a valid URI (<ident type="datatype">teidata.pointer</ident>).</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.version">
+<dataSpec module="tei" ident="teidata.version">
   <desc versionDate="2013-11-20" xml:lang="en">defines the range of attribute values which may be used to
   specify a TEI or Unicode version number.</desc>
   <desc xml:lang="fr" versionDate="2007-06-12">définit la gamme des valeurs d'attribut
@@ -8540,7 +8543,7 @@ resource, either within the current document or elsewhere.</desc>
 </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.versionNumber">
+<dataSpec module="tei" ident="teidata.versionNumber">
   <desc versionDate="2013-04-14" xml:lang="en">defines the range of attribute values used for version numbers.</desc>
   <content>
       <dataRef name="token" restriction="[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}"/>
@@ -8549,7 +8552,7 @@ resource, either within the current document or elsewhere.</desc>
       <p/>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.replacement">
+<dataSpec module="tei" ident="teidata.replacement">
   <desc versionDate="2013-04-14" xml:lang="en">defines attribute values which contain a replacement template.</desc>
   <content>
       <textNode/>
@@ -8558,7 +8561,7 @@ resource, either within the current document or elsewhere.</desc>
       <p/>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.xpath">
+<dataSpec module="tei" ident="teidata.xpath">
 <desc versionDate="2013-04-14" xml:lang="en">defines attribute values
 which contain an XPath expression.</desc>
 <content>
@@ -8574,7 +8577,7 @@ which contain an XPath expression.</desc>
   OWASP</ref>.</p>
 </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.word">
+<dataSpec module="tei" ident="teidata.word">
   <desc versionDate="2007-10-22" xml:lang="en">defines the range of attribute values expressed as a single
   word or token.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">단일 단어 또는 토큰으로 표현된 속성 값 범위를 정의한다.</desc>
@@ -8608,7 +8611,7 @@ which contain an XPath expression.</desc>
     </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.text">
+<dataSpec module="tei" ident="teidata.text">
   <desc versionDate="2012-06-17" xml:lang="en">defines the range of attribute values used to express some
   kind of identifying string as a single sequence
   of Unicode characters possibly including whitespace.</desc>
@@ -8624,7 +8627,7 @@ which contain an XPath expression.</desc>
     punctuation characters are permitted. </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.name">
+<dataSpec module="tei" ident="teidata.name">
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressed as an XML Name.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">XML 이름으로 표현되는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以XML名稱或識別符碼表示</desc>
@@ -8653,7 +8656,7 @@ which contain an XPath expression.</desc>
       par exemple ils ne peuvent contenir de blancs ou commencer par des chiffres. </p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.xmlName">
+<dataSpec module="tei" ident="teidata.xmlName">
   <desc versionDate="2013-04-13" xml:lang="en">defines attribute values which contain an XML name.</desc>
   <content>
       <dataRef name="NCName"/>
@@ -8662,7 +8665,7 @@ which contain an XPath expression.</desc>
       <p>The rules defining an XML name form a part of the XML Specification.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.prefix">
+<dataSpec module="tei" ident="teidata.prefix">
   <desc versionDate="2016-11-28" xml:lang="en">defines a range of values that may function as a URI scheme name.</desc>
   <content>
     <dataRef name="token" restriction="[a-z][a-z0-9\+\.\-]*"/>
@@ -8675,7 +8678,7 @@ which contain an XPath expression.</desc>
     permitted, and the value must start with a letter.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.enumerated">
+<dataSpec module="tei" ident="teidata.enumerated">
   <desc versionDate="2007-10-22" xml:lang="en">defines the range of attribute values expressed as a single XML name taken from a list of
     documented possibilities.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">기록된 확률의 목록으로부터 얻어진 단일 XML 이름으로 표현된 속성 값 범위를 정의한다.</desc>
@@ -8713,7 +8716,7 @@ which contain an XPath expression.</desc>
       <gi>valList</gi>.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.gender">
+<dataSpec module="tei" ident="teidata.gender">
   <desc versionDate="2022-05-17" xml:lang="en">defines the range of attribute values used to
     represent the gender of a person, persona, or character.</desc>
   <content>
@@ -8725,7 +8728,7 @@ which contain an XPath expression.</desc>
         <att>msd</att> as defined in <ident type="class">att.linguistic</ident>, and <ptr target="#DITPFO"/>).</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.sex">
+<dataSpec module="tei" ident="teidata.sex">
   <desc versionDate="2022-05-10" xml:lang="en">defines the range of attribute values used to identify
     the sex of an organism.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">인간 또는 동물의 성을 식별하는 속성 값 범위를 정의한다.</desc>
@@ -8748,14 +8751,15 @@ which contain an XPath expression.</desc>
       référence à un standard externe.</p>
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.probCert">
-  <desc versionDate="2007-10-18" xml:lang="en">defines a range of attribute values which can be expressed either as a numeric probability or as a coded certainty value.</desc>
-<content>  
-  <alternate><dataRef key="teidata.probability"/>
-  <dataRef key="teidata.certainty"/>
-  </alternate>
+<dataSpec module="tei" ident="teidata.probCert">
+  <desc versionDate="2007-10-18" xml:lang="en">defines a range of attribute values which can be expressed either as a numeric
+    probability or as a coded certainty value.</desc>
+  <content>
+    <alternate>
+      <dataRef key="teidata.probability"/>
+      <dataRef key="teidata.certainty"/>
+    </alternate>
   </content>
-  
 </dataSpec>
 <dataSpec module="tei" ident="teidata.unboundedCount">
   <desc versionDate="2022-07-06" xml:lang="en">defines the range of values used for a counting number or the string <val>unbounded</val> for infinity.</desc>
@@ -8766,13 +8770,13 @@ which contain an XPath expression.</desc>
     </alternate>
   </content>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.nullOrName">
+<dataSpec module="tei" ident="teidata.nullOrName">
   <desc versionDate="2013-04-13" xml:lang="en">defines attribute values which contain either the null string or an XML name.</desc>
   <content>
-      <alternate>
-        <valList><valItem ident=""/></valList>
-          <dataRef name="NCName"/>
-   </alternate>
+    <alternate>
+      <valList><valItem ident=""/></valList>
+      <dataRef name="NCName"/>
+    </alternate>
   </content>
   <remarks versionDate="2013-04-13" xml:lang="en">
       <p>The rules defining an XML name form a part of the XML Specification.</p>
@@ -11134,6 +11138,7 @@ during the encoding of a text.</desc>
   <gloss versionDate="2006-10-18" xml:lang="de">Korrekturverfahren</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">principios de corrección</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">principi di correzione</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">修正の原則</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">states how and under what circumstances corrections have been made in the text.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">établit comment et dans quelles circonstances des
     corrections ont été apportées au texte.</desc>
@@ -11445,31 +11450,28 @@ during the encoding of a text.</desc>
   <gloss xml:lang="en" versionDate="2007-06-12">quotation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">citation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">specifies editorial practice adopted with respect to quotation marks in the original.</desc>
-  <desc versionDate="2009-01-05" xml:lang="fr">décrit la pratique éditoriale adoptée par rapport aux
-    guillements dans l’original.</desc>
+  <desc versionDate="2009-01-05" xml:lang="fr">décrit la pratique éditoriale adoptée par rapport aux guillements dans l’original.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원본 인용 부호에 관해 채택한 편집 방식을 명시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">說明在編輯上是如何處理來源文件中的引文符號。</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">元資料にあった引用をどのように編集したのかを示す。</desc>
-  <desc versionDate="2006-10-18" xml:lang="de">beschreibt die editorische Praxis bezüglich der
-    Anführungszeichen im Originaltext.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">indica las prácticas editoriales adoptadas respecto al
-    entrecomillado en el original.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">specifica le pratiche editoriali rispetto all'uso delle
-    virgolette nell'originale</desc>
+  <desc versionDate="2006-10-18" xml:lang="de">beschreibt die editorische Praxis bezüglich der Anführungszeichen im Originaltext.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">indica las prácticas editoriales adoptadas respecto al entrecomillado en el original.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">specifica le pratiche editoriali rispetto all'uso delle virgolette nell'originale</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.declarable"/>
     <memberOf key="model.editorialDeclPart"/>
   </classes>
   <content>
-    
-      <classRef key="model.pLike" minOccurs="0" maxOccurs="unbounded"/>
-    
+    <classRef key="model.pLike" minOccurs="0" maxOccurs="unbounded"/>
   </content>
   <constraintSpec ident="quotationContents" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="not(@marks) and not (tei:p)">
-On <name/>, either the @marks attribute should be used, or a paragraph of description provided</report>
+      <sch:rule context="tei:quotation">
+        <sch:report test="not( @marks )  and  not( tei:p )">
+          On <sch:name/>, either the @marks attribute should be used, or a paragraph of description provided
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -11522,33 +11524,6 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
         </valItem>
       </valList>
     </attDef>
-<!--   MDH: 2014-05-01: Commented out this obsolete attribute. -->
-    <!--<attDef ident="form" usage="opt" validUntil="2014-04-28">
-      <desc versionDate="2005-01-14" xml:lang="en">specifies how quotation marks are indicated within the text.</desc>
-      <desc versionDate="2009-01-05" xml:lang="fr">précise comment les guillemets sont indiqués dans le
-        texte.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">텍스트 내에 인용 부호가 표시되는 방법을 명시한다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">說明引文符號如何標示於文本中。</desc>
-      <desc versionDate="2008-04-06" xml:lang="ja">当該テキスト中に引用符がどのように示されているかを示す．</desc>
-      <desc versionDate="2006-10-18" xml:lang="de"> beschreibt, wie Anführungszeichen im Text angezeigt
-        werden</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">indica cómo se ha marcado el entrecomillado al
-        interno del texto.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">specifica in che modo le virgolette sono indicate
-        ell'interno del testo</desc>
-      <datatype>
-        <rng:ref xmlns:rng="http://relaxng.org/ns/structure/1.0" name="data.enumerated"/>
-      </datatype>
-      <defaultVal>unknown</defaultVal>
-      <remarks versionDate="2008-04-05" xml:lang="en">
-        <p>The <att>form</att> attribute is deprecated. Although retained for compatibility, this
-          attribute will be removed at a subsequent release.</p>
-      </remarks>
-      <remarks xml:lang="fr" versionDate="2007-06-12">
-        <p>L'attribut <att>forme</att> est condamné. Bien qu'il soit conservé pour raison de
-          compatiblité, cet attribut sera supprimé à la prochaine mise à jour.</p>
-      </remarks>
-    </attDef>-->
   </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
@@ -12460,7 +12435,7 @@ the target element</desc>
     <ptr target="#HD54"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="citeStructure">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="citeStructure">
   <gloss versionDate="2020-02-03" xml:lang="en">citation structure</gloss>
   <desc versionDate="2020-02-03" xml:lang="en">declares a structure and method for citing the current document.</desc>
   <classes>
@@ -12497,16 +12472,16 @@ the target element</desc>
       </datatype>
       <constraintSpec ident="citestructure-outer-match" scheme="schematron">
         <constraint>
-          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:citeStructure[not(parent::tei:citeStructure)]">
-            <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
-          </rule>
+          <sch:rule context="tei:citeStructure[not(parent::tei:citeStructure)]">
+            <sch:assert test="starts-with(@match,'/')">An XPath in @match on the outer <sch:name/> must start with '/'.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
       <constraintSpec ident="citestructure-inner-match" scheme="schematron">
         <constraint>
-          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:citeStructure[parent::tei:citeStructure]">
-            <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
-          </rule>
+          <sch:rule context="tei:citeStructure[parent::tei:citeStructure]">
+            <sch:assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <sch:name/>.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </attDef>
@@ -12963,7 +12938,8 @@ the target element</desc>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration de classification</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">분류 선언</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">分類宣告</gloss>
-    <gloss versionDate="2016-11-17" xml:lang="de">Angabe zur Klassifikation</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">分類法宣言</gloss>
+  <gloss versionDate="2016-11-17" xml:lang="de">Angabe zur Klassifikation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">declaraciones de clasificación</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">dichiarazioni sulla ckassificazione</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains one or more taxonomies defining any classificatory
@@ -12971,8 +12947,8 @@ codes used elsewhere in the text.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">contient une ou plusieurs taxinomies définissant les codes de classification utilisés n’importe où dans le texte.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트 내 어디서든 사용될 수 있는 분류 부호를 정의하는 분류법을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一個或多個分類法，用來定義在文件中他處所使用之任何分類碼。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">当該テキスト中で使用されている分類コードを定義する、ひとつ以上の分類
-  法を示す。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">当該テキスト中で使用されている分類コードを定義する、
+    ひとつ以上の分類法を示す。</desc>
     <desc versionDate="2016-11-17" xml:lang="de">enthält eine oder mehrere Taxonomien, die im Text verwendete Klassifikationscodes definieren.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una o más taxonomías que definen cualquier código usado en algún punto del texto.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una o più tassonomie che definiscono un qualsiasi codice classificatorio usato in un'altra porzione del testo.</desc>
@@ -14847,6 +14823,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
   <gloss versionDate="2008-04-06" xml:lang="es">código de clasificación</gloss>
   <gloss versionDate="2016-11-24" xml:lang="de">Klassifikationscode</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">codice di clasificazione</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">分類コード</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the classification code used for this text in some standard classification system.</desc>
   <desc versionDate="2009-04-22" xml:lang="fr">contient le code de classification attribué à ce texte en
     référence à un système standard de classification.</desc>
@@ -14873,7 +14850,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
         taxinomie utilisée.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">사용하고 있는 분류 체계 또는 분류법을 표시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">說明使用中的分類系統或分類法。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該分類法を定義する。</desc>
+      <desc versionDate="2024-02-28" xml:lang="ja">用いられている分類体系を定義する<gi>taxonomy</gi>要素や他の資料などを指す。</desc>
         <desc versionDate="2016-11-24" xml:lang="de">benennt das verwendete Klassifikationssystem, definiert z. B. durch Verweis auf ein 
             <gi>taxonomy</gi>-Element oder eine andere Ressource</desc>
       <desc versionDate="2007-05-04" xml:lang="es">identifica el sistema de clasificación o taxonomía en
@@ -15342,19 +15319,19 @@ should be supplied for the <att>scheme</att> attribute.</p>
         </valItem>
         <valItem ident="transmitted">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</desc>
-        <desc versionDate="2022-06-02" xml:lang="ja">メッセージの転送に関する情報。発送者と次の受信者、転送等。
+          <desc versionDate="2024-03-07" xml:lang="ja">メッセージの伝達手段に関する情報。発信とその後の受信・転送等の間の情報。
 	    </desc>
 	      </valItem>
         <valItem ident="redirected">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  redirection of an unread message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">未読なままに転送されるメッセージに関する情報。
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封せずに〕未読のままに転送されるメッセージに関する情報。
 	    </desc>
         </valItem>
         <valItem ident="forwarded">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  forwarding of a message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの転送に関する情報。
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封後の〕メッセージの転送に関する情報。
 	    </desc>
         </valItem>
       </valList>
@@ -15991,16 +15968,20 @@ supplied to printer.</change>
   </content>
   <constraintSpec ident="abstractModel-structure-p-in-ab-or-p" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
-        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
-      </sch:report>
+      <sch:rule context="tei:p">
+        <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
+          Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="abstractModel-structure-p-in-l-or-lg" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:p">
+        <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -16848,6 +16829,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2009-01-06" xml:lang="fr">citation</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">citazione</gloss>
   <gloss versionDate="2016-11-24" xml:lang="de">Zitat mit Referenz</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">引用内容</gloss>
   <desc versionDate="2007-09-23" xml:lang="en">contains a quotation from some other document, together with a bibliographic reference to
     its source. In a dictionary it may contain an example text with at least one occurrence of the
     word form, used in the sense being described, or a translation of the headword, or an example.</desc>
@@ -17547,18 +17529,19 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
       <desc versionDate="2021-01-31" xml:lang="ja">ルビテキストの対象へのポインタを示す。</desc>
       <datatype><dataRef key="teidata.pointer"/></datatype>
       <constraintSpec scheme="schematron" ident="rt-target-not-span">
-        <!-- Note: this constraint should not be necessary, as
-                     the desired semantics should be something we
-                     could describe in PureODD using attList/@org. But
-                     I don’t think we can. —Syd -->
+        <!-- Note: this constraint should not be necessary, as the
+             desired semantics should be something we could describe
+             in PureODD using attList/@org. But I don’t think we
+             can. —Syd -->
         <desc>Enforce that <emph>either</emph>
           <att>target</att> or both <att>from</att> and
           <att>to</att> (or none) are used, but not
           <att>target</att> in combination with either
           <att>from</att> or <att>to</att>.</desc>
         <constraint>
-          <sch:report test="../@from | ../@to">When target= is
-            present, neither from= nor to= should be.</sch:report>
+          <sch:rule context="tei:rt/@target">
+            <sch:report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</sch:report>
+          </sch:rule>
         </constraint>
       </constraintSpec>
       <remarks xml:lang="en" versionDate="2020-02-01">
@@ -17576,15 +17559,16 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         <dataRef key="teidata.pointer"/>
       </datatype>
       <constraintSpec scheme="schematron" ident="rt-from">
-        <!-- Note: this constraint should not be necessary, as
-                       the desired semantics should be something we
-                       could describe in PureODD using attList/@org. But
-                       I don’t think we can. —Syd -->
+        <!-- Note: this constraint should not be necessary, as the
+             desired semantics should be something we could describe
+             in PureODD using attList/@org. But I don’t think we
+             can. —Syd -->
         <desc>Enforce the presence of <att>to</att> iff there
           is a <att>from</att>.</desc>
         <constraint>
-          <sch:assert test="../@to">When from= is present, the to=
-            attribute of <sch:name/> is required.</sch:assert>
+          <sch:rule context="tei:rt/@from">
+            <sch:assert test="../@to">When from= is present, the to= attribute of <sch:name/> is required.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </attDef>
@@ -17596,15 +17580,16 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         <dataRef key="teidata.pointer"/>
       </datatype>
       <constraintSpec scheme="schematron" ident="rt-to">
-        <!-- Note: this constraint should not be necessary, as
-                       the desired semantics should be something we
-                       could describe in PureODD using attList/@org. But
-                       I don’t think we can. —Syd -->
+        <!-- Note: this constraint should not be necessary, as the
+             desired semantics should be something we could describe
+             in PureODD using attList/@org. But I don’t think we
+             can. —Syd -->
         <desc>Enforce the presence of <att>from</att> iff there
           is a <att>to</att>.</desc>
         <constraint>
-          <sch:assert test="../@from">When to= is present, the from=
-            attribute of <sch:name/> is required.</sch:assert>
+          <sch:rule context="tei:rt/@to">
+            <sch:assert test="../@from">When to= is present, the from= attribute of <sch:name/> is required.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </attDef>
@@ -17744,6 +17729,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2007-05-04" xml:lang="es">corrección</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">correzione</gloss>
   <gloss versionDate="2016-11-24" xml:lang="de">Korrektur</gloss>  
+  <gloss versionDate="2024-02-28" xml:lang="ja">修正</gloss>
   <desc versionDate="2006-03-20" xml:lang="en">contains the correct form of a passage apparently erroneous in the copy text.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">복사된 텍스트에서 오류로 보이는 단락의 정정 형식을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含文本中看似錯誤並加以更正過後的文字。</desc>
@@ -17909,18 +17895,13 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <p>Se Observa también que los elementos <gi>opción</gi> pueden ser uno mismo-jerarquía.</p>
     <p>Para una versión especializada de la <gi>opción</gi> para codificar los testimonios múltiples de un único trabajo, ver la sección <ptr target="#TCAPLL"/>.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks xml:lang="ja" versionDate="2024-02-28">
     <p>
-            要素<gi>choice</gi>の子要素は全て、選択的な符号化方法を示している。
-            従って、それらは互いに排他的であるとするのが自然である。けれども、
-            並列的に符号化されていると考えられる場合もあるだろう。
-        </p>
-    <p>要素<gi>choice</gi>は、入れ子化できることにも注意して欲しい。
-        </p>
-    <p>
-            1つの作品にある複数の現存資料を要素<gi>choice</gi>符号化することに
-            ついては、<ptr target="#TCAPLL"/>を参照のこと。
-        </p>
+      <gi>choice</gi>要素の子要素は全て、同じ部分の異なる選択肢を示しているので、それらは択一的であるとするのが自然である。
+      けれども、テキストを完全に表現するには複数の選択肢を並列的に扱う必要がある場合もあるだろう。</p>
+      <p><gi>choice</gi>要素は、自らを入れ子にできることにも注意して欲しい。</p>
+      <p>符号化時にありうる選択肢ではなく、1つの作品にある複数の本文を記録する目的では、
+      <ptr target="#TCAPLL"/>で扱われている<gi>app</gi>要素などが望ましい。</p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-24">
       <p>
@@ -17946,7 +17927,7 @@ Normalization</head>
   <gloss versionDate="2005-01-14" xml:lang="en">regularization</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">정규화</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">一般化</gloss>
-  <gloss versionDate="2008-04-06" xml:lang="ja"/>
+  <gloss versionDate="2024-02-14" xml:lang="ja">規則化</gloss>
   <gloss versionDate="2009-01-06" xml:lang="fr">régularisation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">regularización</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">regolarizzazione</gloss>
@@ -17954,7 +17935,7 @@ Normalization</head>
   <desc versionDate="2005-01-14" xml:lang="en">contains a reading which has been regularized or normalized in some sense.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">어떤 면에서 정규화 또는 표준화된 해석을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標誌一般化或規格化處理過的文字。</desc>
-  <desc versionDate="2008-04-06" xml:lang="ja">正規化された読みを示す。</desc>
+  <desc versionDate="2024-02-14" xml:lang="ja">規則化された読みを示す。</desc>
   <desc versionDate="2009-01-06" xml:lang="fr">contient une partie qui a été régularisée ou normalisée
         de façon quelconque</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una lectura que ha sido regularizada o
@@ -20583,7 +20564,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
   </listRef>
 </elementSpec></div></div>
 <div type="div2" xml:id="COXR"><head>Simple Links and Cross-References</head>
-<elementSpec module="core" ident="ptr">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="ptr">
   <gloss versionDate="2007-07-04" xml:lang="en">pointer</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">포인터</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
@@ -20610,8 +20591,9 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
   <content><empty/></content>
   <constraintSpec scheme="schematron" ident="ptrAtts">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
-attributes @target and @cRef may be supplied on <name/>.</report>
+      <sch:rule context="tei:ptr">
+        <sch:report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <sch:name/>.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="und">
@@ -20626,24 +20608,22 @@ attributes @target and @cRef may be supplied on <name/>.</report>
     <ptr target="#SAPT"/>
   </listRef>
 </elementSpec>
-<elementSpec module="core" ident="ref">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="ref">
   <gloss versionDate="2007-07-04" xml:lang="en">reference</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">참조</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
   <gloss versionDate="2008-04-06" xml:lang="es">referencia</gloss>
   <gloss versionDate="2009-01-06" xml:lang="fr">référence</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">riferimento</gloss>
-    <gloss versionDate="2016-11-25" xml:lang="de">Referenz</gloss>
+  <gloss versionDate="2016-11-25" xml:lang="de">Referenz</gloss>
   <desc versionDate="2006-01-11" xml:lang="en">defines a reference to another location, possibly modified by additional text or comment.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">부가적인 텍스트 또는 해설로 수정될 수 있는, 다른 위치로 참조를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標明與其他位置互相參照的符號，或許包含附加的文字或註解。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">他の場所への参照を定義する。多くは、追加テキストまたはコメントを含む。</desc>
   <desc versionDate="2009-01-06" xml:lang="fr">définit une référence vers un autre emplacement, la référence étant éventuellement modifiée ou complétée par un texte ou un commentaire.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">define una referencia a otra localización, posiblemente
-    modificada por un texto o comentario adicional.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">definisce un riferimento ad un'altra posizione, può
-    essere modificata da un commento o testo ulteriore</desc>
-    <desc versionDate="2016-11-25" xml:lang="de">definiert einen externen oder internen Verweis, der auch durch einen zusätzlichen Text oder Kommentar ergänzt werden kann.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">define una referencia a otra localización, posiblemente modificada por un texto o comentario adicional.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">definisce un riferimento ad un'altra posizione, può essere modificata da un commento o testo ulteriore</desc>
+  <desc versionDate="2016-11-25" xml:lang="de">definiert einen externen oder internen Verweis, der auch durch einen zusätzlichen Text oder Kommentar ergänzt werden kann.</desc>
   <classes>
     <memberOf key="att.cReferencing"/>
     <memberOf key="att.declaring"/>
@@ -20659,9 +20639,9 @@ attributes @target and @cRef may be supplied on <name/>.</report>
   </content>
   <constraintSpec scheme="schematron" ident="refAtts">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@target and @cRef">Only one of the
-	attributes @target' and @cRef' may be supplied on <name/>
-         </report>
+      <sch:rule context="tei:ref">
+        <sch:report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <sch:name/></sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -20679,12 +20659,12 @@ attributes @target and @cRef may be supplied on <name/>.</report>
   <exemplum versionDate="2008-04-06" xml:lang="fr">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">Cf. tout particulièrement 
     <ref cRef="B1/234">le vers 234 du Livre I</ref>
-      </egXML>
+    </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
     <egXML xmlns="http://www.tei-c.org/ns/Examples"><ref target="http://www.natcorp.ox.ac.uk/Texts/A02.xml#s2"> 關於第二行，</ref> 請參考 <ref>下列
-        <term>慣用語</term>
-         </ref>.</egXML>
+    <term>慣用語</term>
+    </ref>.</egXML>
   </exemplum>
   <remarks versionDate="2005-10-13" xml:lang="en">
     <p>The <att>target</att> and <att>cRef</att> attributes are mutually exclusive.</p>
@@ -20696,7 +20676,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
     <p> 属性<att>target</att>と<att>cRef</att>は、排他的に使用される。 </p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-25">
-      <p>Die <att>target</att> und <att>cRef</att>-Attribute schließen sich gegenseitig aus.</p>
+    <p>Die <att>target</att> und <att>cRef</att>-Attribute schließen sich gegenseitig aus.</p>
   </remarks>
   <listRef>
     <ptr target="#COXR"/>
@@ -24529,7 +24509,9 @@ epistemology, methodology and history of
 </elementSpec>
 <elementSpec module="core" ident="citedRange">
   <gloss versionDate="2012-12-13" xml:lang="en">cited range</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">引用範囲</gloss>
   <desc versionDate="2012-12-13" xml:lang="en">defines the range of cited content, often represented by pages or other units</desc>
+  <desc versionDate="2024-02-28" xml:lang="ja">しばしばページやその他の単位で表される、引用の範囲を定める。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing"/>
@@ -24558,7 +24540,9 @@ epistemology, methodology and history of
       an identical value. When no clear endpoint is provided, the <att>from</att> attribute may be
       used without <att>to</att>; for example a citation such as <q>p. 3ff</q> might be encoded
       <code>&lt;citedRange from="3"&gt;p. 3ff&lt;/citedRange&gt;</code>.</p>
-  </remarks> <listRef>
+  </remarks>
+  <remarks versionDate="2024-02-28" xml:lang="ja"><p>1頁だけ引用された時は、同一の値を伴う<att>from</att>と<att>to</att>の属性を用いる。引用の終わりが与えられていない場合は、<att>from</att>属性は、<att>to</att>なしで用いることが許されている。例えば、<q>p. 3ff</q>のような引用は<code>&lt;citedRange from="3"&gt;p. 3ff&lt;/citedRange&gt;</code>と符号化されうる。</p></remarks>
+  <listRef>
     <ptr target="#COBICOB"/>
   </listRef>
 </elementSpec>
@@ -24988,42 +24972,31 @@ epistemology, methodology and history of
   </listRef>
 </elementSpec>
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="relatedItem" module="core">
-  <desc versionDate="2007-03-19" xml:lang="en">contains or references some other bibliographic item which is related to the present one in
-    some specified manner, for example as a constituent or alternative version of it.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko">구성물이나 대체 버전과 같이 현 항목과 특정 방식으로 관련된 다른 서지 항목을 명시적 방식에 따라
-    포함하거나 지시한다.</desc>
+  <desc versionDate="2007-03-19" xml:lang="en">contains or references some other bibliographic item which is related to the present one in some specified manner, for example as a constituent or alternative version of it.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko">구성물이나 대체 버전과 같이 현 항목과 특정 방식으로 관련된 다른 서지 항목을 명시적 방식에 따라 포함하거나 지시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含或參照到其他書目項目，該些項目與目前的書目項目在某種程度上相關，例如作為其組成或者替代項目。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">当該内容と関連する書誌情報項目を示す、または参照する。例えば、構成要 素または他の版など。</desc>
-  <desc versionDate="2009-01-06" xml:lang="fr">contient ou référe à un autre élément bibliographique
-    ayant une relation quelconque avec l'objet décrit, par exemple comme faisant partie d'une version alternative de celui-ci, ou bien en étant une version alternative.</desc>
-  <desc versionDate="2007-11-06" xml:lang="it">contiene o si riferisce ad altra entità bibliografica
-    legata alla presente tramite una relazione specificata quale, per esempio, versione costitutiva
-    o alternativa</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene o refiere algún otro elemento bibliográfico que
-    se relaciona con el actual de alguna manera, por ejemplo como un versión complementaria o
-    alternativa de este.</desc>
-  <desc versionDate="2017-06-13" xml:lang="de">enthält oder verweist auf ein anderes bibliografisches Objekt, welches zu dem aktuellen in einer
-    bestimmten Beziehung steht, z. B. als Bestandteil oder Alternativfassung.</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient ou référe à un autre élément bibliographique ayant une relation quelconque avec l'objet décrit, par exemple comme faisant partie d'une version alternative de celui-ci, ou bien en étant une version alternative.</desc>
+  <desc versionDate="2007-11-06" xml:lang="it">contiene o si riferisce ad altra entità bibliografica legata alla presente tramite una relazione specificata quale, per esempio, versione costitutiva o alternativa</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene o refiere algún otro elemento bibliográfico que se relaciona con el actual de alguna manera, por ejemplo como un versión complementaria o alternativa de este.</desc>
+  <desc versionDate="2017-06-13" xml:lang="de">enthält oder verweist auf ein anderes bibliografisches Objekt, welches zu dem aktuellen in einer bestimmten Beziehung steht, z. B. als Bestandteil oder Alternativfassung.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.biblPart"/>
     <memberOf key="att.typed"/>
   </classes>
   <content>
-    
-      <alternate minOccurs="0">
-        <classRef key="model.biblLike"/>
-        <classRef key="model.ptrLike"/>
-      </alternate>
-    
+    <alternate minOccurs="0">
+      <classRef key="model.biblLike"/>
+      <classRef key="model.ptrLike"/>
+    </alternate>
   </content>
   <constraintSpec ident="targetorcontent1" scheme="schematron">
     <constraint>
-      <sch:report test="@target and count( child::* ) &gt; 0">
-If the @target attribute on <sch:name/> is used, the
-relatedItem element must be empty</sch:report>
-      <sch:assert test="@target or child::*">A relatedItem element should have either a 'target' attribute
-        or a child element to indicate the related bibliographic item</sch:assert>
+      <sch:rule context="tei:relatedItem">
+        <sch:report test="@target and count( child::* ) &gt; 0">If the @target attribute on <sch:name/> is used, the relatedItem element must be empty</sch:report>
+        <sch:assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -25122,9 +25095,9 @@ relatedItem element must be empty</sch:report>
   </content>
   <constraintSpec ident="abstractModel-structure-l-in-l" scheme="schematron">
     <constraint>
-      <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">
-        Abstract model violation: Lines may not contain lines or lg elements.
-      </sch:report>
+      <sch:rule context="tei:l">
+        <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="und">
@@ -25157,17 +25130,13 @@ relatedItem element must be empty</sch:report>
   <gloss versionDate="2007-05-04" xml:lang="es">grupo de versos</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">un gruppo di versi</gloss>
   <gloss versionDate="2017-06-13" xml:lang="de">Gruppe von Vers(zeil)en</gloss>
-  <desc versionDate="2012-04-17" xml:lang="en">contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain,
-        verse paragraph, etc.</desc>
+  <desc versionDate="2012-04-17" xml:lang="en">contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain, verse paragraph, etc.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">예를 들어, 연, 후렴구, 운문 단락과 같이 형식적 단위로 기능하는 운문 행군을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含形式上視為一組的詩行，例如詩節、疊句、韻文段落等。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">形式単位としてある、ある韻文の行をまとまりを示す。例えば、連、リフレ イン、詩節など。</desc>
-  <desc versionDate="2009-01-06" xml:lang="fr">contient un groupe de vers fonctionnant comme une unité
-        formelle, par exemple une strophe, un refrain, un paragraphe en vers, etc.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene un grupo de versos que funcionan como una
-        unidad formal, p.ej. una estrofa, un refrán, un estribillo, etc.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene un gruppo di versi che costituiscono un'unità
-        formale, per esempio una stanza, un refrain, un paragrafo in versi, ecc.</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient un groupe de vers fonctionnant comme une unité formelle, par exemple une strophe, un refrain, un paragraphe en vers, etc.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene un grupo de versos que funcionan como una unidad formal, p.ej. una estrofa, un refrán, un estribillo, etc.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene un gruppo di versi che costituiscono un'unità formale, per esempio una stanza, un refrain, un paragrafo in versi, ecc.</desc>
   <desc versionDate="2017-06-13" xml:lang="de">enthält eine oder mehrere Verse bzw. Verszeilen, die zusammen eine formale Einheit (z. B. Strophe, Refrain) bilden.</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -25206,15 +25175,16 @@ relatedItem element must be empty</sch:report>
   </content>
   <constraintSpec scheme="schematron" ident="atleast1oflggapl">
     <constraint>
-      <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element
-        must contain at least one child l, lg, or gap element.</sch:assert>
+      <sch:rule context="tei:lg">
+        <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="abstractModel-structure-lg-in-l" scheme="schematron">
     <constraint>
-      <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">
-        Abstract model violation: Lines may not contain line groups.
-      </sch:report>
+      <sch:rule context="tei:lg">
+        <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -25275,12 +25245,10 @@ relatedItem element must be empty</sch:report>
     </egXML>
   </exemplum>
   <remarks versionDate="2005-01-14" xml:lang="en">
-    <p rend="dataDesc">contains verse lines or nested line groups only, possibly prefixed by a
-            heading.</p>
+    <p rend="dataDesc">contains verse lines or nested line groups only, possibly prefixed by a heading.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
-    <p rend="dataDesc">ne contient que des vers ou des groupes de vers enchâssés,
-            éventuellement précédés d'un titre.</p>
+    <p rend="dataDesc">ne contient que des vers ou des groupes de vers enchâssés, éventuellement précédés d'un titre.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p rend="dataDesc"> 韻文の行または(普通は見出しが付く)入れ子化された行グループのみを示 す。 </p>
@@ -26729,13 +26697,10 @@ by the stage direction.</p>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트의 전면부, 본문, 후면부의 하위 구역을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">文本的正文前資訊、正文、及正文後資訊的分段。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">前付、本文、後付中のテキスト部分を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">contient une subdivision dans le texte préliminaire, dans le
-  corps d’un texte ou dans le texte postliminaire.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">contient une subdivision dans le texte préliminaire, dans le corps d’un texte ou dans le texte postliminaire.</desc>
   <desc versionDate="2017-06-13" xml:lang="de">enthält einen Unterabschnitt in Vorspann (front), Textkörper oder Nachspann (back) eines Textes.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene una subdivisión del paratexto inicial, del
-  cuerpo del texto o del paratexto final.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene una suddivisione del peritesto iniziale, del
-  corpo del testo, o del peritesto finale</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene una subdivisión del paratexto inicial, del cuerpo del texto o del paratexto final.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene una suddivisione del peritesto iniziale, del corpo del testo, o del peritesto finale</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.divLike"/>
@@ -26786,16 +26751,20 @@ by the stage direction.</p>
   </content>
   <constraintSpec ident="abstractModel-structure-div-in-l-or-lg" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
-        Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:div">
+        <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
+          Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="abstractModel-structure-div-in-ab-or-p" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
-        Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:div">
+        <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
+          Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -28619,7 +28588,7 @@ Tubes formed by Lightning — House struck</p>
   <desc versionDate="2007-12-20" xml:lang="ko">구역의 마지막, 특히 편지의 종료부에 발문으로 나타나는 인사말, 날짜 표시란, 그리고 유사 구를 합하여
     모아 놓는다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集日期地點、署名、稱呼語、及其他在區段結尾出現的類似措辭，尤指信件結尾。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">挨拶文言、日付欄など、ある区分の終わり、特に手紙の終わりにある一連の 文言をまとめる。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">挨拶文言、日付欄など、ある区分の終わり、特に手紙の終わりにある一連の文言をまとめる。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">regroupe une formule de politesse, une indication d'une
     date et d'autres expressions semblables figurant comme expression à la fin d’une division, en
     particulier à la fin d’une lettre.</desc>
@@ -30278,6 +30247,7 @@ reserved for the element likely to be used more often.</p>
   <gloss versionDate="2007-09-15" xml:lang="en">character declarations</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">문자 선언</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">文字描述</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">文字宣言</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">description de caractère</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">descripción del carácter</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">descrizione del carattere</gloss>
@@ -30488,6 +30458,7 @@ otherwise available in the document character set-->.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.datable"/>
   </classes>
   <content>
     <macroRef key="macro.xtext"/>
@@ -31810,76 +31781,123 @@ and <val>simplified</val>  for simplified characters. The
     </listRef>
 </elementSpec>
 <classSpec ident="att.gaijiProp" module="gaiji" type="atts">
-    <desc versionDate="2020-01-28" xml:lang="en">provides attributes for defining the properties of
-        non-standard characters or glyphs. </desc>
-    <desc versionDate="2020-01-28" xml:lang="de">liefert Attribute zur Definition der Eigenschaften
-        von nicht standardisierten Zeichen und Glyphen.</desc>
-    <desc versionDate="2020-02-05" xml:lang="it">fornisce attributi per definire le proprietà di caratteri o glifi non standard</desc>
-    <attList org="group">
-        <attDef ident="name" usage="req">
-            <desc versionDate="2020-01-28" xml:lang="en">provides the name of the character or glyph
-                property being defined.</desc>
-            <datatype maxOccurs="1">
-                <dataRef key="teidata.xmlName"/>
-            </datatype>
-        </attDef>
-        <attDef ident="value" usage="req">
-            <desc versionDate="2020-01-28" xml:lang="en">provides the value of the character or
-                glyph property being defined.</desc>
-            <datatype>
-                <dataRef key="teidata.text"/>
-            </datatype>
-        </attDef>
-        <attDef ident="version" usage="opt">
-            <desc versionDate="2020-01-28" xml:lang="en">specifies the version number of the Unicode
-                Standard in which this property name is defined.</desc>
-            <desc versionDate="2019-07-11" xml:lang="de">gibt die Versionsnummer eines externen
-                Standards an, in dem dieser Eigenschaftsname definiert ist.</desc>
-            <datatype>
-                <dataRef key="teidata.enumerated"/>
-            </datatype>
-            <valList type="semi">
-                <valItem ident="1.0.1"/>
-                <valItem ident="1.1"/>
-                <valItem ident="2.0"/>
-                <valItem ident="2.1"/>
-                <valItem ident="3.0"/>
-                <valItem ident="3.1"/>
-                <valItem ident="3.2"/>
-                <valItem ident="4.0"/>
-                <valItem ident="4.1"/>
-                <valItem ident="5.0"/>
-                <valItem ident="5.1"/>
-                <valItem ident="5.2"/>
-                <valItem ident="6.0"/>
-                <valItem ident="6.1"/>
-                <valItem ident="6.2"/>
-                <valItem ident="6.3"/>
-                <valItem ident="7.0"/>
-                <valItem ident="8.0"/>
-                <valItem ident="9.0"/>
-                <valItem ident="10.0"/>
-                <valItem ident="11.0"/>
-                <valItem ident="12.0"/>
-                <valItem ident="12.1"/>
-                <valItem ident="13.0"/>
-                <valItem ident="14.0"/>
-                <valItem ident="15.0"/>
-                <valItem ident="unassigned"/>
-            </valList>
-        </attDef>
-    </attList>
-    <exemplum versionDate="2019-07-01" xml:lang="en">
-        <p>In this example a definition for the Unicode property <name>Decomposition Mapping</name>
-            is provided.</p>
-        <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"> <unicodeProp name="Decomposition_Mapping" value="circle"/> </egXML>
-    </exemplum>
-    <remarks versionDate="2019-06-29" xml:lang="en">
-        <p>All name-only attributes need an xs:boolean attribute value inside <att>value</att>.</p>
-    </remarks>
-    <listRef>
-        <ptr target="#WD"/>
-    </listRef>
+  <desc versionDate="2020-01-28" xml:lang="en">provides attributes for defining the properties of
+  non-standard characters or glyphs. </desc>
+  <desc versionDate="2020-01-28" xml:lang="de">liefert Attribute zur Definition der Eigenschaften
+  von nicht standardisierten Zeichen und Glyphen.</desc>
+  <desc versionDate="2020-02-05" xml:lang="it">fornisce attributi per definire le proprietà di caratteri o glifi non standard</desc>
+  <classes>
+    <memberOf key="att.datable"/>
+  </classes>
+  <attList org="group">
+    <attDef ident="name" usage="req">
+      <desc versionDate="2020-01-28" xml:lang="en">provides the name of the character or glyph
+        property being defined.</desc>
+      <datatype maxOccurs="1">
+        <dataRef key="teidata.xmlName"/>
+      </datatype>
+    </attDef>
+    <attDef ident="value" usage="req">
+      <desc versionDate="2020-01-28" xml:lang="en">provides the value of the character or
+        glyph property being defined.</desc>
+      <datatype>
+        <dataRef key="teidata.text"/>
+      </datatype>
+    </attDef>
+    <attDef ident="version" usage="opt">
+      <desc versionDate="2020-01-28" xml:lang="en">specifies the version number of the Unicode
+        Standard in which this property name is defined.</desc>
+      <desc versionDate="2019-07-11" xml:lang="de">gibt die Versionsnummer eines externen
+        Standards an, in dem dieser Eigenschaftsname definiert ist.</desc>
+      <datatype>
+        <dataRef key="teidata.enumerated"/>
+      </datatype>
+      <valList type="semi">
+        <valItem ident="1.0.1"/>
+        <valItem ident="1.1"/>
+        <valItem ident="2.0"/>
+        <valItem ident="2.1"/>
+        <valItem ident="3.0"/>
+        <valItem ident="3.1"/>
+        <valItem ident="3.2"/>
+        <valItem ident="4.0"/>
+        <valItem ident="4.1"/>
+        <valItem ident="5.0"/>
+        <valItem ident="5.1"/>
+        <valItem ident="5.2"/>
+        <valItem ident="6.0"/>
+        <valItem ident="6.1"/>
+        <valItem ident="6.2"/>
+        <valItem ident="6.3"/>
+        <valItem ident="7.0"/>
+        <valItem ident="8.0"/>
+        <valItem ident="9.0"/>
+        <valItem ident="10.0"/>
+        <valItem ident="11.0"/>
+        <valItem ident="12.0"/>
+        <valItem ident="12.1"/>
+        <valItem ident="13.0"/>
+        <valItem ident="14.0"/>
+        <valItem ident="15.0"/>
+        <valItem ident="unassigned"/>
+      </valList>
+    </attDef>
+    <attDef ident="scheme" usage="opt">
+      <desc versionDate="2023-08-12" xml:lang="en">supplies the name
+        of the character set system from which this property is drawn.</desc>
+      <datatype><dataRef key="teidata.enumerated"/></datatype>
+      <defaultVal>Unicode</defaultVal>
+      <valList type="open">
+        <valItem ident="Unicode">
+	  <gloss xml:lang="en" versionDate="2023-08-12">Unicode</gloss>
+	  <desc xml:lang="en" versionDate="2023-08-12">ISO 10646</desc>
+        </valItem>
+        <valItem ident="Bridwell">
+	  <gloss xml:lang="en" versionDate="2023-08-12">E. Nelson Bridwell</gloss>
+	  <desc xml:lang="en" versionDate="2023-08-12">
+	    Original character set developed by E. Nelson Bridwell as
+	    described by Al Turniansky, in use from the 1950s to 1985.</desc>
+        </valItem>
+        <valItem ident="Brewer">
+	  <gloss xml:lang="en" versionDate="2023-08-12">Georg Brewer</gloss>
+	  <desc xml:lang="en" versionDate="2023-08-12">
+	    Developed by Georg Brewer, with a look similar to the
+	    Byrne glyphs. Like the Byrne set, this is not a true
+	    character set, but rather a set of alternate glyphs.
+	  </desc>
+        </valItem>
+        <valItem ident="Doyle">
+	  <gloss xml:lang="en" versionDate="2023-08-12">Darren Doyle</gloss>
+	  <desc xml:lang="en" versionDate="2023-08-12">
+	    Glyph set (in some cases associated with multiple
+	    characters) developed by Darren Doyle as part of a
+	    comprehensive version of the language created in part for
+	    an invented language classs at UT Austin in 2006.
+	  </desc>
+        </valItem>
+	<valItem ident="Schreyer">
+	  <gloss xml:lang="en" versionDate="2023-08-12">Christine Schreyer</gloss>
+	  <desc xml:lang="en" versionDate="2023-08-12">
+	    Character set (without actual codepoints) of 153
+	    characters developed, along with pronunciation rules,
+	    roughly 300 words, and a grammar, developed by Christine
+	    Schreyer developed in 2012 for Warner Brothers.
+	  </desc>
+	</valItem>
+      </valList>
+    </attDef>
+  </attList>
+  <exemplum versionDate="2019-07-01" xml:lang="en">
+    <p>In this example a definition for the Unicode property <name>Decomposition Mapping</name>
+    is provided.</p>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"> <unicodeProp name="Decomposition_Mapping" value="circle"/> </egXML>
+  </exemplum>
+  <remarks versionDate="2019-06-29" xml:lang="en">
+    <p>All name-only attributes need an xs:boolean attribute value inside <att>value</att>.</p>
+  </remarks>
+  <listRef>
+    <ptr target="#WD"/>
+  </listRef>
 </classSpec></div></div>
 <div type="div1" xml:id="VE" n="9"><head>Verse</head>
 <div type="div2" xml:id="VEST"><head>Structural Divisions of Verse Texts</head></div>
@@ -34583,7 +34601,7 @@ Out the window the body of a dead man suddenly slams into frame
   </listRef>
 </elementSpec>
 <elementSpec module="drama" ident="caption">
-  <gloss xml:lang="en" versionDate="2007-06-12">caption</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">caption</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">sous-titre</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the text of a caption or other text displayed as part of
 a film script or screenplay.</desc>
@@ -34646,10 +34664,10 @@ laughing affectedly and drinking champagne.</view>
   <remarks versionDate="2005-01-14" xml:lang="en">
     <p>A specialized form of stage direction.</p>
   </remarks>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
+  <remarks versionDate="2007-06-12" xml:lang="fr">
     <p>Forme particulière d'indication scénique.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p>ト書きの特別な形。</p>
   </remarks>
   <listRef>
@@ -35826,7 +35844,7 @@ communication.</desc>
     <ptr target="#TSBAWR"/>
   </listRef>
 </elementSpec>
-<elementSpec module="spoken" ident="shift">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="spoken" ident="shift">
   <gloss xml:lang="en" versionDate="2009-04-17">shift</gloss>
   <gloss xml:lang="fr" versionDate="2009-04-17">changement</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">marks the point at which some paralinguistic feature of a series of
@@ -35846,16 +35864,18 @@ utterances by any one speaker changes.</desc>
   <content><empty/></content>
   <constraintSpec ident="shiftNew" scheme="schematron">
     <constraint>
-      <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="@new" role="warning">              
-The @new attribute should always be supplied; use the special value
-"normal" to indicate that the feature concerned ceases to be
-remarkable at this point.</assert>
+      <sch:rule context="tei:shift">
+        <sch:assert test="@new" role="warning">              
+          The @new attribute should always be supplied; use the special value
+          "normal" to indicate that the feature concerned ceases to be
+          remarkable at this point.
+        </sch:assert>
+      </sch:rule>       
     </constraint>
   </constraintSpec>
   <attList>
     <attDef ident="feature" usage="opt">
-      <desc versionDate="2005-01-14" xml:lang="en">a
-paralinguistic feature.</desc>
+      <desc versionDate="2005-01-14" xml:lang="en">a paralinguistic feature.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">준언어적 자질</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">附屬語言特性</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">発話(パラ言語)素性。</desc>
@@ -35925,8 +35945,7 @@ paralinguistic feature.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">명시된 준언어적 자질의 새로운 상태를 명시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">說明改變後的附屬語言特性狀況。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">発話(パラ言語)素性の、新しい状態を示す。</desc>
-      <desc versionDate="2009-04-17" xml:lang="fr">précise le nouvel état de la
-					caractéristique paralinguistique en question.</desc>
+      <desc versionDate="2009-04-17" xml:lang="fr">précise le nouvel état de la caractéristique paralinguistique en question.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">especifica el nuevo estado del fenómeno paralingüístico especificado.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica il nuovo stato del fenomeno paralinguistico specificato</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
@@ -35938,7 +35957,7 @@ paralinguistic feature.</desc>
       </remarks>
       <remarks xml:lang="fr" versionDate="2007-06-12">
         <p>Si aucune valeur n'est spécifiée, on suppose que le trait concerné cesse
-                        d'être remarquable. La valeur <q>normal</q> a le même effet.</p>
+          d'être remarquable. La valeur <q>normal</q> a le même effet.</p>
       </remarks>
       <remarks xml:lang="ja" versionDate="2008-04-05">
         <p>
@@ -35948,13 +35967,12 @@ paralinguistic feature.</desc>
       </remarks>
     </attDef>
   </attList>
- 
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <u who="#LB"><shift feature="loud" new="f"/>Elizabeth</u>
       <u who="#EB">Yes</u>
       <u who="#LB"><shift feature="loud" new="normal"/>Come and try this 
-	<pause/><shift feature="loud" new="ff"/>come on</u>
+        <pause/><shift feature="loud" new="ff"/>come on</u>
       <!-- ... -->
       <listPerson type="speakers">
         <person xml:id="LB"/>
@@ -36444,17 +36462,20 @@ l'original apparaît comme une forme fusionnée.</desc>
 </classSpec></div>
 <div type="div2" xml:id="DIEN"><head>The Structure of Dictionary Entries</head>
 <div type="div3" xml:id="DIENHI"><head>Hierarchical Levels</head>
-<elementSpec module="dictionaries" ident="superEntry">
+<elementSpec module="dictionaries" ident="superEntry" validUntil="2027-03-07">
+  <desc xml:lang="en" type="deprecationInfo" versionDate="2024-03-07">Because an <gi>entry</gi> can now occur
+  inside an <gi>entry</gi>, the <gi>superEntry</gi> element is no
+  longer needed. For instances where the <gi>superEntry</gi> element
+  was used to group multiple <gi>entry</gi> elements, these Guidelines
+  recommend using instead an outer <gi>entry</gi> element, perhaps
+  with a <att>type</att> attribute.</desc>
   <gloss xml:lang="en" versionDate="2020-12-20">super entry</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">groupe d'entrées</gloss>
-  <desc versionDate="2011-04-29" xml:lang="en">groups a sequence of entries within any kind of lexical resource, such
-  as a dictionary or lexicon which function as a single unit, for
-  example a set of homographs.</desc>
+  <desc versionDate="2011-04-29" xml:lang="en">groups a sequence of entries within any kind of lexical resource, such as a dictionary or lexicon which function as a single unit, for example a set of homographs.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">동형이의어 집합의 연속된 표제 항목을 모아 놓는다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集一組同形異義字的連續辭條。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">同形異義語の集合にある、一連の項目をまとめる。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">regroupe des entrées successives pour un ensemble
-			d'homographes.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">regroupe des entrées successives pour un ensemble d'homographes.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa las entradas sucesivas para una serie de homógrafos.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa voci successive per una serie di omografi.</desc>
   <classes>
@@ -36467,12 +36488,8 @@ l'original apparaît comme une forme fusionnée.</desc>
   <content>
     <alternate>
       <sequence>
-        
-          <elementRef key="form" minOccurs="0"/>
-        
-        
-          <elementRef key="entry" minOccurs="1" maxOccurs="unbounded"/>
-        
+        <elementRef key="form" minOccurs="0"/>
+        <elementRef key="entry" minOccurs="1" maxOccurs="unbounded"/>
       </sequence>
       <elementRef key="dictScrap"/>
     </alternate>
@@ -37945,7 +37962,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
   </listRef>
 </elementSpec>
 <elementSpec module="dictionaries" ident="case">
-  <gloss xml:lang="en" versionDate="2007-06-12">case</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">case</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">cas</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains grammatical case information given by a dictionary for a given form.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">주어진 형식에 대하여 사전에 제시된 문법적 격 정보를 포함한다.</desc>
@@ -38034,7 +38051,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
         <mentioned>dative</mentioned>, <mentioned>genitive</mentioned>, etc.</p>
     <p>This element is synonymous with <tag>gram type="case"</tag>.</p>
   </remarks>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
+  <remarks versionDate="2007-06-12" xml:lang="fr">
     <p rend="dataDesc">Peut contenir des caractères et des éléments du niveau expression.
                 Les valeurs types seront <mentioned> nominative</mentioned>,
                 <mentioned>accusative</mentioned>, <mentioned>dative</mentioned>,
@@ -38042,7 +38059,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
     <p>Cet élément est synonyme de<tag>gram type="case"</tag>
             </p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p rend="dataDesc">
     文字データまたは句レベルの要素。典型的な値は、
       <mentioned>nominative(主格)</mentioned>、<mentioned>accusative(対格)</mentioned>、<mentioned>dative(与格)</mentioned>、<mentioned>genitive(属格)
@@ -38741,10 +38758,11 @@ headword  such as noun, verb, or adjective.</desc>
   <gloss versionDate="2007-06-12" xml:lang="fr">collocation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">colocación</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">collocato</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">連語</gloss>
   <desc versionDate="2013-04-08" xml:lang="en">contains any sequence of words that co-occur with the headword with significant frequency.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">표제어의 연어를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含標題字的組合字。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">見出し語の連語関係を示す。</desc>
+  <desc versionDate="2024-02-28" xml:lang="ja">見出し語と高い頻度で共起する任意の単語の連続を含む。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient une collocation de l'entrée.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">indica la colocación de un lema</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene il collocato di un lemma.</desc>
@@ -39709,26 +39727,33 @@ headword  such as noun, verb, or adjective.</desc>
 </elementSpec></div>
 <div type="div4" xml:id="DITPNO"><head>Notes within Entries</head></div></div>
 <div type="div3" xml:id="DITPRE"><head>Related Entries</head>
-<elementSpec module="dictionaries" ident="re">
+<elementSpec module="dictionaries" ident="re" validUntil="2026-03-10">
+  <desc xml:lang="en" type="deprecationInfo" versionDate="2023-01-10"> Because an <gi>entry</gi> can
+    now occur inside an <gi>entry</gi>, the <gi>re</gi> element is no longer needed. These
+    Guidelines recommend using an <gi>entry</gi> with a <att>type</att> attribute value of
+      <val>relatedEntry</val> instead.</desc>
   <gloss versionDate="2005-01-14" xml:lang="en">related entry</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">관련 표제 항목</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">相關辭條</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">sous-entrée</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">entrada relativa</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">voce corregata</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">contains a dictionary entry for a lexical item related to the headword, such as a compound
-    phrase or derived form, embedded inside a larger entry.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko">복합어, 또는 큰 표제 항목 내부에 포함된 파생 형태와 같이 표제 항목과 관련된 어휘 항목을 포함한다.</desc>
+  <desc versionDate="2005-01-14" xml:lang="en">contains a dictionary entry for a lexical item
+    related to the headword, such as a compound phrase or derived form, embedded inside a larger
+    entry.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko">복합어, 또는 큰 표제 항목 내부에 포함된 파생 형태와 같이 표제 항목과 관련된 어휘 항목을
+    포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">和標題字相關聯的字典辭條，像是包括在一個更大辭條中的複合片語或衍生字。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">見出し語と関連する語彙項目を表す辞書項目を示す。例えば、より上位の項 目を持つ複合句、派生形など。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">見出し語と関連する語彙項目を表す辞書項目を示す。例えば、より上位の項
+    目を持つ複合句、派生形など。</desc>
   <desc versionDate="2009-04-08" xml:lang="fr">contient une entrée relative à un item lexical lié au
     mot-vedette, tel qu'un composé ou un dérivé, inclus dans une entrée plus large.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una entrada de diccionario para un elemento
     léxico relativo al lema, como p.ej. un sintagma compuesto o una forma derivada, y que se incluye
     en un entrada mayor.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene una voce di dizionario per un'unità lessicale
-    collegata al lemma, quale un sintagma composto o una forma derivata, inclusa in una voce più
-    ampia.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene una voce di dizionario per un'unità
+    lessicale collegata al lemma, quale un sintagma composto o una forma derivata, inclusa in una
+    voce più ampia.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.entryPart.top"/>
@@ -39737,22 +39762,22 @@ headword  such as noun, verb, or adjective.</desc>
     <memberOf key="att.typed"/>
   </classes>
   <content>
-    
-      <alternate minOccurs="0" maxOccurs="unbounded">
-        <textNode/>
-        <classRef key="model.gLike"/>
-        <elementRef key="sense"/>
-        <classRef key="model.entryPart.top"/>
-        <classRef key="model.phrase"/>
-        <classRef key="model.global"/>
-      </alternate>
-    
+
+    <alternate minOccurs="0" maxOccurs="unbounded">
+      <textNode/>
+      <classRef key="model.gLike"/>
+      <elementRef key="sense"/>
+      <classRef key="model.entryPart.top"/>
+      <classRef key="model.phrase"/>
+      <classRef key="model.global"/>
+    </alternate>
+
   </content>
   <exemplum xml:lang="en">
     <p>The following example from <bibl><title>Webster's New Collegiate Dictionary</title>
-        (Springfield, Mass.: G. &amp; C. Merriam Company, 1975)</bibl> shows a single related
-      entry for which no definition is given, since its meaning is held to be readily derivable from
-      the root entry:</p>
+        (Springfield, Mass.: G. &amp; C. Merriam Company, 1975)</bibl> shows a single related entry
+      for which no definition is given, since its meaning is held to be readily derivable from the
+      root entry:</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <entry>
         <form>
@@ -39766,7 +39791,7 @@ headword  such as noun, verb, or adjective.</desc>
           <def>of, relating to, or affecting a nerve or the nervous system</def>
         </sense>
         <sense n="2"> ... </sense>
-        <re>
+        <entry type="relatedEntry">
           <form>
             <orth>neurally</orth>
             <pron extent="suff">-ə-lē</pron>
@@ -39774,7 +39799,7 @@ headword  such as noun, verb, or adjective.</desc>
           <gramGrp>
             <pos>adv</pos>
           </gramGrp>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -39791,7 +39816,7 @@ headword  such as noun, verb, or adjective.</desc>
         <sense>
           <def>Faire fonctionner un siphon, transvaser (un liquide) au moyen d'un siphon.</def>
         </sense>
-        <re>
+        <entry type="relatedEntry">
           <form>
             <orth>siphonnage</orth>
             <pron extent="suff">[as]</pron>
@@ -39799,7 +39824,7 @@ headword  such as noun, verb, or adjective.</desc>
           <gramGrp>
             <pos>n.</pos>
           </gramGrp>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -39816,27 +39841,27 @@ headword  such as noun, verb, or adjective.</desc>
         <sense n="1."><def>Art de conduire les affaires de l'Etat</def> ; </sense>
         <sense n="2."><def>Ligne de conduite raisonnée</def> ; </sense>
         <sense n="3.">
-          <def>Habileté manifestée dans les rapports avec les autres et qui consiste
-              essentiellement à amener autrui à faire ce que l'on désire, sans pour autant dévoiler
-              ses propres intentions.</def>
+          <def>Habileté manifestée dans les rapports avec les autres et qui consiste essentiellement
+            à amener autrui à faire ce que l'on désire, sans pour autant dévoiler ses propres
+            intentions.</def>
         </sense>
-        <re>
+        <entry type="relatedEntry">
           <form><orth>politicisme</orth> : </form>
-          <sense><def>théorie selon laquelle les événements et les transformations historiques sont dus
-                essentiellement à la politique et à ses évolutions</def> ; </sense>
-        </re>
-        <re>
+          <sense><def>théorie selon laquelle les événements et les transformations historiques sont
+              dus essentiellement à la politique et à ses évolutions</def> ; </sense>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>politiciste</orth> : </form>
           <sense><def>qui relève du politicisme ou lui est propre</def> ; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>politicomanie</orth> : </form>
           <sense><def>manie de la politique</def> ; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>politicaille</orth> : </form>
           <sense><def>politique envisagée sous un angle déprécié ou méprisable</def>.</sense>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -39850,33 +39875,32 @@ headword  such as noun, verb, or adjective.</desc>
           <pos>élém. formant</pos>
         </gramGrp>
         <sense><def>entrant dans la constr. de subst. désignant des unités de mesure, dans tous les
-              domaines de la phys., valant mille fois l'unité de base </def> ; <xr>v.
-                <ref>kilogramme, kilogrammètre, kilomètre, kilotonne, kilowatt et aussi :
-            </ref>
-               </xr>
-            </sense>
-        <re>
+            domaines de la phys., valant mille fois l'unité de base </def> ; <xr>v. <ref>kilogramme,
+              kilogrammètre, kilomètre, kilotonne, kilowatt et aussi : </ref>
+          </xr>
+        </sense>
+        <entry type="relatedEntry">
           <form><orth>kilocalorie </orth> : </form>
           <sense><def> unité de mesure de quantité de chaleur valant mille calories (<abbr type="symb">symb. kcal</abbr>)</def> ; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>kilohertz</orth> : </form>
-          <sense><def>Unité de mesure de fréquence valant mille hertz (<abbr type="symb">kHz</abbr> )</def> ; </sense>
-        </re>
-        <re>
+          <sense><def>Unité de mesure de fréquence valant mille hertz (<abbr type="symb">kHz</abbr>
+              )</def> ; </sense>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>kilojoule</orth> : </form>
           <sense><def>unité de mesure de travail valant mille joules (<abbr type="symb">kJ</abbr>)
-              </def> ; </sense>
-        </re>
-        <re>
+            </def> ; </sense>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>kiloparsec</orth> : </form>
-          <sense><def>unité de mesure de longueur astronomique valant mille parsecs</def> ;
-            </sense>
-        </re>
-        <re>
+          <sense><def>unité de mesure de longueur astronomique valant mille parsecs</def> ; </sense>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth>kilovolt</orth> : </form>
           <sense><def>unité de mesure de différences de potentiel, valant mille volts (<abbr type="symb">kv</abbr>)</def>.</sense>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -39894,7 +39918,7 @@ headword  such as noun, verb, or adjective.</desc>
           <def>不馴順；狡猾不易對付。</def>
         </sense>
         <sense n="2"> ... </sense>
-        <re>
+        <entry type="relatedEntry">
           <form>
             <orth>調皮地</orth>
             <pron extent="suff">tiau2 pi2 de</pron>
@@ -39902,7 +39926,7 @@ headword  such as noun, verb, or adjective.</desc>
           <gramGrp>
             <pos>副詞</pos>
           </gramGrp>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -39918,28 +39942,28 @@ headword  such as noun, verb, or adjective.</desc>
         <sense n="1."><usg type="domain"> 昆蟲學</usg>,<def> 蜜蜂 </def>. </sense>
         <sense n="2."><def> 忙碌的蜜蜂，工作狂 </def>。</sense>
         <sense n="3."><usg orig="A." type="domain"> 天文學 </usg>, <def> 蒼蠅座</def> — </sense>
-        <re>
+        <entry type="relatedEntry">
           <form><orth orig="a. albanila"> abeja albanila </orth>, </form>
           <sense><def>石巢蜂 </def>; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth orig="a. carpintera"> abeja carpintera </orth>, </form>
           <sense><def> 木匠蜂 </def>; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form>
             <orth xml:id="zh-tw_re-o1" orig="a. reina or maestra"> abeja reina </orth>
             <orth mergedIn="#zh-tw_re-o1"> abeja maestra </orth>
           </form>
           <sense><def> 女王蜂</def>; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form>
             <orth xml:id="zh-tw_re-o2" orig="a. neutra or obrera"> abeja neutra </orth>
             <orth mergedIn="#zh-tw_re-o2"> abeja obrera </orth>
           </form>
           <sense><def> 工蜂 </def> 。</sense>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -39948,9 +39972,8 @@ headword  such as noun, verb, or adjective.</desc>
           Inglés-Español y Español-Inglés</title> / <title>The University of Chicago Spanish
           Dictionary</title>, Fourth Edition, compiled by Carlos Castillo and Otto F. Bond (Chicago:
         University of Chicago Press, 1987)</bibl> shows a number of related entries embedded in the
-      main entry. The original entry resembles the following:<q rend="display"><hi rend="bold">abeja</hi> [a·bé·xa]<hi rend="it">f.</hi> bee;<hi rend="bold">abejera</hi> [a·be·xé·ra]<hi rend="it">f.</hi> beehive;<hi rend="bold">abejón</hi> [a·be·xóon]<hi rend="it">m.</hi>
-        drone; bumblebee;<hi rend="bold">abejorro</hi> [a·be·xó·rro]<hi rend="it">m.</hi> bumble
-        bee.</q> One encoding for this entry would be:</p>
+      main entry. The original entry resembles the following:<q rend="display"><hi rend="bold">abeja</hi> [a·bé·xa]<hi rend="it">f.</hi> bee;<hi rend="bold">abejera</hi>
+          [a·be·xé·ra]<hi rend="it">f.</hi> beehive;<hi rend="bold">abejón</hi> [a·be·xóon]<hi rend="it">m.</hi> drone; bumblebee;<hi rend="bold">abejorro</hi> [a·be·xó·rro]<hi rend="it">m.</hi> bumble bee.</q> One encoding for this entry would be:</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <entry>
         <form>
@@ -39962,28 +39985,28 @@ headword  such as noun, verb, or adjective.</desc>
         <sense n="1."><usg type="domain"> (ento.) </usg><def> bee </def>. </sense>
         <sense n="2."><def> busy bee, hard worker </def>. </sense>
         <sense n="3."><usg orig="A." type="domain"> (astron.) </usg>, <def> Musca </def> — </sense>
-        <re>
+        <entry type="relatedEntry">
           <form><orth orig="a. albanila"> abeja albanila </orth>, </form>
           <sense><def>mason bee</def>;</sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth orig="a. carpintera"> abeja carpintera </orth>, </form>
           <sense><def>carpenter bee </def>;</sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form>
             <orth xml:id="re-o3" orig="a. reina or maestra"> abeja reina </orth>
             <orth mergedIn="#re-o4"> abeja maestra </orth>
           </form>
           <sense><def> queen bee </def>;</sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form>
             <orth xml:id="re-o4" orig="a. neutra or obrera"> abeja neutra </orth>
             <orth mergedIn="#re-o3"> abeja obrera </orth>
           </form>
           <sense><def>worker bee</def>.</sense>
-        </re>
+        </entry>
       </entry>
     </egXML>
     <!-- 
@@ -39995,17 +40018,14 @@ headword  such as noun, verb, or adjective.</desc>
     <!-- Also did the same for the below example &mdash; Syd, 2004-12-15 -->
   </exemplum>
   <exemplum xml:lang="en">
-    <p>In the much larger Simon &amp; Schuster Spanish-English
-    dictionary (<bibl>Tana de Gámez, ed., <title>Simon and Schuster's
-    International Dictionary</title> (New York: Simon and Schuster,
-    1973).</bibl>) these derived forms of <mentioned>abeja</mentioned>
-    are treated as separate main entries, but there are other embedded
-    phrases shown as <gi>re</gi>s in its main entry for
-    <mentioned>abeja</mentioned>:<q rend="display">abeja,
-    f. 1. (ento.) bee. 2. busy bee, hard worker. 3. (astron.) A.,
-    Musca. — a. albanila, mason bee; a. carpintera, carpenter bee; a.
-    reina or maestra, queen bee; a. neutra or obrera, worker bee.</q>
-    This entry may be encoded thus:</p>
+    <p>In the much larger Simon &amp; Schuster Spanish-English dictionary (<bibl>Tana de Gámez, ed.,
+          <title>Simon and Schuster's International Dictionary</title> (New York: Simon and
+        Schuster, 1973).</bibl>) these derived forms of <mentioned>abeja</mentioned> are treated as
+      separate main entries, but there are other embedded phrases shown as <gi>re</gi>s in its main
+      entry for <mentioned>abeja</mentioned>:<q rend="display">abeja, f. 1. (ento.) bee. 2. busy
+        bee, hard worker. 3. (astron.) A., Musca. — a. albanila, mason bee; a. carpintera, carpenter
+        bee; a. reina or maestra, queen bee; a. neutra or obrera, worker bee.</q> This entry may be
+      encoded thus:</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <entry>
         <form>
@@ -40017,28 +40037,28 @@ headword  such as noun, verb, or adjective.</desc>
         <sense n="1."><usg type="domain">(ento.)</usg><def>bee</def>. </sense>
         <sense n="2."><def>busy bee, hard worker</def>. </sense>
         <sense n="3."><usg orig="A." type="domain">(astron.)</usg>, <def>Musca</def> — </sense>
-        <re>
+        <entry type="relatedEntry">
           <form><orth orig="a. albanila">abeja albanila</orth>, </form>
           <sense><def>mason bee</def>; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form><orth orig="a. carpintera">abeja carpintera</orth>, </form>
           <sense><def>carpenter bee</def>; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form>
             <orth xml:id="re-o1" orig="a. reina or maestra">abeja reina</orth>
             <orth mergedIn="#re-o1">abeja maestra</orth>
           </form>
           <sense><def>queen bee</def>; </sense>
-        </re>
-        <re>
+        </entry>
+        <entry type="relatedEntry">
           <form>
             <orth xml:id="re-o2" orig="a. neutra or obrera">abeja neutra</orth>
             <orth mergedIn="#re-o2">abeja obrera</orth>
           </form>
           <sense><def>worker bee</def>. </sense>
-        </re>
+        </entry>
       </entry>
     </egXML>
   </exemplum>
@@ -40056,8 +40076,8 @@ headword  such as noun, verb, or adjective.</desc>
     <p>Dans les sous-éléments, il est identique à un élément<gi>entry</gi>, et utilisé là où un
       dictionnaire a enchâssé dans une entrée des informations qui auraient pu donner lieu à une
       entrée séparée. Quelques-uns font une distinction entre les sous-entrées, les entrées en
-      continu et différents autres types d'entrées dérivées ; aucune de ces typologies n'a été utilisée
-      ici. </p>
+      continu et différents autres types d'entrées dérivées ; aucune de ces typologies n'a été
+      utilisée ici. </p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p rend="dataDesc"> 辞書モジュールで定義されている他の要素と混合して、文字データをとる かもしれない。 </p>
@@ -40546,15 +40566,11 @@ headword  such as noun, verb, or adjective.</desc>
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="CATCHWORDS" ident="catchwords">
   <gloss xml:lang="en" versionDate="2007-06-12">catchwords</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">réclames</gloss>
-  <desc versionDate="2019-01-17" xml:lang="en" xml:id="catchwords.desc">describes the system used to ensure
-correct ordering of the quires or similar making up a codex, incunable, or other object 
-typically by means of annotations at the foot of the page.</desc>
+  <desc versionDate="2019-01-17" xml:lang="en" xml:id="catchwords.desc">describes the system used to ensure correct ordering of the quires or similar making up a codex, incunable, or other object typically by means of annotations at the foot of the page.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">일반적으로 페이지의 밑에 표시되며, 제본되지 않은 원고 또는 고판본의 정확한 순서를 보장하는 체계를 기술한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">描述一疊書頁裝訂成手抄本或書冊時，確保書頁順序無誤的方法，通常是利用頁腳的註記。</desc>
   <desc versionDate="2023-10-02" xml:lang="ja">古い冊子本や刊本にみられる、折丁の正しい順序を確認するためのシステムについて記述する。一般には、ページの脚に注記される。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">décrit le système utilisé pour s'assurer que les
-      cahiers formant un manuscrit ou un incunable sont dans le bon ordre, typiquement au moyen
-      d'annotations en bas de page.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">décrit le système utilisé pour s'assurer que les cahiers formant un manuscrit ou un incunable sont dans le bon ordre, typiquement au moyen d'annotations en bas de page.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">describe el sistema utilizado para garantizar la ordenación correcta de los cuadernos que constituyen un códex o un incunable, obtenido normalmente por medio de anotaciones a pie de página.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">descrive il sistema utilizzato per garantire l'ordinamento corretto dei quaderni che costituiscono un codice o incunabolo, ottenuto solitamente tramite annotazioni a piè di pagina</desc>
   <classes>
@@ -40572,9 +40588,11 @@ typically by means of annotations at the foot of the page.</desc>
          to test this the content of <egXML>s have been extracted and
          put in the TEI namespace for testing.
          At least, that's what I think is going on. —Syd, 2018-10-01
-      -->
+    -->
     <constraint>
-      <sch:assert test="ancestor::tei:msDesc or ancestor::tei:egXML">The <sch:name/> element should not be used outside of msDesc.</sch:assert>
+      <sch:rule context="tei:catchwords">
+        <sch:assert test="ancestor::tei:msDesc or ancestor::tei:egXML">The <sch:name/> element should not be used outside of msDesc.</sch:assert>
+      </sch:rule>
     </constraint> 
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -40587,7 +40605,7 @@ the inner bounding line, reading from top to bottom.</catchwords>
     <ptr target="#msmisc"/>
   </listRef>
 </elementSpec>
-<elementSpec module="msdescription" xml:id="DIMENSIONS" ident="dimensions">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="DIMENSIONS" ident="dimensions">
   <gloss xml:lang="en" versionDate="2009-04-17">dimensions</gloss>
   <gloss xml:lang="fr" versionDate="2009-04-17">dimensions</gloss>
   <desc versionDate="2007-08-02" xml:lang="en" xml:id="dimensions.desc">contains a dimensional specification.</desc>
@@ -40610,16 +40628,22 @@ the inner bounding line, reading from top to bottom.</catchwords>
     </alternate>
   </content>
   <constraintSpec scheme="schematron" ident="duplicateDim">
+    <!-- It would be simpler to use just
+         "( count(tei:width), count(tei:height), count(tei:depth) ) > 1",
+         but then we would not be able to tell the user which element
+         had too many occurences. -->
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="count(tei:width)&gt; 1">
-        The element <name/> may appear once only
-      </report>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="count(tei:height)&gt; 1">
-        The element <name/> may appear once only
-      </report>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="count(tei:depth)&gt; 1">
-        The element <name/> may appear once only
-      </report>
+      <sch:rule context="tei:dimensions">
+        <sch:report test="count(tei:width) gt 1">
+          The element <sch:name/> may appear once only
+        </sch:report>
+        <sch:report test="count(tei:height) gt 1">
+          The element <sch:name/> may appear once only
+        </sch:report>
+        <sch:report test="count(tei:depth) gt 1">
+          The element <sch:name/> may appear once only
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -40634,16 +40658,12 @@ the inner bounding line, reading from top to bottom.</catchwords>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <valList type="open" mode="add">
         <valItem ident="leaves">
-          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to one or more leaves (e.g. a single leaf, a
-gathering, or a separately bound part)</desc>
+          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to one or more leaves (e.g. a single leaf, a gathering, or a separately bound part)</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">하나 이상의 종이의 장과 관련된 차원(예, 한 장, 접지 모음, 또는 각각 분리되어 엮여진 부분)</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">一張或多張頁面的尺寸大小 (例如單一頁面、聚集頁面、或分開裝訂的部份)</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se relacionan con una o más hojas (p.ej. una sola hoja, un conjunto, o un intervalo)</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">葉の状態を示す。例えば、一葉、葉の丁合(折丁)、独立した一枚を
-  まとめたもの、など。</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent une ou
-plusieurs feuilles (par exemple une feuille unique, un ensemble de
-feuilles ou une partie reliée séparément).</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">葉の状態を示す。例えば、一葉、葉の丁合(折丁)、独立した一枚を まとめたもの、など。</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent une ou plusieurs feuilles (par exemple une feuille unique, un ensemble de feuilles ou une partie reliée séparément).</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono a uno o più fogli (per esempio un foglio, una raccolta, o una parte rilegata separatamente)</desc>
         </valItem>
         <valItem ident="ruled">
@@ -40654,38 +40674,26 @@ preparation for writing.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se refieren al área de una hoja que se ha preparado para la escritura.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">書記の準備として罫が引かれている領域を示す。       
         </desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone de
-la réglure d'une feuille.</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone de la réglure d'une feuille.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono alla porzione di un foglio sulla quale sono state disegnate delle righe al fine di scriverci</desc>
         </valItem>
         <valItem ident="pricked">
-          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to the area of a leaf which has been pricked
-out in preparation for ruling (used where this differs significantly
-from the ruled area, or where the ruling is not measurable).</desc>
+          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to the area of a leaf which has been pricked out in preparation for ruling (used where this differs significantly from the ruled area, or where the ruling is not measurable).</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">(줄 그은 영역과 다르거나 영역 구분이 측정되지 않은 곳에서 사용되는) 줄을 긋기 위한 준비 과정에서 구멍 뚫은 영역과 관련된 차원</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">頁面上刺好記號以備劃線的範圍大小 (用在和畫線範圍不同的位置，或是畫線無法測量的位置) 。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se refieren al área de una hoja que ha sido agujereada en la preparación para la escritura (utilizado donde esto difiere significativamente del área lineada, o donde la lineación no es mensurable).</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">罫を引く準備として開けられた穴がある領域を示す。これは、罫付
-  き領域とも、罫が読み取れない領域とも異なる。</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone
-d'une feuille qui a été piquée pour préparer la réglure (à utiliser
-lorsqu'elle diffère significativement de la zone réglée ou lorsque la
-réglure n'est pas mesurable).</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">罫を引く準備として開けられた穴がある領域を示す。これは、罫付 き領域とも、罫が読み取れない領域とも異なる。</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone d'une feuille qui a été piquée pour préparer la réglure (à utiliser lorsqu'elle diffère significativement de la zone réglée ou lorsque la réglure n'est pas mesurable).</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono alla porzione di un foglio sulla quale è stata indicata la posizione dei fori da praticare al fine di imprimervi delle righe (si usa quando la porzione da rigare è molto diversa da quella già rigata o quando la rigatura non è misurabile)</desc>
         </valItem>
         <valItem ident="written">
-          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to the area of a leaf which has been written,
-with the height measured from the top of the minims on the top line of
-writing, to the bottom of the minims on the bottom line of writing.</desc>
+          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to the area of a leaf which has been written, with the height measured from the top of the minims on the top line of writing, to the bottom of the minims on the bottom line of writing.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">글의 첫 번째 줄 상단부터 마지막 줄 하단까지 측정된 높이를 통해 한 장의 글 쓴 영역과 관련된 차원</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">頁面上已書寫文字的範圍大小，高度由最頂行文字的頂端測量至最底行文字的底端。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se refiere al área de una hoja que ha sido escrita, con la altura medida desde la línea superior de escritura a la parte inferior de la última línea de la escritura.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">書記領域を示す。先頭文字行から最終文字行までの高さ。
         </desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone
-écrite de la feuille, dont la hauteur est mesurée depuis le haut des
-blancs sur la ligne d'écriture supérieure jusqu'au dernier des blancs
-sur la dernière ligne écrite.</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone écrite de la feuille, dont la hauteur est mesurée depuis le haut des blancs sur la ligne d'écriture supérieure jusqu'au dernier des blancs sur la dernière ligne écrite.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono ad un'area del foglio su cui è stato scritto e la cui altezza è misurata dalla cima degli uncini sulla prima riga scritta fino al fondo degli uncini sull'ultima riga scritta</desc>
         </valItem>
         <valItem ident="miniatures">
@@ -40708,14 +40716,12 @@ sur la dernière ligne écrite.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono alla rilegatura nella quale è contenuto il codice o manoscritto</desc>
         </valItem>
         <valItem ident="box">
-          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to the box or other container in which  the
-manuscript is stored.</desc>
+          <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to the box or other container in which  the manuscript is stored.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">원고가 보관된 박스 또는 용기와 관련된 차원</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">手稿所儲存的箱子或其他容器的尺寸大小</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se refieren a la caja o a cualquier otro contenedor en qué se conserva el manuscrito.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該写本を入れるケースの大きさを示す。</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la boîte ou
-autre conteneur dans lequel le manuscrit est conservé.</desc>
+          <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la boîte ou autre conteneur dans lequel le manuscrit est conservé.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono alla scatola o ad altro contenitore nel quale è custodito il manoscritto</desc>
         </valItem>
       </valList>
@@ -41518,15 +41524,12 @@ printing.</p>
   <gloss versionDate="2008-04-06" xml:lang="es">segundo folio</gloss>
   <gloss versionDate="2008-03-30" xml:lang="fr">deuxième folio</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">secondo foglio</gloss>
-  <desc versionDate="2012-12-27" xml:lang="en" xml:id="secfol.desc">marks the word or words taken from a fixed point in a codex 
-    (typically the beginning of the second leaf) in order to provide a unique identifier for it.
+  <desc versionDate="2012-12-27" xml:lang="en" xml:id="secfol.desc">marks the word or words taken from a fixed point in a codex (typically the beginning of the second leaf) in order to provide a unique identifier for it.
 </desc>
   <desc versionDate="2007-12-20" xml:lang="ko">고유한 확인소를 제공하기 위해 미제본 원고의 고정 위치(일반적으로 두 번째 장의 시작)에서 얻어진 단어 또는 단어군</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">從手抄本中固定位置所拿開的一個或多個字 (通常在第二張書頁的開頭) ，目的是提供一個專有的識別符號。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">ユニークな識別子を示すために、冊子中の特定点にある単語を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">le mot ou les mots repris d'un point précisément
-      connu d'un codex (comme le début du second feuillet) pour identifier celui-ci de façon
-      univoque.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">le mot ou les mots repris d'un point précisément connu d'un codex (comme le début du second feuillet) pour identifier celui-ci de façon univoque.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">la palabra o palabras extraídas de un punto preciso de un códex (normalmente el inicio del segundo folio) con el fin de identificar lo mismo en modo unívoco.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">la parola o le parole estratte da un punto preciso di un codice (di solito l'inizio del secondo foglio) al fine di identificare lo stesso in modo univoco</desc>
   <classes>
@@ -41546,7 +41549,9 @@ printing.</p>
          At least, that's what I think is going on. —Syd, 2018-10-01
       -->
     <constraint>
-      <sch:assert test="ancestor::tei:msDesc or ancestor::tei:egXML">The <sch:name/> element should not be used outside of msDesc.</sch:assert>
+      <sch:rule context="tei:secFol">
+        <sch:assert test="ancestor::tei:msDesc or ancestor::tei:egXML">The <sch:name/> element should not be used outside of msDesc.</sch:assert>
+      </sch:rule>
     </constraint> 
   </constraintSpec>
   <exemplum xml:lang="mul">
@@ -41595,7 +41600,9 @@ printing.</p>
          At least, that's what I think is going on. —Syd, 2018-10-01
       -->
     <constraint>
-      <sch:assert test="ancestor::tei:msDesc or ancestor::tei:egXML">The <sch:name/> element should not be used outside of msDesc.</sch:assert>
+      <sch:rule context="tei:signatures">
+        <sch:assert test="ancestor::tei:msDesc or ancestor::tei:egXML">The <sch:name/> element should not be used outside of msDesc.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -41751,15 +41758,14 @@ manii imperii <stamp>Bodleian stamp</stamp>
   </listRef>
 </elementSpec></div></div>
 <div type="div2" xml:id="msid"><head>The Manuscript Identifier</head>
-<elementSpec module="msdescription" xml:id="MSIDENTIFIER" ident="msIdentifier">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="MSIDENTIFIER" ident="msIdentifier">
   <gloss versionDate="2007-07-04" xml:lang="en">manuscript identifier</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">원고 확인소</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
   <gloss versionDate="2008-04-06" xml:lang="es">identificador del manuscrito</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">identifiant du manuscrit</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">identificatore del manoscritto</gloss>
-  <desc versionDate="2019-01-17" xml:lang="en" xml:id="msidentifier.desc">contains the information required to identify
-the manuscript or similar object being described.</desc>
+  <desc versionDate="2019-01-17" xml:lang="en" xml:id="msidentifier.desc">contains the information required to identify the manuscript or similar object being described.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">기술되고 있는 원고를 식별하기 위해 필요한 정보를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含識別敘述中的手稿所需要的資訊。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">解説されている手書き資料を特定するために必要な情報を示す。</desc>
@@ -41788,7 +41794,9 @@ the manuscript or similar object being described.</desc>
   </content>
   <constraintSpec scheme="schematron" ident="msId_minimal">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="not(parent::tei:msPart) and (local-name(*[1])='idno' or local-name(*[1])='altIdentifier' or normalize-space(.)='')">An msIdentifier must contain either a repository or location.</report>
+      <sch:rule context="tei:msIdentifier">
+        <sch:report test="not( parent::tei:msPart )                           and                           ( child::*[1]/self::idno  or  child::*[1]/self::altIdentifier  or  normalize-space(.) eq '')">An msIdentifier must contain either a repository or location.</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -45232,8 +45240,8 @@ concerning a single identifiable episode during the history of a manuscript, man
   </listRef>
 </elementSpec>
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="ACQUISITION" ident="acquisition">
-  <gloss xml:lang="en" versionDate="2007-06-12">acquisition</gloss>
-  <gloss xml:lang="es" versionDate="2022-06-16">adquisición</gloss>
+  <gloss versionDate="2007-06-12" xml:lang="en">acquisition</gloss>
+  <gloss versionDate="2022-06-16" xml:lang="es">adquisición</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">acquisition</gloss>
   <desc versionDate="2019-01-17" xml:lang="en" xml:id="acquisn.desc">contains any descriptive or other information
 concerning the process by which a manuscript or manuscript part or other object entered the holding
@@ -45265,7 +45273,7 @@ institution.</desc>
             date represented by the content of this element belongs.</desc>
         <desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
         <desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
-        <desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
+        <desc versionDate="2019-02-03" xml:lang="ja">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
         <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
             appartient la date exprimée dans le contenu de l'élément.</desc>
         <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
@@ -46790,17 +46798,13 @@ en-tête et un texte, constitue un document TEI.</desc>
   <gloss versionDate="2007-05-04" xml:lang="es">fragmento de texto añadido</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">porzione di testo aggiunta</gloss>
   <gloss versionDate="2018-12-28" xml:lang="ja">追加テキストの範囲</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">marks the beginning of a longer sequence of text added by an
-  author, scribe, annotator or corrector (see also <gi>add</gi>).</desc>
+  <desc versionDate="2005-01-14" xml:lang="en">marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <gi>add</gi>).</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">저자, 필기사, 주석자, 또는 교정자에 의해 추가된 긴 연쇄의 텍스트 시작부를 표시한다.(<gi>add</gi> 참조)</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標記由作者、抄寫者、註解者或更正者所加入的較長連續文字之開端  (參照<gi>add</gi>) 。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">著者、筆写者、注釈者、校正者の手による長めの追加テキストを挿入する始
-  点を示す(<gi>add</gi>も参照のこと)。</desc>
-  <desc versionDate="2009-11-16" xml:lang="fr">marque le début d'une longue partie de texte ajoutée par un auteur, un copiste, un annotateur ou
-  un correcteur (voir aussi <gi>add</gi>).</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">著者、筆写者、注釈者、校正者の手による長めの追加テキストを挿入する始 点を示す(<gi>add</gi>も参照のこと)。</desc>
+  <desc versionDate="2009-11-16" xml:lang="fr">marque le début d'une longue partie de texte ajoutée par un auteur, un copiste, un annotateur ou un correcteur (voir aussi <gi>add</gi>).</desc>
   <desc versionDate="2007-05-04" xml:lang="es">señala el inicio de un fragmento largo de texto añadido por un autor, un transcriptor, un comentarista o un corrector (ver también <gi>add</gi>).</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">segnala l'inizio di una porzione di testo più lunga aggiunta 
-  da un autore, un trascrittore, un annotatore o un correttore (vedi anche <gi>add</gi>)</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">segnala l'inizio di una porzione di testo più lunga aggiunta da un autore, un trascrittore, un annotatore o un correttore (vedi anche <gi>add</gi>)</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.global.edit"/>
@@ -46813,12 +46817,16 @@ en-tête et un texte, constitue un document TEI.</desc>
   <content><empty/></content>
   <constraintSpec ident="addSpan-requires-spanTo" scheme="schematron">
     <constraint>
-      <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+      <sch:rule context="tei:addSpan">
+        <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="addSpan-requires-spanTo-fr" scheme="schematron" xml:lang="fr">
     <constraint>
-      <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+      <sch:rule context="tei:addSpan">
+        <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -46855,11 +46863,11 @@ en-tête et un texte, constitue un document TEI.</desc>
     end by the <att>spanTo</att> attribute.</p>
   </remarks>
   <remarks versionDate="2018-09-08" xml:lang="es"><p>Tanto el inicio como el final del material que se agrego debe ser marcado; el inicio con el mismo elemento <gi>addSpan</gi>  y el final con el atributo <att>spanTo</att>.</p></remarks>
-  <remarks xml:lang="fr" versionDate="2009-11-16">
+  <remarks versionDate="2009-11-16" xml:lang="fr">
     <p>Le début et la fin de la partie de texte ajoutée doivent être marqués ; le début, par l'élément
                     <gi>addSpan</gi> lui-même, la fin, par l'attribut <att>spanTo</att>.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p>
     追加する情報の始めと終わりの両方にマークアップすべきである。
     始めは、要素<gi>addSpan</gi>自身によって、終わりは属性
@@ -46947,14 +46955,11 @@ appropriate for which circumstance.</p>
   <gloss versionDate="2008-04-06" xml:lang="es">fragmento de texto dañado</gloss>
   <gloss versionDate="2008-03-30" xml:lang="fr">partie de texte endommagée</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">porzione di testo danneggiata</gloss>
-  <desc versionDate="2007-09-03" xml:lang="en">marks the beginning of a longer sequence of text which is
-  damaged in some way but still legible.</desc>
+  <desc versionDate="2007-09-03" xml:lang="en">marks the beginning of a longer sequence of text which is damaged in some way but still legible.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">어떤 방식으로 손상되었지만 여전히 읽을 수 있는 긴 텍스트 연쇄 시작부를 표시한다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">marca el inicio de una secuencia de texto larga dañada de alguna manera pero aún legible.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">読める程度の損傷がある、一連のテキストの始点を示す。
-</desc>
-  <desc versionDate="2009-11-16" xml:lang="fr">marque le début d'une longue partie de texte,
-endommagée d'une manière quelconque mais toujours lisible.</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">読める程度の損傷がある、一連のテキストの始点を示す。 </desc>
+  <desc versionDate="2009-11-16" xml:lang="fr">marque le début d'une longue partie de texte, endommagée d'une manière quelconque mais toujours lisible.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">segnala l'inizio di una sequenza più estesa di testo danneggiata ma ancora leggibile</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -46966,13 +46971,17 @@ endommagée d'une manière quelconque mais toujours lisible.</desc>
   <content><empty/></content>
   <constraintSpec ident="damageSpan-requires-spanTo" scheme="schematron">
     <constraint>
-      <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+      <sch:rule context="tei:damageSpan">
+        <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <!-- FC j'ai traduit ici la contrainte schematron -->
   <constraintSpec ident="damageSpan-requires-spanTo-fr" scheme="schematron" xml:lang="fr">
     <constraint>
-      <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+      <sch:rule context="tei:damageSpan">
+        <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -47052,14 +47061,10 @@ the start of the  <anchor xml:id="a34"/> undamaged part of the text. ...</p>
   <gloss versionDate="2007-06-12" xml:lang="fr">partie de texte supprimée</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">fragmento de texto omitido</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">porzione di testo cancellata</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">marks the beginning of a longer sequence of text deleted,
-marked as deleted, or otherwise signaled as superfluous or spurious by an
-author, scribe, annotator, or corrector.</desc>
+  <desc versionDate="2005-01-14" xml:lang="en">marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">작가, 필기사, 주석자 또는 교정자에 의해 삭제되었다고 표시되었거나, 잉여적으로 추가되거나 위조된 것으로 표시된 긴 연쇄의 텍스트 시작부를 표시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標記一較長連續性文字之開端，該文字由作者、抄寫者、註解者、或更正者刪除、標上刪除記號、或者標明為多餘或偽造。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">著者・筆写者・注釈者・校正者により、削除または削除として符号化または
-  余分なものまたは間違いとして示されている、長めのテキスト部分の始点を
-  示す。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">著者・筆写者・注釈者・校正者により、削除または削除として符号化または 余分なものまたは間違いとして示されている、長めのテキスト部分の始点を 示す。</desc>
   <desc versionDate="2009-11-16" xml:lang="fr">marque le début d'une longue partie de texte supprimée, signalée comme supprimée ou bien signalée comme superflue ou fausse par un auteur, un copiste, un annotateur ou un correcteur.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">señala el inicio de un fragmento largo de texto omitido, o marcado como cancelado o como supérfluo o espurio, por un autor, un transcriptor, un comentarista o un corrector.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">segnala l'inizio di una porzione di testo più lunga cancellata, indicata come cancellata, o indicata come superflua o spuria da un autore, un trascrittore, un annotatore o un correttore</desc>
@@ -47074,13 +47079,17 @@ author, scribe, annotator, or corrector.</desc>
   <content><empty/></content>
   <constraintSpec ident="delSpan-requires-spanTo" scheme="schematron">
     <constraint>
-      <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+      <sch:rule context="tei:delSpan">
+        <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <!-- FC j'ai traduit ici la contrainte schematron -->
   <constraintSpec ident="delSpan-requires-spanTo-fr" scheme="schematron" xml:lang="fr">
     <constraint>
-      <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+      <sch:rule context="tei:delSpan">
+        <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -47705,19 +47714,17 @@ used to mark normal inter-word space or the like.</p>
     <ptr target="#PHSP"/>
   </listRef>
 </elementSpec>
-<elementSpec module="transcr" ident="subst">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="transcr" ident="subst">
   <gloss versionDate="2007-09-02" xml:lang="en">substitution</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">대체</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">substitución</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">sostituzione</gloss>
   <gloss versionDate="2008-10-02" xml:lang="fr"> substitution</gloss>
-  <desc versionDate="2020-08-11" xml:lang="en">groups one or more deletions (or surplus text) with one or more additions when
-  the combination is to be regarded as a single intervention in the text.</desc>
+  <desc versionDate="2020-08-11" xml:lang="en">groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">결합이 텍스트에서 단일 조작으로 간주될 때 하나 이상의 삭제를 하나 이상의 추가 사항으로 대체한다.</desc>
   <desc xml:lang="fr" versionDate="2009-11-16">regroupe une ou plusieurs parties de texte supprimées et une ou plusieurs parties de texte ajoutées, lorsque cette combinaison peut être considérée comme une intervention unique sur le texte.</desc>
   <desc versionDate="2021-02-04" xml:lang="es">agrupa una o más cancelaciones con una o más adiciones cuando la combinación se considera una única intervención en el texto.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">追加と削除が一連の調整と考えられる場合、そのひとつ以上の追加部分や削
-  除部分をまとめる。</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">追加と削除が一連の調整と考えられる場合、そのひとつ以上の追加部分や削 除部分をまとめる。</desc>
   <desc versionDate="2007-11-06" xml:lang="it">raggruppa ona o più cancellazioni insieme a una o più aggiunte quando la combinazione va considerata come singolo intervento sul testo</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -47735,7 +47742,9 @@ used to mark normal inter-word space or the like.</p>
   </content>
   <constraintSpec ident="substContents1" scheme="schematron">
     <constraint>
-      <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="child::tei:add and (child::tei:del or child::tei:surplus)"><name/> must have at least one child add and at least one child del or surplus</assert>
+      <sch:rule context="tei:subst">
+        <sch:assert test="child::tei:add and (child::tei:del or child::tei:surplus)"><sch:name/> must have at least one child add and at least one child del or surplus</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -48785,15 +48794,12 @@ reading groups, each associated with witness specifications.</p>
   <gloss versionDate="2007-06-12" xml:lang="fr">groupe de leçons</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">grupo de lecturas</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">gruppo di letture</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">within a textual variation,
-groups two or more readings perceived to have a genetic
-relationship or other affinity.</desc>
+  <desc versionDate="2005-01-14" xml:lang="en">within a textual variation, groups two or more readings perceived to have a genetic relationship or other affinity.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트 변이형 내에서 계통 관계 또는 유사 관계로 이해되는 둘 이상의 독법을 모아 놓는다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">原文變異中，匯集兩個或多個認為具有根源關係或於其他方面性質類似的對應本。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">異なるテキストで、系統関係や類縁性があるとされる、二つ以上の読みをま
   とめる。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">regroupe deux leçons ou plus qui sont perçues
-			comme ayant une relation génétique ou une autre affinité.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">regroupe deux leçons ou plus qui sont perçues comme ayant une relation génétique ou une autre affinité.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa al interno de una variante textual dos o más lecturas consideradas emparentadas o afines.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">all'interno di una variante testuale raggruppa due o più letture considerate imparentate o affini</desc>
   <classes>
@@ -48814,7 +48820,9 @@ relationship or other affinity.</desc>
   </content>
   <constraintSpec scheme="schematron" ident="only1lem">
     <constraint xmlns:sch="http://purl.oclc.org/dsdl/schematron">
-      <sch:assert test="count(tei:lem) &lt; 2">Only one &lt;lem&gt; element may appear within a &lt;rdgGrp&gt;</sch:assert>
+      <sch:rule context="tei:rdgGrp">
+        <sch:assert test="count(tei:lem) lt 2">Only one &lt;lem&gt; element may appear within a &lt;rdgGrp&gt;</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -51322,7 +51330,7 @@ different witnesses.
 <div xml:id="NDGEOGste"><head>States, Traits, and Events</head></div>
 <div xml:id="place-rel"><head>Relations Between Places</head>
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="affiliation">
-  <gloss xml:lang="en" versionDate="2008-12-09">affiliation</gloss>
+  <gloss versionDate="2008-12-09" xml:lang="en">affiliation</gloss>
   <gloss versionDate="2008-12-09" xml:lang="fr">affiliation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains an informal description of a person's present or past affiliation with some
         organization, for example an employer or sponsor.</desc>
@@ -51362,7 +51370,7 @@ different witnesses.
             date represented by the content of this element belongs.</desc>
         <desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
         <desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
-        <desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
+        <desc versionDate="2019-02-03" xml:lang="ja">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
         <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
             appartient la date exprimée dans le contenu de l'élément.</desc>
         <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
@@ -51403,7 +51411,7 @@ different witnesses.
             </affiliation>
     </egXML>
   </exemplum>
-  <exemplum xml:lang="en" versionDate="2018-10-30">
+  <exemplum versionDate="2018-10-30" xml:lang="en">
     <p>This example indicates that the person was affiliated with the
     Australian Journalists Association at some point between the dates
     listed.</p>
@@ -51413,7 +51421,7 @@ different witnesses.
             </affiliation>
     </egXML>
   </exemplum>
-  <exemplum xml:lang="en" versionDate="2018-10-30">
+  <exemplum versionDate="2018-10-30" xml:lang="en">
     <p>This example indicates that the person was affiliated with Mount Holyoke College throughout the entire span of the date range listed.</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#NONE">
       <affiliation from="1902-01-01" to="1906-01-01">Was an assistant professor at Mount Holyoke College.</affiliation>
@@ -51445,7 +51453,7 @@ different witnesses.
             <gi>name</gi> comme ci-dessus, soit l'élément plus spécifique
         <gi>orgName</gi>.</p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks versionDate="2008-04-05" xml:lang="ja">
     <p> 組織名は、要素<gi>name</gi>または、より特化した要素 <gi>orgName</gi>でマークアップした方がよい。 </p>
   </remarks>
   <listRef>
@@ -54490,8 +54498,7 @@ specification.</p></remarks>
   <gloss versionDate="2007-06-12" xml:lang="fr">relation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">relación</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">relazione</gloss>
-  <desc versionDate="2013-04-12" xml:lang="en">describes any kind of relationship or linkage amongst a
-  specified group of places, events, persons, objects or other items.</desc>
+  <desc versionDate="2013-04-12" xml:lang="en">describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">명시된 참여자군 사이에 관련성 또는 연결 종류를 기술한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">描述在特定團體中，參與者彼此之間的關係或關聯。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">指定された参加者グループ間の関連性の種類を示す。</desc>
@@ -54509,12 +54516,14 @@ specification.</p></remarks>
   <content>
     <elementRef key="desc" minOccurs="0"/>
   </content>
-  <constraintSpec ident="reforkeyorname" scheme="schematron">
+  <constraintSpec ident="ref-or-key-or-name" scheme="schematron">
     <constraint>
-      <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="@ref or @key or @name">One of the attributes  'name', 'ref' or 'key' must be supplied</assert>
+      <sch:rule context="tei:relation">
+        <sch:assert test="@ref or @key or @name">One of the attributes @name, @ref or @key must be supplied</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
-  <constraintSpec ident="activemutual" scheme="schematron">
+  <constraintSpec ident="active-mutual" scheme="schematron">
     <!-- Note: this constraint is pointless in RELAX NG land, where
          the org=choice works. It is useful in DTD land, where the
          attList/@org has no effect. It looks to me like it is useful
@@ -54523,12 +54532,16 @@ specification.</p></remarks>
          difficulty. (But I may be reading the XSD incorrectly.) 
          — Syd, 2018-05-01 -->
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@active and @mutual">Only one of the attributes @active and @mutual may be supplied</report>
+      <sch:rule context="tei:relation">
+        <sch:report test="@active and @mutual">Only one of the attributes @active and @mutual may be supplied</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
-  <constraintSpec ident="activepassive" scheme="schematron">
+  <constraintSpec ident="active-passive" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@passive and not(@active)">the attribute 'passive' may be supplied only if the attribute 'active' is supplied</report>
+      <sch:rule context="tei:relation">
+        <sch:report test="@passive and not(@active)">the attribute @passive may be supplied only if the attribute @active is supplied</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -54541,32 +54554,26 @@ specification.</p></remarks>
             <ident type="class">att.datable.custom</ident>) defines the calendar system of the date
             in the original material defined by the parent element, <emph>not</emph> the calendar to
             which the date is normalized.</desc>
-        <desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the
-            date represented by the content of this element belongs.</desc>
+        <desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</desc>
         <desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
         <desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
         <desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
-        <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
-            appartient la date exprimée dans le contenu de l'élément.</desc>
-        <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
-            una fecha.</desc>
-        <desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data
-            appartiene.</desc>
+        <desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.</desc>
+        <desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra una fecha.</desc>
+        <desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data appartiene.</desc>
         <datatype minOccurs="1" maxOccurs="unbounded">
-            <dataRef key="teidata.pointer"/>
+          <dataRef key="teidata.pointer"/>
         </datatype>
         <constraintSpec scheme="schematron" ident="calendar-check-relation">
-            <constraint>
-                <sch:rule context="tei:*[@calendar]">
-                    <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
-                        systems or calendars to which the date represented by the content of this element belongs,
-                        but this <sch:name/> element has no textual content.</sch:assert>
-                </sch:rule>
-            </constraint>
+          <constraint>
+            <sch:rule context="tei:*[@calendar]">
+              <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
+              systems or calendars to which the date represented by the content of this element belongs,
+              but this <sch:name/> element has no textual content.</sch:assert>
+            </sch:rule>
+          </constraint>
         </constraintSpec>
-    </attDef>
-
-  
+      </attDef>
       <attDef ident="name">
       <desc versionDate="2005-10-27" xml:lang="en">supplies a name for the kind of relationship of which this is an instance.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이것이 실례인 관련성 종류에 대한 이름을 제공한다.</desc>
@@ -54579,20 +54586,15 @@ specification.</p></remarks>
     </attDef>
     <attList org="choice">
       <attDef ident="active">
-        <desc versionDate="2005-07-24" xml:lang="en">identifies the <soCalled>active</soCalled> participants in a non-mutual relationship, or all the participants in a mutual
-                    one.</desc>
-        <desc versionDate="2008-04-06" xml:lang="es">identifica los participantes activos en una relación no-mutua, o todos los participantes de
-                    una mutua.</desc>
-        <desc versionDate="2008-03-30" xml:lang="fr">identifie les participants actifs dans une relation à sens unique, ou tous les participants
-                    dans une relation réciproque.</desc>
-        <desc versionDate="2007-11-06" xml:lang="it">identifica i partecipanti attivi in una relazione di non reciprocità, oppure tutti i
-                    partecipanti in una relazione di reciprocità</desc>
+        <desc versionDate="2005-07-24" xml:lang="en">identifies the <soCalled>active</soCalled> participants in a non-mutual relationship, or all the participants in a mutual one.</desc>
+        <desc versionDate="2008-04-06" xml:lang="es">identifica los participantes activos en una relación no-mutua, o todos los participantes de una mutua.</desc>
+        <desc versionDate="2008-03-30" xml:lang="fr">identifie les participants actifs dans une relation à sens unique, ou tous les participants dans une relation réciproque.</desc>
+        <desc versionDate="2007-11-06" xml:lang="it">identifica i partecipanti attivi in una relazione di non reciprocità, oppure tutti i partecipanti in una relazione di reciprocità</desc>
         <datatype maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
       </attDef>
       <attDef ident="mutual" usage="opt">
         <desc versionDate="2005-07-24" xml:lang="en">supplies a list of participants amongst all of whom the relationship holds equally.</desc>
-        <desc versionDate="2008-04-06" xml:lang="es">proporciona una lista de participantes entre los cuales se establece una idéntica
-                    relación</desc>
+        <desc versionDate="2008-04-06" xml:lang="es">proporciona una lista de participantes entre los cuales se establece una idéntica relación</desc>
         <desc versionDate="2009-03-19" xml:lang="fr">fournit une liste de participants entre lesquels la relation est réciproque.</desc>
         <desc versionDate="2007-11-06" xml:lang="it">fornisce una lista di partecipanti tra i quali c'è una relazione paritaria</desc>
         <datatype maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
@@ -56383,7 +56385,7 @@ one initial.</desc>
     <ptr target="#NDDATE"/>
   </listRef>
 </classSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.temporal.iso">
+<dataSpec module="tei" ident="teidata.temporal.iso">
   <desc versionDate="2007-04-08" xml:lang="en">defines the range of attribute values expressing a temporal expression such as a date, a
     time, or a combination of them, that conform to the international standard <title>Data elements
       and interchange formats – Information interchange – Representation of dates and times</title>.</desc>
@@ -56438,7 +56440,7 @@ one initial.</desc>
       
   </remarks>
 </dataSpec>
-<dataSpec xmlns:tei="http://www.tei-c.org/ns/1.0" module="tei" ident="teidata.duration.iso">
+<dataSpec module="tei" ident="teidata.duration.iso">
   <desc versionDate="2007-04-09" xml:lang="en">defines the range of attribute values available for representation of a duration in time
     using ISO 8601 standard formats</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다.</desc>
@@ -57584,6 +57586,7 @@ items, individuellement complets.</desc>
               plusieurs items plus petits, pas nécessairement complets.</gloss>
           <gloss versionDate="2007-11-06" xml:lang="it">frammenti</gloss>
           <gloss versionDate="2007-05-04" xml:lang="es">un texto construido a partir de la combinación de varios pequeños, no necesariamenteelementos completos.</gloss>
+          <gloss versionDate="2024-02-28" xml:lang="ja">断片</gloss>
           <desc versionDate="2007-06-27" xml:lang="en">a text made by combining several smaller, not
              necessarily complete, items</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 몇몇의 작은 항목으로 구성되어 있으나, 이 항목들은 반드시 완성된 것들은 아니다.</desc>
@@ -58753,7 +58756,9 @@ Information with a Text</head>
   <content><empty/></content>
   <constraintSpec ident="linkTargets3" scheme="schematron">
     <constraint>
-      <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/></sch:assert>
+      <sch:rule context="tei:link">
+        <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/></sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -58946,9 +58951,11 @@ Information with a Text</head>
   </content>
   <constraintSpec ident="abstractModel-structure-ab-in-l-or-lg" scheme="schematron">
     <constraint>
-      <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
-        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
-      </sch:report>
+      <sch:rule context="tei:ab">
+        <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
+          Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -59438,7 +59445,7 @@ Information with a Text</head>
 <div type="div3" xml:id="SACSXA"><head>A Three-way Alignment</head></div></div>
 <div type="div2" xml:id="SAIE"><head>Identical Elements and Virtual Copies</head></div>
 <div type="div2" xml:id="SAAG"><head>Aggregation</head>
-<elementSpec module="linking" ident="join">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="linking" ident="join">
   <gloss xml:lang="en" versionDate="2009-10-06">join</gloss>
   <gloss versionDate="2009-10-06" xml:lang="fr">jointure</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it.</desc>
@@ -59454,19 +59461,19 @@ Information with a Text</head>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
   </classes>
-  <content>
-    
-      <alternate minOccurs="0" maxOccurs="unbounded">
-        <classRef key="model.descLike"/>
-        <classRef key="model.certLike"/>
-      </alternate>
-    
+  <content>    
+    <alternate minOccurs="0" maxOccurs="unbounded">
+      <classRef key="model.descLike"/>
+      <classRef key="model.certLike"/>
+    </alternate>
   </content>
   <constraintSpec ident="joinTargets3" scheme="schematron">
     <constraint>
-      <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="contains(@target,' ')">
-You must supply at least two values for @target on <name/>
-         </assert>
+      <sch:rule context="tei:join">
+        <sch:assert test="contains( normalize-space( @target ),' ')">
+          You must supply at least two values for @target on <sch:name/>
+        </sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -60012,12 +60019,8 @@ You must supply at least two values for @target on <name/>
 <div type="div2" xml:id="SASOstdf"><head>The <gi>standOff</gi> Container</head></div>
 <div type="div2" xml:id="SASOann"><head>Annotations</head>
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="standOff" mode="add" module="linking">
-  <desc xml:lang="en" versionDate="2018-10-31">Functions as a
-  container element for linked data, contextual information, and
-  stand-off annotations embedded in a TEI document.</desc>
-	  <desc xml:lang="ja" versionDate="2023-07-29">
-		  リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。
-		  </desc>
+  <desc xml:lang="en" versionDate="2018-10-31">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</desc>
+  <desc xml:lang="ja" versionDate="2023-07-29">リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。 </desc>
   <classes>
     <memberOf key="model.resource"/>
     <memberOf key="att.global"/>
@@ -60029,9 +60032,11 @@ You must supply at least two values for @target on <name/>
   </content>
   <constraintSpec ident="nested_standOff_should_be_typed" scheme="schematron" mode="add">
     <constraint>
-      <sch:assert test="@type or not(ancestor::tei:standOff)">This
-      <sch:name/> element must have a @type attribute, since it is
-      nested inside a <sch:name/></sch:assert>
+      <sch:rule context="tei:standOff">
+        <sch:assert test="@type or not(ancestor::tei:standOff)">This
+        <sch:name/> element must have a @type attribute, since it is
+        nested inside a <sch:name/></sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en" versionDate="2019-12-25">
@@ -60097,43 +60102,43 @@ You must supply at least two values for @target on <name/>
     information which is referred to from the main text.</p>
     <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en" source="#MLK01" valid="feasible">
       <TEI>
-	<teiHeader> <!-- ... --> </teiHeader>
-	<standOff>
-	  <listPlace>
-	    <place xml:id="LATL">
-	      <placeName>Atlanta</placeName>
-	      <location>
-		<region key="US-GA">Georgia</region>
-		<country key="USA">United States of America</country>
-		<geo>33.755 -84.39</geo>
-	      </location>
-	      <population when="1963" type="interpolatedCensus" quantity="489359" source="https://www.biggestuscities.com/city/atlanta-georgia"/>
-	    </place>
-	    <place xml:id="LBHM">
-	      <placeName>Birmingham</placeName>
-	      <location>
-		<region key="US-AL">Alabama</region>
-		<country key="USA">United States of America</country>
-		<geo>33.653333 -86.808889</geo>
-	      </location>
-	      <population when="1963" type="interpolatedCensus" quantity="332891" source="https://www.biggestuscities.com/city/birmingham-alabama"/>
-	    </place>
-	  </listPlace>
-	</standOff>
-	<text>
-	  <body>
-	    <!-- ... -->
-	    <p>Moreover, I am <choice><sic>congnizant</sic><corr>cognizant</corr></choice> of the interrelatedness of all communities and
-	    <lb/>states.  I cannot sit idly by in <placeName ref="#LATL">Atlanta</placeName> and not be concerned about what happens
-	    <lb/>in <placeName ref="#LBHM">Birmingham</placeName>.  <seg xml:id="FQ17">Injustice anywhere is a threat to justice everywhere.</seg>  We
-	    <lb/>are caught in an inescapable network of mutuality, tied in a single garment
-	    <lb/>of destiny.  Whatever affects one directly affects all indirectly. Never
-	    <lb/>again can we afford to live with the narrow, provincial <soCalled rendition="#Rqms">outside agitator</soCalled>
-	    <lb/>idea.  Anyone who lives inside the United States can never be considered
-	    <lb/>an outsider anywhere in this country.</p>
-	    <!-- ... -->
-	  </body>
-	</text>
+        <teiHeader> <!-- ... --> </teiHeader>
+        <standOff>
+          <listPlace>
+            <place xml:id="LATL">
+              <placeName>Atlanta</placeName>
+              <location>
+                <region key="US-GA">Georgia</region>
+                <country key="USA">United States of America</country>
+                <geo>33.755 -84.39</geo>
+              </location>
+              <population when="1963" type="interpolatedCensus" quantity="489359" source="https://www.biggestuscities.com/city/atlanta-georgia"/>
+            </place>
+            <place xml:id="LBHM">
+              <placeName>Birmingham</placeName>
+              <location>
+                <region key="US-AL">Alabama</region>
+                <country key="USA">United States of America</country>
+                <geo>33.653333 -86.808889</geo>
+              </location>
+              <population when="1963" type="interpolatedCensus" quantity="332891" source="https://www.biggestuscities.com/city/birmingham-alabama"/>
+            </place>
+          </listPlace>
+        </standOff>
+        <text>
+          <body>
+            <!-- ... -->
+            <p>Moreover, I am <choice><sic>congnizant</sic><corr>cognizant</corr></choice> of the interrelatedness of all communities and
+            <lb/>states.  I cannot sit idly by in <placeName ref="#LATL">Atlanta</placeName> and not be concerned about what happens
+            <lb/>in <placeName ref="#LBHM">Birmingham</placeName>.  <seg xml:id="FQ17">Injustice anywhere is a threat to justice everywhere.</seg>  We
+            <lb/>are caught in an inescapable network of mutuality, tied in a single garment
+            <lb/>of destiny.  Whatever affects one directly affects all indirectly. Never
+            <lb/>again can we afford to live with the narrow, provincial <soCalled rendition="#Rqms">outside agitator</soCalled>
+            <lb/>idea.  Anyone who lives inside the United States can never be considered
+            <lb/>an outsider anywhere in this country.</p>
+            <!-- ... -->
+          </body>
+        </text>
       </TEI>
     </egXML>
   </exemplum>
@@ -60645,7 +60650,7 @@ You must supply at least two values for @target on <name/>
 <div type="div2" xml:id="AILC"><head>Linguistic Segment Categories</head>
 <div type="div3" xml:id="AILCW"><head>Words and Above</head></div>
 <div xml:id="AIPC"><head>Below the Word Level</head>
-<elementSpec module="analysis" ident="s">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="analysis" ident="s">
   <gloss versionDate="2005-01-14" xml:lang="en">s-unit</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">s-단위</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">句子單元</gloss>
@@ -60669,15 +60674,17 @@ You must supply at least two values for @target on <name/>
     <memberOf key="att.notated"/>
   </classes>
   <content>
-<!--   NOTE: MDH reversing horrible change to content model mandated by Council in 
-    https://sourceforge.net/p/tei/bugs/578/ == https://github.com/TEIC/TEI/issues/1193, and 
-    replacing original macro.phraseSet content model. -->
+    <!-- NOTE: MDH reversing horrible change to content model mandated
+         by Council in https://sourceforge.net/p/tei/bugs/578/ ==
+         https://github.com/TEIC/TEI/issues/1193, and replacing
+         original macro.phraseSet content model. -->
     <macroRef key="macro.phraseSeq"/> 
   </content>
   <constraintSpec ident="noNestedS" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="tei:s">You may not nest one s element within
-      another: use seg instead</report>
+      <sch:rule context="tei:s">
+        <sch:report test="tei:s">You may not nest one s element within another: use seg instead</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <exemplum xml:lang="en">
@@ -60738,6 +60745,7 @@ You must supply at least two values for @target on <name/>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">子句</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">cláusula</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">frase</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">節</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">represents a grammatical clause.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">문법적인 절을 표시한다.</desc>
   <gloss versionDate="2009-02-13" xml:lang="fr">proposition</gloss>
@@ -60787,6 +60795,11 @@ etc. as appropriate.</p>
     <p>L'attribut <att>type</att> peut être utilisé pour indiquer le type de proposition, avec des valeurs telles que <val>subordonnée</val>, <val>infinitive</val>,
 <val>declarative</val>, <val>interrogative</val>, <val>relative</val> etc.</p>
   </remarks>
+  <remarks versionDate="2024-02-28" xml:lang="ja">
+    <p><att>type</att> 属性は節のタイプを示すのに用いることができる。
+      内容に応じて <val>finite</val>（定形）、<val>nonfinite</val>（不定形）、<val>declarative</val>（平叙）、
+      <val>interrogative</val>（疑問）、<val>relative</val>（連体修飾）などの値をとる。</p>
+  </remarks>
   <listRef>
     <ptr target="#AILC"/>
   </listRef>
@@ -61568,17 +61581,14 @@ contexts.</p>
   </listRef>
 </classSpec></div>
 <div type="div2" xml:id="AISP"><head>Spans and Interpretations</head>
-<elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="analysis" ident="span">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="analysis" ident="span">
   <desc versionDate="2005-01-14" xml:lang="en">associates an interpretative annotation directly with a span of text.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">해석적 부호를 텍스트의 일정 부분과 직접적으로 연결시킨다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">將詮釋性註釋直接和一段文字段連結。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">テキスト部分に解釈的注釈を関連づける。</desc>
-  <desc versionDate="2009-02-13" xml:lang="fr">associe une interprétation sous forme d'annotation
-    directement à un passage donné dans un texte.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">asocia una anotación interpretativa directamente con un
-    periodo de texto.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">associa direttamente l'annotazione interpretativa ad una
-    prozione di testo</desc>
+  <desc versionDate="2009-02-13" xml:lang="fr">associe une interprétation sous forme d'annotation directement à un passage donné dans un texte.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">asocia una anotación interpretativa directamente con un periodo de texto.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">associa direttamente l'annotazione interpretativa ad una prozione di testo</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.interpLike"/>
@@ -61588,46 +61598,51 @@ contexts.</p>
   <content>
     <macroRef key="macro.phraseSeq.limited"/>
   </content>
-  <constraintSpec ident="targetfrom" scheme="schematron">
+  <constraintSpec ident="target-from" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@from and @target">
-Only one of the attributes @target and @from may be supplied on <name/>
-      </report>
+      <sch:rule context="tei:span">
+        <sch:report test="@from and @target">
+          Only one of the attributes @target and @from may be supplied on <sch:name/>
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="targetto" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@to and @target">
-Only one of the attributes @target and @to may be supplied on <name/>
-         </report>
+      <sch:rule context="tei:span">
+        <sch:report test="@to and @target">
+          Only one of the attributes @target and @to may be supplied on <sch:name/>
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="tonotfrom" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="@to and not(@from)">
-If @to is supplied on <name/>, @from must be supplied as well</report>
+      <sch:rule context="tei:span">
+        <sch:report test="@to and not(@from)">
+          If @to is supplied on <sch:name/>, @from must be supplied as well
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="tofrom" scheme="schematron">
     <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="contains(normalize-space(@to),' ') or contains(normalize-space(@from),' ')">
-The attributes @to and @from on <name/> may each contain only a single value</report>
+      <sch:rule context="tei:span">
+        <sch:report test="contains(normalize-space(@to),' ') or contains(normalize-space(@from),' ')">
+          The attributes @to and @from on <sch:name/> may each contain only a single value
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
     <attDef ident="from" usage="opt">
       <desc versionDate="2013-01-15" xml:lang="en">gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a <att>to</att> attribute, gives the identifier of the node of the entire span of text being annotated.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">현재 부호를 붙이는 단락의 처음을 명시함; <att>to</att> 속성과 같이 쓰이지 않으면
-        전체 문단을 명시함.</desc>
+      <desc versionDate="2007-12-20" xml:lang="ko">현재 부호를 붙이는 단락의 처음을 명시함; <att>to</att> 속성과 같이 쓰이지 않으면 전체 문단을 명시함.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出被註解段落的起點；若沒有使用屬性<att>to</att>，則指出全部段落。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該注釈対象の始点を示す。属性<att>to</att>がない場合は、対象全 体を示す。</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">précise le début du passage sur lequel porte
-        l'annotation ; s'il n'est pas accompagné d'un attribut <att>to</att>, désigne alors
-        l'intégralité du passage</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">especifica el principio del pasaje que se anota; si
-        no aparece con el atributo <att>to</att>, especifica el pasaje entero.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica l'inizio di un brano annotato; se non è
-        accompagnato dall'attributo <att>to</att> indica l'inero brano</desc>
+      <desc versionDate="2007-06-12" xml:lang="fr">précise le début du passage sur lequel porte l'annotation ; s'il n'est pas accompagné d'un attribut <att>to</att>, désigne alors l'intégralité du passage</desc>
+      <desc versionDate="2007-05-04" xml:lang="es">especifica el principio del pasaje que se anota; si no aparece con el atributo <att>to</att>, especifica el pasaje entero.</desc>
+      <desc versionDate="2007-01-21" xml:lang="it">indica l'inizio di un brano annotato; se non è accompagnato dall'attributo <att>to</att> indica l'inero brano</desc>
       <datatype><dataRef key="teidata.pointer"/></datatype>
     </attDef>
     <attDef ident="to" usage="opt">
@@ -62763,6 +62778,7 @@ structures.</desc>
   <gloss versionDate="2007-06-12" xml:lang="fr">contrainte conditionnelle de structure de traits</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">restricciones de estructura de rasgo condicional</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">vincolo della struttura di tratti condizionato</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">条件付き素性構造制約</gloss>
   <desc versionDate="2007-07-13" xml:lang="en">defines a conditional feature-structure constraint; the consequent
 and the antecedent are specified as feature structures or
 feature-structure collections; the constraint is satisfied if both the
@@ -66559,7 +66575,7 @@ statement, or change log.</p>
   <desc xml:lang="pt" versionDate="2018-07-12">Certeza e incerteza</desc>
   <desc xml:lang="ja" versionDate="2018-07-12">確信度モジュール</desc>
 </moduleSpec></div></div>
-<div xmlns:xi="http://www.w3.org/2001/XInclude" type="div1" xml:id="TD" n="27"><head>Documentation Elements</head>
+<div xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" type="div1" xml:id="TD" n="27"><head>Documentation Elements</head>
 <div type="div2" xml:id="TDphrase"><head>Phrase Level Documentary Elements</head>
 <div type="div3" xml:id="TDphraseTE"><head>Phrase Level Terms</head></div>
 <div type="div3" xml:id="TDphraseEA"><head>Element and Attribute Descriptions</head>
@@ -66756,6 +66772,7 @@ programming language.</desc>
       <gloss versionDate="2008-04-06" xml:lang="es">lenguaje formal</gloss>
       <gloss versionDate="2008-03-30" xml:lang="fr">langage formel</gloss>
       <gloss versionDate="2007-11-06" xml:lang="it">linguaggio formale</gloss>
+      <gloss versionDate="2024-02-28" xml:lang="ja">形式言語</gloss>
       <desc versionDate="2006-02-06" xml:lang="en">a name identifying the formal language in which  the
 	code is expressed</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">부호가 표현된 형식 언어를 식별하는 이름</desc>
@@ -67573,8 +67590,9 @@ provided</item>
   </listRef>
 </elementSpec></div></div>
 <div type="div2" xml:id="TDmodules"><head>Modules and Schemas</head>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="classRef">
+<elementSpec module="tagdocs" ident="classRef">
   <desc versionDate="2010-07-06" xml:lang="en">points to the specification for an attribute or model class which is to be included in a schema</desc>
+  <desc versionDate="2024-02-28" xml:lang="ja">スキーマに含まれる属性クラスあるいはモデルクラスの仕様を指し示す。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.repeatable"/>
@@ -67586,33 +67604,40 @@ provided</item>
     <attDef ident="key" usage="req">
       <desc versionDate="2010-07-06" xml:lang="en">the identifier used for the required class within the
         source indicated.</desc>
+      <desc versionDate="2024-02-28" xml:lang="ja">指示されたソースの中の要求されたクラスに対して使用される識別子。</desc>
       <datatype><dataRef key="teidata.xmlName"/></datatype>
     </attDef>
     <attDef ident="expand" usage="opt">
       <desc versionDate="2013-11-21" xml:lang="en">indicates how references
       to this class within a content model should be interpreted.</desc>
+      <desc versionDate="2024-02-28" xml:lang="ja">内容モデル内でこのクラスへの参照がどのように解釈されるべきなのかを示す。</desc>
       <valList type="closed">
         <valItem ident="alternation">
           <desc versionDate="2013-11-21" xml:lang="en">any one member of the class may appear</desc>
+          <desc versionDate="2024-02-24" xml:lang="ja">クラスのいずれかのメンバーが出現し得る。</desc>
         </valItem>
         <valItem ident="sequence">
           <desc versionDate="2013-11-21" xml:lang="en">a single occurrence
           of all members of the class may appear in sequence</desc>
+          <desc versionDate="2024-02-28" xml:lang="ja">クラスのすべてのメンバーが順に1回ずつ出現し得る。</desc>
         </valItem>
         <valItem ident="sequenceOptional">
           <desc versionDate="2013-11-21" xml:lang="en">a single occurrence of
           one or more members
           of the class may appear in sequence
           </desc>
+          <desc versionDate="2024-02-28" xml:lang="ja">クラスの1つ以上のメンバーが順に1回ずつ出現し得る。</desc>
         </valItem>
         <valItem ident="sequenceOptionalRepeatable">
           <desc versionDate="2013-11-21" xml:lang="en">one or more
           occurrences of one or more members of the class
           may appear in sequence. </desc>
+          <desc versionDate="2024-02-28" xml:lang="ja">クラスの1つまたは複数のメンバーが1回以上、順に出現し得る。</desc>
         </valItem>
         <valItem ident="sequenceRepeatable">
           <desc versionDate="2013-11-21" xml:lang="en">one or more
           occurrences of all members of the class may appear in sequence</desc>
+          <desc versionDate="2024-02-28" xml:lang="ja">クラスのすべてのメンバーが1回以上、順に出現し得る。</desc>
         </valItem>
       </valList>
       <remarks xml:lang="en" versionDate="2013-11-20">
@@ -67629,14 +67654,20 @@ provided</item>
 	<code>(a+,b+,c+)</code> when it has the value
 	<val>sequenceRepeatable</val>.</p>
       </remarks>
+      <remarks versionDate="2024-02-28" xml:lang="ja"><p>クラスのメンバーが <val>a</val>、<val>b</val>そして<val>c</val>であるとして、
+        <att>expand</att>の値が<val>alternation</val>ならば、内容モデル内の該当クラスへの参照は，<val>a|b|c</val>への参照として理解される。
+        また、<att>expand</att>の値が<val>sequence</val>ならば、<val>a,b,c</val>への，<val>sequenceOptional</val>ならば<val>(a?,b?,c?)</val>への、
+        <val>sequenceOptionalRepeatable</val>ならば<val>(a*,b*,c*)</val>への、そして<val>sequenceRepeatable</val>ならば<val>(a+,b+,c+)</val>への参照としてそれぞれ理解される。</p></remarks>
     </attDef>
     <attList org="choice">
       <attDef ident="include">
         <desc versionDate="2011-09-21" xml:lang="en">supplies a list of class members which are to be included in the schema being defined.</desc>
+        <desc versionDate="2024-02-28" xml:lang="ja">定義されているスキーマに含まれるクラスメンバーのリスト。</desc>
         <datatype minOccurs="0" maxOccurs="unbounded"><dataRef key="teidata.xmlName"/></datatype>
       </attDef>
       <attDef ident="except">
         <desc versionDate="2011-09-21" xml:lang="en">supplies a list of class members which are to be excluded from the schema being defined.</desc>
+        <desc versionDate="2024-02-28" xml:lang="ja">定義されているスキーマから除外するクラスメンバーのリスト。</desc>
         <datatype minOccurs="0" maxOccurs="unbounded"><dataRef key="teidata.xmlName"/></datatype>
       </attDef>     
     </attList>
@@ -67660,11 +67691,17 @@ provided</item>
     class names conventionally begin with the letters <code>att.</code>.
     </p>
   </remarks>
+  <remarks versionDate="2024-02-28" xml:lang="ja">
+    <p>
+      属性クラスとモデルクラスは、それらが宣言された<gi>classSpec</gi>の要素において<att>ident</att>属性の値として指定された名前により、識別される。
+      TEI内のすべての名前は一意である。属性クラス名は通常<code>att.</code>という文字ではじまる。
+    </p>
+  </remarks>
   <listRef>
     <ptr target="#TDCLA"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="elementRef">
+<elementSpec module="tagdocs" ident="elementRef">
   <desc versionDate="2010-05-11" xml:lang="en">points to the specification for some element which is to be included in a schema</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -67704,7 +67741,7 @@ provided</item>
     <ptr target="#TDmodules"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="macroRef">
+<elementSpec module="tagdocs" ident="macroRef">
   <desc versionDate="2010-05-14" xml:lang="en">points to the specification for some pattern which is to be included in a schema</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -67748,8 +67785,7 @@ provided</item>
   <desc versionDate="2007-12-20" xml:lang="ko">하나의 스키마로 통합된 모듈을 참조한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">參照一個被併入某一模型的模組。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">スキーマに組み入れられるモジュールを参照する。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">référence un module qui doit être incorporé dans
-                        un schéma.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">référence un module qui doit être incorporé dans un schéma.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">indica un módulo que se ha de incluir al interno de un esquema.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">indica un modulo da includere all'interno di uno schema</desc>
   <classes>
@@ -67757,38 +67793,35 @@ provided</item>
     <memberOf key="model.oddRef"/>
   </classes>
   <content>
-    
-      <elementRef key="content" minOccurs="0"/>
-    
+    <elementRef key="content" minOccurs="0"/>
   </content>
   <constraintSpec ident="modref" scheme="schematron">
     <constraint>
-      <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:moduleRef">
-        <report test="* and @key">
-Child elements of <name/> are only allowed when an external module is being loaded
-        </report>
-      </rule>
+      <sch:rule context="tei:moduleRef">
+        <sch:report test="* and @key">
+          Child elements of <sch:name/> are only allowed when an external module is being loaded
+        </sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
     <attDef ident="prefix" usage="opt">
-      <desc versionDate="2011-09-21" xml:lang="en">specifies a default prefix which will be
-      prepended to all patterns from the imported module</desc>
+      <desc versionDate="2011-09-21" xml:lang="en">specifies a default prefix which will be prepended to all patterns from the imported module</desc>
       <datatype minOccurs="0" maxOccurs="1"><dataRef key="teidata.xmlName"/></datatype>
       <constraintSpec scheme="schematron" ident="not-same-prefix">
         <constraint>
-          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:moduleRef">
-            <report test="//*[ not( generate-id(.) eq generate-id( current() ) ) ]/@prefix = @prefix">The prefix attribute
-	    of <name/> should not match that of any other
-	    element (it would defeat the purpose)</report>
-          </rule>
+          <sch:rule context="tei:moduleRef">
+            <sch:report test="//*[ not( generate-id(.) eq generate-id( current() ) ) ]/@prefix = @prefix">The prefix attribute
+            of <sch:name/> should not match that of any other
+            element (it would defeat the purpose)</sch:report>
+          </sch:rule>
         </constraint>
       </constraintSpec>
       <constraintSpec scheme="schematron" ident="not-except-and-include">
         <constraint>
-          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:moduleRef">
-            <report test="@except and @include">It is an error to supply both the @include and @except attributes</report>
-          </rule>
+          <sch:rule context="tei:moduleRef">
+            <sch:report test="@except and @include">It is an error to supply both the @include and @except attributes</sch:report>
+          </sch:rule>
         </constraint>
       </constraintSpec>
       <remarks versionDate="2011-09-21" xml:lang="en">
@@ -67806,8 +67839,7 @@ specified module into the schema being defined.</desc>
         <datatype minOccurs="0" maxOccurs="unbounded"><dataRef key="teidata.xmlName"/></datatype>
       </attDef>
       <attDef ident="except">
-        <desc versionDate="2011-09-21" xml:lang="en">supplies a list of the elements which are not to be copied from the
-specified module into the schema being defined.</desc>
+        <desc versionDate="2011-09-21" xml:lang="en">supplies a list of the elements which are not to be copied from the specified module into the schema being defined.</desc>
         <datatype minOccurs="0" maxOccurs="unbounded"><dataRef key="teidata.xmlName"/></datatype>
       </attDef>
     </attList>
@@ -67826,8 +67858,7 @@ specified module into the schema being defined.</desc>
         <gloss versionDate="2007-11-06" xml:lang="it">URL</gloss>
         <desc versionDate="2007-01-01" xml:lang="en">refers to a non-TEI module of RELAX NG code by external location</desc>
         <desc versionDate="2008-04-06" xml:lang="es">se refiere a un módulo no-de-TEI del código de RELAX NG mediante una localización externa</desc>
-        <desc versionDate="2008-03-30" xml:lang="fr">fait référence à un module non TEI de code
-RELAX NG par une localisation externe.</desc>
+        <desc versionDate="2008-03-30" xml:lang="fr">fait référence à un module non TEI de code RELAX NG par une localisation externe.</desc>
         <desc versionDate="2007-11-06" xml:lang="it">indica la collocazione esterna di un modulo non TEI che utilizza il codice RELAX NG</desc>
         <datatype><dataRef key="teidata.pointer"/></datatype>
       </attDef>
@@ -67852,7 +67883,6 @@ RELAX NG par une localisation externe.</desc>
     <p>This includes all elements available  from  the linking module
     except for the <gi>link</gi> and <gi>linkGrp</gi> elements.</p>
   </exemplum>
-
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
       <moduleRef key="linking" include="linkGrp link"/>
@@ -67952,7 +67982,7 @@ module, i.e. a named and externally visible group of declarations.</desc>
     <ptr target="#TDmodules"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:teix="http://www.tei-c.org/ns/Examples" module="tagdocs" xml:id="SCHEMASPEC" ident="schemaSpec">
+<elementSpec xmlns:teix="http://www.tei-c.org/ns/Examples" module="tagdocs" xml:id="SCHEMASPEC" ident="schemaSpec">
   <gloss versionDate="2007-07-04" xml:lang="en">schema specification</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">스키마 명시</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">especificación de esquema</gloss>
@@ -68405,7 +68435,7 @@ contains specifications for the elements
   </listRef>
 </elementSpec></div>
 <div type="div2" xml:id="TDcrystals"><head>Specification Elements</head>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="elementSpec">
+<elementSpec module="tagdocs" ident="elementSpec">
   <gloss versionDate="2007-07-04" xml:lang="en">element specification</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">요소 명시</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
@@ -68550,6 +68580,7 @@ contains specifications for the elements
   <gloss versionDate="2008-04-06" xml:lang="es">especificación de la clase</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">spécification de classe</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">indicazione di classe</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">クラス仕様</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains reference information for a TEI element class; 
 that is a group of 
   elements which appear together in  content models, or 
@@ -68601,6 +68632,7 @@ that is a group of
           <gloss versionDate="2008-04-06" xml:lang="es">modelo de contenido</gloss>
           <gloss versionDate="2008-03-30" xml:lang="fr">modèle de contenu</gloss>
           <gloss versionDate="2007-11-06" xml:lang="it">modello di contenuto</gloss>
+          <gloss versionDate="2024-02-28" xml:lang="ja">内容モデル</gloss>
           <desc versionDate="2007-04-15" xml:lang="en">members of this class appear in the same  content models</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 부류의 원소는 동일 내용 모델에서 나타난다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素出現在相同的內容模組中</desc>
@@ -68616,6 +68648,7 @@ that is a group of
           <gloss versionDate="2008-04-06" xml:lang="es">atributos</gloss>
           <gloss versionDate="2008-03-30" xml:lang="fr">attributs</gloss>
           <gloss versionDate="2007-11-06" xml:lang="it">attributi</gloss>
+          <gloss versionDate="2024-02-28" xml:lang="ja">属性の集合</gloss>
           <desc versionDate="2007-04-15" xml:lang="en">members of this class share common attributes</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 부류의 원소는 공통 속성을 공유한다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素有共用的屬性</desc>
@@ -68755,7 +68788,7 @@ the associated TEI header.</p>
     <ptr target="#TDCLA"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="dataSpec">
+<elementSpec module="tagdocs" ident="dataSpec">
   <gloss versionDate="2007-07-04" xml:lang="en">datatype specification</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">documents a datatype.</desc>
   <classes>
@@ -68970,7 +69003,7 @@ portion of an ODD document.</desc>
     <ptr target="#TDENT"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" xml:id="LISTREF" ident="listRef">
+<elementSpec module="tagdocs" xml:id="LISTREF" ident="listRef">
   <gloss versionDate="2005-01-14" xml:lang="en">list of references</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">참조 목록</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">參照列表</gloss>
@@ -69493,7 +69526,7 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TDcrystalsCEdc"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" xml:id="ALTIDENT" ident="altIdent">
+<elementSpec module="tagdocs" xml:id="ALTIDENT" ident="altIdent">
   <gloss versionDate="2007-07-04" xml:lang="en">alternate identifier</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">교체 확인소</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">identificador alterno</gloss>
@@ -69575,7 +69608,7 @@ déclaration de même nom dans la définition courante.</desc>
 <div xml:id="TDPMMS"><head>Model sequence</head></div>
 <div xml:id="TDPMDEF"><head>Defining a processing model</head></div>
 <div type="div3" xml:id="TDPMIP"><head>Implementation of Processing Models</head>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="model" module="tagdocs">
+<elementSpec ident="model" module="tagdocs">
   <desc versionDate="2015-05-15" xml:lang="en">describes the processing intended for a specified
     element.</desc>
   <classes>
@@ -70000,9 +70033,8 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TDPMPM"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="modelSequence" module="tagdocs">
-  <desc versionDate="2017-02-07" xml:lang="en">any sequence of model or <gi>modelSequence</gi> elements which
-    is to be processed as a single set of actions</desc>
+<elementSpec ident="modelSequence" module="tagdocs">
+  <desc versionDate="2017-02-07" xml:lang="en">any sequence of model or <gi>modelSequence</gi> elements which is to be processed as a single set of actions</desc>
   <classes>
     <memberOf key="att.global"/>
   </classes>
@@ -70017,22 +70049,22 @@ déclaration de même nom dans la définition courante.</desc>
   </content>
   <constraintSpec scheme="schematron" ident="no_outputs_nor_predicates_4_my_kids">
     <constraint>
-      <sch:report test="tei:model[@output]" role="warning">The 'model' children
-      of a 'modelSequence' element inherit the @output attribute of the
-      parent 'modelSequence', and thus should not have their own</sch:report>
+      <sch:rule context="tei:modelSequence">
+        <sch:report test="tei:model[@output]" role="warning">The 'model' children
+        of a 'modelSequence' element inherit the @output attribute of the
+        parent 'modelSequence', and thus should not have their own</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
     <attDef ident="predicate" usage="opt">
-      <desc versionDate="2015-05-15" xml:lang="en">the condition under which this model applies
-        given as an XPath Predicate Expression</desc>
+      <desc versionDate="2015-05-15" xml:lang="en">the condition under which this model applies given as an XPath Predicate Expression</desc>
       <datatype>
         <dataRef key="teidata.xpath"/>
       </datatype>
     </attDef>
     <attDef ident="useSourceRendition" usage="opt">
-      <desc versionDate="2015-05-15" xml:lang="en">whether to obey any rendition attribute that is
-        present</desc>
+      <desc versionDate="2015-05-15" xml:lang="en">whether to obey any rendition attribute that is present</desc>
       <datatype>
         <dataRef key="teidata.truthValue"/>
       </datatype>
@@ -70044,16 +70076,13 @@ déclaration de même nom dans la définition courante.</desc>
       </datatype>
       <valList type="semi">
         <valItem ident="web">
-          <desc versionDate="2015-05-15" xml:lang="en">the output is intended for presentation in a
-            web format</desc>
+          <desc versionDate="2015-05-15" xml:lang="en">the output is intended for presentation in a web format</desc>
         </valItem>
         <valItem ident="print">
-          <desc versionDate="2015-05-15" xml:lang="en">the output is intended for presentation in a
-            print format</desc>
+          <desc versionDate="2015-05-15" xml:lang="en">the output is intended for presentation in a print format</desc>
         </valItem>
         <valItem ident="plaintext">
-          <desc versionDate="2015-05-15" xml:lang="en">the output is intended for presentation in a
-            plain text format</desc>
+          <desc versionDate="2015-05-15" xml:lang="en">the output is intended for presentation in a plain text format</desc>
         </valItem>
       </valList>
     </attDef>
@@ -70502,72 +70531,40 @@ déclaration de même nom dans la définition courante.</desc>
     </listRef>
 </classSpec></div></div></div>
 <div type="div3" xml:id="TDCLA"><head>Class Specifications</head>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:teix="http://www.tei-c.org/ns/Examples" module="tagdocs" ident="content">
+<elementSpec xmlns:teix="http://www.tei-c.org/ns/Examples" module="tagdocs" ident="content">
   <gloss versionDate="2007-07-04" xml:lang="en">content model</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">내용 모델</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">模型宣告</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">modèle de contenu</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">declaración del esquema</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">dichiarazione dello schema</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">内容モデル</gloss>
   <desc versionDate="2018-01-20" xml:lang="en">contains a declaration of the intended content model for the element (or other construct) being specified.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">기록된 스키마에 대한 선언 텍스트를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含所記錄之模型的宣告文字。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">当該スキーマの宣言を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">contient la déclaration
-  d'un modèle de contenu pour le schéma documenté.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene el texto de la
-  declaración del esquema utilizado.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene il testo di
-  una dichiarazione dello schema utilizzato</desc>
+  <desc versionDate="2024-02-28" xml:lang="ja">現在の要素（あるいは他の構造）に期待される内容モデルの宣言を含む。</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">contient la déclaration d'un modèle de contenu pour le schéma documenté.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene el texto de la declaración del esquema utilizado.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene il testo di una dichiarazione dello schema utilizzato</desc>
   <classes>
     <memberOf key="att.global"/>
   </classes>
   <content>
     <alternate>
       <elementRef key="valList" minOccurs="1" maxOccurs="1"/>
-      <classRef key="model.contentPart" minOccurs="1" maxOccurs="unbounded"/>
-      <anyElement minOccurs="1" maxOccurs="unbounded" require="http://relaxng.org/ns/compatibility/annotations/1.0 http://relaxng.org/ns/structure/1.0"/>
+      <classRef key="model.contentPart" minOccurs="1" maxOccurs="1"/>
+      <anyElement minOccurs="1" maxOccurs="1" require="http://relaxng.org/ns/compatibility/annotations/1.0 http://relaxng.org/ns/structure/1.0"/>
     </alternate>
   </content>
-  <constraintSpec ident="only_1_child_of_content" scheme="schematron">
-    <desc>A temporary constraint to give users a warning that in the
-    future the content of <gi>content</gi> will be restricted to 1 and
-    only 1 child element.</desc>
-    <constraint>
-    <sch:rule context="tei:content[ *[2] ]">
-      <sch:let name="tot_kids" value="count( * )"/>
-      <sch:let name="tei_kids" value="count( tei:* )"/>
-      <sch:let name="rng_kids" value="count( rng:* | rna:* )"/>
-      <sch:let name="msg_part01" value="'In the near future the &lt;content&gt; element will be limited to 1 and only 1 child element. '"/>
-      <sch:let name="msg_part02" value="'This &lt;content&gt; element is in '"/>
-      <sch:let name="msg_part03" value="if ( local-name(..) eq 'elementSpec' ) then 'an ' else 'a '"/>
-      <sch:let name="msg_part04" value="concat( local-name(..), ' with ' )"/>
-      <sch:let name="msg_part05" value="if ( parent::tei:moduleRef/@key ) then 'a @key'    else ''"/>
-      <sch:let name="msg_part06" value="if ( parent::tei:moduleRef/@url ) then 'a @url'    else ''"/>
-      <sch:let name="msg_part07" value="if ( parent::tei:*/@ident )       then 'an @ident' else ''"/>
-      <sch:let name="msg_part08" value="' of &#34;'"/>
-      <sch:let name="msg_part09" value="../@ident | ../@key | ../@url"/>
-      <sch:let name="msg_part10" value="concat('&#34; and has ', $tot_kids, ' children,')"/>
-      <sch:let name="msgs_1to10" value="concat( $msg_part01, $msg_part02, $msg_part03, $msg_part04, $msg_part05, $msg_part06, $msg_part07, $msg_part08, $msg_part09, $msg_part10 )"/>
-      <sch:report test="$tei_kids eq $tot_kids" role="warning">
-        <sch:value-of select="$msgs_1to10"/> which could be wrapped in a &lt;sequence&gt; element.
-      </sch:report>
-      <sch:report test="$rng_kids eq $tot_kids" role="warning">
-        <sch:value-of select="$msgs_1to10"/> which could be wrapped in an &lt;rng:div&gt; element.
-      </sch:report>
-      <sch:assert test="$tei_kids eq $tot_kids  or  $rng_kids eq $tot_kids" role="warning">
-        <sch:value-of select="$msgs_1to10"/> but those children are neither all TEI elements nor
-        all RELAX NG elements, and thus this &lt;content&gt; is invalid and can not be easily rectified.
-      </sch:assert>
-    </sch:rule>
-    </constraint>
-  </constraintSpec>
   <attList>
     <attDef ident="autoPrefix">
       <desc versionDate="2010-05-13" xml:lang="en">controls whether or
       not pattern names generated in the corresponding RELAX NG schema
       source are automatically prefixed to avoid potential
       nameclashes.</desc>
+      <desc versionDate="2024-02-28" xml:lang="ja">名前衝突の可能性を避けるために、
+        パターン名 [pattern name] 
+        に生成元のRELAX NGスキーマソースに応じた接頭辞を自動的に付けるかどうかを制御する。</desc>
       <datatype><dataRef key="teidata.truthValue"/></datatype>
       <defaultVal>true</defaultVal>
       <valList type="closed">
@@ -70578,6 +70575,11 @@ déclaration de même nom dans la définition courante.</desc>
           <att>prefix</att> attribute on the current
           <gi>schemaSpec</gi>
           </desc>
+          <desc versionDate="2024-02-28" xml:lang="ja">
+            参照された個々の名前。
+            たとえば、ある内容モデルの中での <gi>rng:ref</gi> 
+            要素には自動的にその時点の<gi>schemaSpec</gi>の<att>prefix</att>属性の値が付く。
+          </desc>
         </valItem>
         <valItem ident="false">
           <desc versionDate="2010-05-13" xml:lang="en">No prefixes are
@@ -70677,11 +70679,14 @@ déclaration de même nom dans la définition courante.</desc>
       </content>
     </egXML>
   </exemplum>
+  <remarks versionDate="2023-03-30" xml:lang="en">
+    <p>It is required that the <gi>content</gi> element has only one child element. If several RELAX NG elements are desired, they must be wrapped in a <gi>rng:div</gi>.</p>
+  </remarks>
   <listRef>
     <ptr target="#TDTAG"/>
   </listRef>
 </elementSpec>
-<classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="att.repeatable" type="atts" module="tagdocs">
+<classSpec ident="att.repeatable" type="atts" module="tagdocs">
   <desc versionDate="2021-08-22" xml:lang="en">provides attributes for the elements which define
   component parts of a content model.</desc>
   <desc versionDate="2023-09-27" xml:lang="ja">内容モデルの構成部分を定義するエレメントのための属性を提供する。</desc>
@@ -70694,12 +70699,12 @@ déclaration de même nom dans la définition courante.</desc>
          <att>maxOccurs</att> is 1, when <att>maxOccurs</att> is not specified
          <att>minOccurs</att> must always be less than or equal to 1.</desc> -->
     <constraint>
-      <sch:rule context="*[ @minOccurs and @maxOccurs ]">
+      <sch:rule context="tei:*[ @minOccurs and @maxOccurs ]">
         <sch:let name="min" value="@minOccurs cast as xs:integer"/>
         <sch:let name="max" value="if ( normalize-space( @maxOccurs ) eq 'unbounded') then -1 else @maxOccurs cast as xs:integer"/>
         <sch:assert test="$max eq -1 or $max ge $min">@maxOccurs should be greater than or equal to @minOccurs</sch:assert>
       </sch:rule>
-      <sch:rule context="*[ @minOccurs and not( @maxOccurs ) ]">
+      <sch:rule context="tei:*[ @minOccurs and not( @maxOccurs ) ]">
         <sch:assert test="@minOccurs cast as xs:integer lt 2">When @maxOccurs is not specified, @minOccurs must be 0 or 1</sch:assert>
       </sch:rule>
     </constraint>
@@ -70761,7 +70766,7 @@ déclaration de même nom dans la définition courante.</desc>
       <ptr target="#DEFCON"/>
   </listRef>
 </classSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="sequence">
+<elementSpec module="tagdocs" ident="sequence">
   <desc versionDate="2013-11-21" xml:lang="en">indicates that the constructs referenced by its children form a sequence</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -70773,7 +70778,9 @@ déclaration de même nom dans la définition courante.</desc>
   </content>
   <constraintSpec ident="sequencechilden" scheme="schematron">
     <constraint>
-      <sch:assert test="count(*)&gt;1">The sequence element must have at least two child elements</sch:assert>
+      <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>
@@ -70803,7 +70810,7 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#DEFCON" type="div2"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="alternate" module="tagdocs">
+<elementSpec ident="alternate" module="tagdocs">
   <desc versionDate="2013-11-21" xml:lang="en">indicates that the constructs referenced by its children form an alternation</desc>
   <desc versionDate="2018-12-28" xml:lang="ja">子要素らが参照している複数の構造が交換可能であることを示す。</desc>
   <classes>
@@ -70819,14 +70826,16 @@ déclaration de même nom dans la définition courante.</desc>
   </content>
   <constraintSpec ident="alternatechilden" scheme="schematron">
     <constraint>
-      <sch:assert test="count(*)&gt;1">The alternate element must have at least two child elements</sch:assert>
+      <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:lang="en" source="#UND"><content>
       <alternate>
-	<elementRef key="name"/>
-	<elementRef key="persName"/>
+        <elementRef key="name"/>
+        <elementRef key="persName"/>
       </alternate>
     </content>
     </egXML>
@@ -70839,7 +70848,9 @@ déclaration de même nom dans la définition courante.</desc>
 </elementSpec>
 <elementSpec module="tagdocs" ident="constraint">
   <gloss versionDate="2009-06-10" xml:lang="en">constraint rules</gloss>
+  <gloss versionDate="2024-02-28" xml:lang="ja">制約規則</gloss>
   <desc versionDate="2009-06-10" xml:lang="en">the formal rules of a constraint</desc>
+  <desc versionDate="2024-02-24" xml:lang="ja">形式的な制約規則</desc>
   <classes>
     <memberOf key="att.global"/>
   </classes>
@@ -70853,8 +70864,9 @@ déclaration de même nom dans la définition courante.</desc>
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <constraintSpec ident="isoconstraint" scheme="schematron">
         <constraint>
-          <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="tei:fileDesc/tei:titleStmt/tei:title[@type='main']"> a main title must be supplied
-          </assert>
+          <sch:rule context="tei:constraint">
+            <sch:assert test="tei:fileDesc/tei:titleStmt/tei:title[ @type eq 'main']">a main title must be supplied</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </egXML>
@@ -70864,7 +70876,7 @@ déclaration de même nom dans la définition courante.</desc>
       <constraintSpec ident="local" scheme="private">
         <constraint> 
 (output = (ident(title) ident(author) "You must supply a title or an author"))
-	</constraint>
+        </constraint>
       </constraintSpec>
     </egXML>
   </exemplum>
@@ -70872,9 +70884,13 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TDTAG"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="constraintSpec">
+<elementSpec module="tagdocs" ident="constraintSpec">
   <gloss versionDate="2009-06-10" xml:lang="en">constraint on schema</gloss>
+
+  <gloss versionDate="2024-02-28" xml:lang="ja">スキーマの制約</gloss>
   <desc versionDate="2017-06-24" xml:lang="en">contains a formal constraint, typically expressed in a rule-based schema language, to which a construct must conform in order to be considered valid</desc>
+  <desc versionDate="2024-02-28" xml:lang="ja">〔データの〕構造が妥当であるために満たしていなければならない形式的な制約。
+    通常は規則ベースのスキーマ言語で表現される。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.identified"/>
@@ -70912,10 +70928,12 @@ déclaration de même nom dans la définition courante.</desc>
   <constraintSpec ident="sch_no_more" scheme="schematron">
     <desc xml:lang="en" versionDate="2018-07-06">Relationship between scheme attribute and contents: Schematron 1.x</desc>
     <constraint>
-      <sch:report test="tei:constraint/sch1x:* and @scheme = ('isoschematron','schematron')">Rules
+      <sch:rule context="tei:constraintSpec">
+        <sch:report test="tei:constraint/sch1x:* and @scheme = ('isoschematron','schematron')">Rules
         in the Schematron 1.* language must be inside a constraintSpec
         with a value other than 'schematron' or 'isoschematron' on the
         scheme attribute</sch:report>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="isosch" scheme="schematron">
@@ -70928,11 +70946,24 @@ déclaration de même nom dans la définition courante.</desc>
       </sch:rule>
     </constraint>
   </constraintSpec>
-  <constraintSpec ident="needrules" scheme="schematron">
+  <constraintSpec ident="context-required" scheme="schematron" type="deprecationWarning" validUntil="2025-03-15">
+    <desc type="deprecationInfo" xml:lang="en" versionDate="2024-03-15">
+      The use of ISO Schematron <gi>sch:assert</gi> and
+      <gi>sch:report</gi> elements without a parent <gi>sch:rule</gi>
+      with a <att>context</att> attribute is deprecated — it will be
+      an error after 2025-03-15.</desc>
+    <!-- It is somewhat easier and clearer to use
+         "tei:constraintSpec[ @scheme eq 'schematron']//( sch:assert | sch:report )"
+         as the context and then test for "ancestor::sch:rule/@context".
+         But if we did that, then a user who had multiple
+         <sch:assert>s and <sch:report>s in a single contextless
+         constraint would get multiple messages. This way she only
+         gets one message. -->
     <constraint>
-      <sch:rule context="tei:macroSpec/tei:constraintSpec[@scheme eq 'schematron']/tei:constraint">
-        <sch:report test="sch:assert|sch:report">An ISO Schematron constraint specification for a macro should not
-        have an 'assert' or 'report' element without a parent 'rule' element</sch:report>
+      <sch:rule context="tei:constraintSpec[ @scheme eq 'schematron']/tei:constraint[ .//sch:assert | .//sch:report ]">
+        <sch:let name="assertsHaveContext" value="for $a in .//sch:assert return exists( $a/ancestor::sch:rule/@context )"/>
+        <sch:let name="reportsHaveContext" value="for $r in .//sch:report return exists( $r/ancestor::sch:rule/@context )"/>
+        <sch:report test="( $assertsHaveContext, $reportsHaveContext ) = false()" role="warning">The use of an &lt;sch:assert&gt; or &lt;sch:report&gt; that does not have a context (i.e., does not have an ancestor &lt;sch:rule&gt; with a @context attribute) in an ISO Schematron constraint specification is deprecated, and will become invalid after 2025-03-15.</sch:report>
       </sch:rule>
     </constraint>
   </constraintSpec>
@@ -70955,8 +70986,8 @@ déclaration de même nom dans la définition courante.</desc>
            Not sure, maybe @scheme should not be allowed when mode=change
            or mode=delete. Hmmm ...
       -->
-      <desc versionDate="2009-06-10" xml:lang="en">supplies the name of the language in which the constraints
-      are defined</desc>
+      <desc versionDate="2009-06-10" xml:lang="en">supplies the name of the language in which the constraints are defined</desc>
+      <desc versionDate="2024-02-28" xml:lang="ja">制約を定義する言語名を示す。</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <constraintSpec scheme="schematron" ident="usage_based_on_mode">
         <constraint>
@@ -70968,6 +70999,7 @@ déclaration de même nom dans la définition courante.</desc>
       <valList type="semi">
         <valItem ident="schematron">
           <gloss versionDate="2016-09-27" xml:lang="en">ISO Schematron</gloss>
+          <gloss versionDate="2024-02-28" xml:lang="ja">ISO スキマトロン</gloss>
         </valItem>
       </valList>
       <remarks versionDate="2023-08-06" xml:lang="en">
@@ -70984,6 +71016,10 @@ déclaration de même nom dans la définition courante.</desc>
         for what a processor should do if its value does not match
         that of the <gi>constraintSpec</gi> being deleted.</p>
       </remarks>
+      <remarks versionDate="2024-02-28" xml:lang="ja">
+        <p><gi>constraintSpec</gi>でのSchematron 1.xの利用は、このガイドラインでは推奨せず最近のTEIスタイルシートでもサポートしない。
+        それ故、<val>schematron</val>の値はISO Schematronが<gi>constraintSpec</gi>で用いられることを示すのに使う。</p>
+      </remarks>
     </attDef>
     <attDef ident="type" mode="replace">
       <desc versionDate="2018-09-17" xml:lang="en">characterizes the
@@ -71008,8 +71044,9 @@ déclaration de même nom dans la définition courante.</desc>
       <constraintSpec ident="demo-c1" scheme="schematron">
         <desc>Enforce the presence of the <att>spanTo</att> attribute</desc>
         <constraint>
-          <sch:assert test="@spanTo">The spanTo= attribute of <sch:name/>
-          is required.</sch:assert>
+          <sch:rule context="tei:addSpan">
+            <sch:assert test="@spanTo">The spanTo= attribute of <sch:name/> is required.</sch:assert>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </egXML>
@@ -71020,9 +71057,11 @@ déclaration de même nom dans la définition courante.</desc>
         <desc>Implement an accessibility rule which says that pictures
         should have textual explanations</desc>
         <constraint>
-          <sch:report test="not(tei:figDesc or tei:head)"> You should
-          provide information in a figure from which
-          we can construct an alt attribute in HTML </sch:report>
+          <sch:rule context="tei:figure">
+            <sch:report test="not( tei:figDesc | tei:head )">You should
+            provide information in a figure from which
+            we can construct an alt attribute in HTML</sch:report>
+          </sch:rule>
         </constraint>
       </constraintSpec>
     </egXML>
@@ -71175,7 +71214,7 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TDCLA"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="attDef">
+<elementSpec module="tagdocs" ident="attDef">
   <gloss versionDate="2005-01-14" xml:lang="en">attribute definition</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">속성 정의</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">屬性定義</gloss>
@@ -71213,16 +71252,22 @@ déclaration de même nom dans la définition courante.</desc>
   </content>
   <constraintSpec ident="attDefContents" scheme="schematron">
     <constraint>
-      <ns xmlns="http://purl.oclc.org/dsdl/schematron" prefix="teix" uri="http://www.tei-c.org/ns/Examples"/>
-      <assert xmlns="http://purl.oclc.org/dsdl/schematron" test="ancestor::teix:egXML[@valid='feasible'] or @mode eq 'change' or @mode eq 'delete' or tei:datatype or tei:valList[@type='closed']">Attribute: the definition of the @<value-of select="@ident"/> attribute in the <value-of select="ancestor::*[@ident][1]/@ident"/>
-      <value-of select="' '"/>
-      <value-of select="local-name(ancestor::*[@ident][1])"/> should have a closed valList or a datatype</assert>
+      <sch:ns prefix="teix" uri="http://www.tei-c.org/ns/Examples"/>
+      <sch:rule context="tei:attDef">
+        <sch:assert test="ancestor::teix:egXML[ @valid eq 'feasible']                        or @mode eq 'change'                        or @mode eq 'delete'                        or tei:datatype                        or tei:valList[ @type eq 'closed']">
+          Attribute: the definition of the @<sch:value-of select="@ident"/> attribute in the
+          <sch:value-of select="ancestor::*[@ident][1]/@ident"/>
+          <sch:value-of select="' '"/>
+          <sch:value-of select="local-name(ancestor::*[@ident][1])"/> should
+          have a closed valList or a datatype
+        </sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <constraintSpec ident="noDefault4Required" scheme="schematron">
     <constraint>
       <sch:rule context="tei:attDef[@usage eq 'req']">
-	<sch:report test="tei:defaultVal">Since the @<sch:value-of select="@ident"/> attribute is required, it will always be specified. Thus the default value (of "<sch:value-of select="normalize-space(tei:defaultVal)"/>") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element.</sch:report>
+        <sch:report test="tei:defaultVal">Since the @<sch:value-of select="@ident"/> attribute is required, it will always be specified. Thus the default value (of "<sch:value-of select="normalize-space(tei:defaultVal)"/>") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element.</sch:report>
       </sch:rule>
     </constraint>
   </constraintSpec>
@@ -71233,8 +71278,13 @@ déclaration de même nom dans la définition courante.</desc>
   <!-- confident these work properly, could condense them to one. -->
   <!-- -Syd, 2015-03-29 -->
   <constraintSpec ident="defaultIsInClosedList-twoOrMore" scheme="schematron">
+    <!-- The use of the '>' operator (expressed as "&gt;"), below, is
+         not needed for comparison of a sequence, but seems to
+         automatically handle a left hand operand that is an
+         untypedAtomic, whereas the "gt" operator did not.
+         — Syd, 2023-12-14 -->
     <constraint>
-      <sch:rule context="tei:attDef[ tei:defaultVal and tei:valList[@type eq 'closed'] and tei:datatype[ @maxOccurs &gt; 1 or @minOccurs &gt; 1 or @maxOccurs = 'unbounded' ] ]">
+      <sch:rule context="tei:attDef[     tei:defaultVal                                      and tei:valList[ @type eq 'closed']                                      and tei:datatype[ @maxOccurs &gt; 1  or  @minOccurs &gt; 1  or  @maxOccurs eq 'unbounded']                                    ]">
         <sch:assert test="tokenize(normalize-space(tei:defaultVal),' ') = tei:valList/tei:valItem/@ident">In the <sch:value-of select="local-name(ancestor::*[@ident][1])"/> defining
         <sch:value-of select="ancestor::*[@ident][1]/@ident"/> the default value of the
         @<sch:value-of select="@ident"/> attribute is not among the closed list of possible
@@ -71244,7 +71294,7 @@ déclaration de même nom dans la définition courante.</desc>
   </constraintSpec>
   <constraintSpec ident="defaultIsInClosedList-one" scheme="schematron">
     <constraint>
-      <sch:rule context="tei:attDef[ tei:defaultVal and tei:valList[@type eq 'closed'] and tei:datatype[ not(@maxOccurs) or ( if ( @maxOccurs castable as xs:integer ) then ( @maxOccurs cast as xs:integer eq 1 ) else false() )] ]">
+      <sch:rule context="tei:attDef[     tei:defaultVal                                      and tei:valList[ @type eq 'closed']                                      and tei:datatype[                                             not(@maxOccurs)                                         or  ( if ( @maxOccurs castable as xs:integer ) then ( @maxOccurs cast as xs:integer eq 1 ) else false() )                                                      ]                                    ]">
         <sch:assert test="string(tei:defaultVal) = tei:valList/tei:valItem/@ident">In the <sch:value-of select="local-name(ancestor::*[@ident][1])"/> defining
         <sch:value-of select="ancestor::*[@ident][1]/@ident"/> the default value of the
         @<sch:value-of select="@ident"/> attribute is not among the closed list of possible
@@ -71258,12 +71308,9 @@ déclaration de même nom dans la définition courante.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">속성 또는 요소의 수의성을 명시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">說明屬性或元素的必備性。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">属性または要素の選択性を示す。</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">précise qu'un attribut ou un élément sont
-      facultatifs.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">especifica el caracter opcional de un atributo o un
-      elemento</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica il carattere facoltativo di un attributo o
-      elemento</desc>
+      <desc versionDate="2007-06-12" xml:lang="fr">précise qu'un attribut ou un élément sont facultatifs.</desc>
+      <desc versionDate="2007-05-04" xml:lang="es">especifica el caracter opcional de un atributo o un elemento</desc>
+      <desc versionDate="2007-01-21" xml:lang="it">indica il carattere facoltativo di un attributo o elemento</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>opt</defaultVal>
       <valList type="closed">
@@ -71496,7 +71543,7 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TDATT"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="dataRef">
+<elementSpec module="tagdocs" ident="dataRef">
   <desc versionDate="2010-05-14" xml:lang="en">identifies the datatype of an attribute value, either by referencing an item in an externally defined datatype library, or by
     pointing to a TEI-defined data specification</desc>
   <classes>
@@ -71580,7 +71627,7 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TD-datatypes"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" ident="dataFacet">
+<elementSpec module="tagdocs" ident="dataFacet">
   <desc versionDate="2016-11-21" xml:lang="en">Restricts the value of the strings used to represent values of a datatype, 
     according to <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>.
  </desc>
@@ -72297,33 +72344,23 @@ an attribute may take, additional to the information carried by the
   </remarks>
 </classSpec>
 <classSpec module="tagdocs" type="atts" ident="att.identified">
-  <desc versionDate="2021-08-22" xml:lang="en">provides identifying attributes for elements which can be
-  subsequently referenced by means of a <att>key</att>
-  attribute.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko"><att>key</att> 속성에
-  의해 참조될 수 있는 요소의 속성을 제시한다.</desc>
-  <desc versionDate="2007-05-02" xml:lang="zh-TW">可利用屬性
-  <att>key</att>來參照的元素</desc>
+  <desc versionDate="2021-08-22" xml:lang="en">provides identifying attributes for elements which can be subsequently referenced by means of a <att>key</att> attribute.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko"><att>key</att> 속성에 의해 참조될 수 있는 요소의 속성을 제시한다.</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">可利用屬性 <att>key</att>來參照的元素</desc>
   <desc versionDate="2022-05-09" xml:lang="ja">後で<att>key</att>属性によって参照されうる要素を指定する属性を示す。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">fournit les attributs
-  pour des éléments référençables au moyen d'un attribut
-  <att>key</att>.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">elementos a los que se
-  puede hacer referencia a través del atributo <att>key</att>.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">elementi ai quali si
-  può fare riferimento tramite l'attributo <att>key</att>
-   </desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">fournit les attributs pour des éléments référençables au moyen d'un attribut <att>key</att>.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">elementos a los que se puede hacer referencia a través del atributo <att>key</att>.</desc> <desc versionDate="2007-01-21" xml:lang="it">elementi ai quali si può fare riferimento tramite l'attributo <att>key</att></desc>
   <classes>
     <memberOf key="att.combinable"/>
   </classes>
   <constraintSpec ident="spec-in-module" scheme="schematron">
     <constraint>
-      <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:elementSpec[@module]|tei:classSpec[@module]|tei:macroSpec[@module]">
-        <assert test="(not(ancestor::tei:schemaSpec | ancestor::tei:TEI | ancestor::tei:teiCorpus)) or (not(@module) or (not(//tei:moduleSpec) and not(//tei:moduleRef)) or (//tei:moduleSpec[@ident = current()/@module]) or (//tei:moduleRef[@key = current()/@module]))">
-        Specification <value-of select="@ident"/>: the value of the module attribute ("<value-of select="@module"/>") 
+      <sch:rule context="tei:elementSpec[@module]|tei:classSpec[@module]|tei:macroSpec[@module]">
+        <sch:assert test="(not(ancestor::tei:schemaSpec | ancestor::tei:TEI | ancestor::tei:teiCorpus)) or (not(@module) or (not(//tei:moduleSpec) and not(//tei:moduleRef)) or (//tei:moduleSpec[@ident = current()/@module]) or (//tei:moduleRef[@key = current()/@module]))">
+        Specification <sch:value-of select="@ident"/>: the value of the module attribute ("<sch:value-of select="@module"/>") 
 should correspond to an existing module, via a moduleSpec or
-      moduleRef</assert>
-      </rule>
+      moduleRef</sch:assert>
+      </sch:rule>
     </constraint>
   </constraintSpec>
   <attList>
@@ -72332,8 +72369,7 @@ should correspond to an existing module, via a moduleSpec or
       <desc versionDate="2007-12-20" xml:lang="ko">이 요소가 참조된 확인소를 제공한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">提供被參照的元素的識別符號。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該要素を参照する識別子を示す。</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">fournit l'identifiant qui référence cet
-					élément.</desc>
+      <desc versionDate="2007-06-12" xml:lang="fr">fournit l'identifiant qui référence cet élément.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">proporciona el identificador utilizado para indicar un elemento.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica l'identificatore utilizzato per indicare l'elemento</desc>
       <datatype><dataRef key="teidata.name"/></datatype>
@@ -72343,8 +72379,7 @@ should correspond to an existing module, via a moduleSpec or
       <ident type="module">tei</ident> infrastructure module.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko"><ident type="module">tei</ident> 하부구조 모듈에서 이 대상이 미리 선언되어야 하는지를 설명한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">說明該元素集是否為全域元素集，並必須在核心中宣告。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該オブジェクトが、<ident type="module">TEI</ident>基盤モジュー
-      ルで事前に宣言されるべきかどうかを示す。</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該オブジェクトが、<ident type="module">TEI</ident>基盤モジュー ルで事前に宣言されるべきかどうかを示す。</desc>
       <desc versionDate="2009-05-27" xml:lang="fr">précise si cet objet nécessite une prédéfinition dans le module d'infrastructure <ident type="module">tei</ident>.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">declara si la clase debe ser considerada global y por tanto definida en el módulo core</desc>
       <desc versionDate="2007-01-21" xml:lang="it">dichiara se la classe debba essere considerata globale e quindi definita nel modulo core</desc>
@@ -72356,15 +72391,14 @@ should correspond to an existing module, via a moduleSpec or
       <desc versionDate="2007-12-20" xml:lang="ko">이 대상이 정의되어야 하는 모듈명을 제시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">提供定義該元素的模組名稱。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該オブジェクトが定義されているモジュール名を示す。</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">fournit le nom du module dans lequel doit
-					être défini cet objet.</desc>
+      <desc versionDate="2007-06-12" xml:lang="fr">fournit le nom du module dans lequel doit être défini cet objet.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">proporciona el nombre del módulo en que el objeto debe ser definido.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica il nome del modulo nel quale l'oggetto deve essere definito</desc>
       <datatype><dataRef key="teidata.xmlName"/></datatype>
     </attDef>
   </attList>
 </classSpec>
-<classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" type="atts" ident="att.deprecated" predeclare="true">
+<classSpec module="tagdocs" type="atts" ident="att.deprecated" predeclare="true">
   <desc versionDate="2013-05-16" xml:lang="en">provides attributes indicating how a deprecated feature will be treated in future releases.</desc>
   <desc versionDate="2019-04-08" xml:lang="ja">非推奨の機能を将来のリリースでどのように扱うかを示す属性を提供する。</desc>
   <attList>

From 8aefd67c482fea69e6bb8fcd5966f4329cd5a1b2 Mon Sep 17 00:00:00 2001
From: Joey Takeda <joeytakeda@users.noreply.github.com>
Date: Sun, 5 May 2024 17:18:11 -0700
Subject: [PATCH 42/50] Attempt to fix #678

Refining how the zero-th pass for ODD processing handles gathering up duplicate named specs
---
 odds/odd2odd.xsl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index 71023f2bd..9497b2599 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -508,13 +508,16 @@ of this software, even if advised of the possibility of such damage.
   </xsl:template>
 
   <xsl:template match="tei:elementSpec[@mode eq 'change']|tei:classSpec[@mode eq 'change']|tei:macroSpec[@mode eq 'change']|tei:dataSpec[@mode eq 'change']" mode="pass0">    
+    <xsl:variable name="CURRENT_ID" select="generate-id(.)"/>
+    <xsl:variable name="CHANGED_SPECS" select="key('odd2odd-CHANGE',tei:uniqueName(.))" 
+      as="element()+"/>    
     <xsl:choose>
-      <xsl:when test="count(key('odd2odd-CHANGE',@ident))&gt;1">
+      <xsl:when test="count($CHANGED_SPECS) gt 1">
         <xsl:if
-          test="generate-id(.)=generate-id(key('odd2odd-CHANGE',@ident)[1])">
+          test="$CURRENT_ID=generate-id($CHANGED_SPECS[1])">
           <xsl:copy>
             <xsl:copy-of select="@*"/>
-            <xsl:for-each select="key('odd2odd-CHANGE',@ident)">
+            <xsl:for-each select="$CHANGED_SPECS">
               <xsl:apply-templates
                 select="*|text()|comment()|processing-instruction()"
                 mode="pass0"/>

From 3453c0f9ef24559539812a1023c4c6b7585a3bd1 Mon Sep 17 00:00:00 2001
From: Joey Takeda <joeytakeda@users.noreply.github.com>
Date: Sun, 5 May 2024 19:48:31 -0700
Subject: [PATCH 43/50] Relaxing cardinality restraint

---
 odds/odd2odd.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index 9497b2599..22863fb8c 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -510,7 +510,7 @@ of this software, even if advised of the possibility of such damage.
   <xsl:template match="tei:elementSpec[@mode eq 'change']|tei:classSpec[@mode eq 'change']|tei:macroSpec[@mode eq 'change']|tei:dataSpec[@mode eq 'change']" mode="pass0">    
     <xsl:variable name="CURRENT_ID" select="generate-id(.)"/>
     <xsl:variable name="CHANGED_SPECS" select="key('odd2odd-CHANGE',tei:uniqueName(.))" 
-      as="element()+"/>    
+      as="element()*"/>    
     <xsl:choose>
       <xsl:when test="count($CHANGED_SPECS) gt 1">
         <xsl:if

From 4d5f316bdb8fb81ac35c97011d3c6d2a9aef8401 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@gmail.com>
Date: Sun, 12 May 2024 00:25:14 +1000
Subject: [PATCH 44/50] Fix typo in `tei-to-text.xsl`

---
 txt/tei-to-text.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/txt/tei-to-text.xsl b/txt/tei-to-text.xsl
index 17029c807..2ba0f2963 100644
--- a/txt/tei-to-text.xsl
+++ b/txt/tei-to-text.xsl
@@ -158,7 +158,7 @@ of this software, even if advised of the possibility of such damage.
 per line, if requested by "oneword" parameter -->
 
 <!-- if makeCSV is requested, each word is in a line of a CSV file
-     by itself followed by its position within the hierachy of the XML
+     by itself followed by its position within the hierarchy of the XML
      document
 -->
   <xsl:function name="tei:escapeChars" as="xs:string">

From 98000963f009acefba340e2355470a543556b1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gyula=20Kalcs=C3=B3?=
 <38312965+gyulakalcso@users.noreply.github.com>
Date: Thu, 16 May 2024 14:40:51 +0200
Subject: [PATCH 45/50] Update mediawiki-to-tei.xsl

correcting typo (appy -> apply) in row 36
---
 mediawiki/mediawiki-to-tei.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediawiki/mediawiki-to-tei.xsl b/mediawiki/mediawiki-to-tei.xsl
index 4ce02eb4a..9f03699b4 100644
--- a/mediawiki/mediawiki-to-tei.xsl
+++ b/mediawiki/mediawiki-to-tei.xsl
@@ -33,7 +33,7 @@
       </sourceDesc>
        </fileDesc>
      </teiHeader>
-     <xsl:appy-templates select="text"/>
+     <xsl:apply-templates select="text"/>
    </TEI>
   </xsl:result-document>
 </xsl:for-each>

From 1d2ea124d270967e55221611d46be12c856b60c7 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Mon, 24 Jun 2024 17:29:47 -0400
Subject: [PATCH 46/50] =?UTF-8?q?With=20@joeytakeda=20and=20@ebeshero,=20f?=
 =?UTF-8?q?ix=20odd2odds=20so=20that=20it=20does=20not=20"justcopy"=20attD?=
 =?UTF-8?q?ef=20elements=20that=20are=20not=20defined=20in=20the=20source?=
 =?UTF-8?q?=20class.=20This=20is=20a=20bit=20complicated,=20see=20@joeytak?=
 =?UTF-8?q?eda=E2=80=99s=20explanation=20in=20#687=20itself.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 odds/odd2odd.xsl | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index 22863fb8c..c15eb2326 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -1635,11 +1635,18 @@ of this software, even if advised of the possibility of such damage.
     </xsl:for-each>
     <!-- class attributes are ones where there is no direct correspondence in
     the source for this element -->
-    <xsl:apply-templates mode="justcopy"
-                         select="tei:attList/tei:attDef[(@mode eq 'change'
-                                 or @mode eq 'delete'
-                                 or @mode eq 'replace') and
-                                 not(@ident=$ORIGINAL/tei:attList//tei:attDef/@ident)]"/>
+    <xsl:if test="$ORIGINAL/self::tei:elementSpec">
+      <xsl:apply-templates mode="justcopy"
+                           select="tei:attList/tei:attDef
+				   [
+				     (    @mode eq 'change'
+                                       or @mode eq 'delete'
+                                       or @mode eq 'replace'
+				     )
+				     and
+                                     not( @ident = $ORIGINAL/tei:attList//tei:attDef/@ident )
+				   ]"/>
+    </xsl:if>
     <!-- any direct attRef elements -->
     <xsl:apply-templates mode="justcopy"
                          select="tei:attList/tei:attRef"/>

From b44a47820e35c4c8440992b9027772e6eb1ee0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helena=20Berm=C3=BAdez=20Sabel?= <helena.b.sabel@gmail.com>
Date: Fri, 5 Jul 2024 16:15:39 +0200
Subject: [PATCH 47/50] P5subset update (#689)

* update p5subset and expected results
---
 Test/expected-results/test.epub               |  Bin 383589 -> 383602 bytes
 Test/expected-results/test.isosch             |  115 +-
 Test/expected-results/test.odd.html           |  484 +++---
 Test/expected-results/test.odt                |  Bin 367118 -> 367118 bytes
 Test/expected-results/test.odt.listing        |   26 +-
 Test/expected-results/test.rng                |  728 ++++-----
 Test/expected-results/test15.odd.html         |  738 ++++-----
 Test/expected-results/test15.odd.rnc          |  771 ++++-----
 Test/expected-results/test21.odd.rnc          | 1112 +++++++------
 Test/expected-results/test30.dtd              |  615 +++++---
 Test/expected-results/test30.rnc              |  877 ++++++-----
 Test/expected-results/test33.rnc              |  501 +++---
 Test/expected-results/test34.combined.json    |  387 +++--
 Test/expected-results/test34.odd.html         |  304 ++--
 Test/expected-results/test34.rnc              |  501 +++---
 Test/expected-results/test35.rnc              |  499 +++---
 Test/expected-results/testClass.rnc           |   58 +-
 Test/expected-results/testdrama.compiled.xml  |  837 ++++++----
 Test2/expected-results/testAttValQuant.rng    |  426 ++---
 Test2/expected-results/testCocoa1.xml         |    2 +-
 Test2/expected-results/testCocoa2.xml         |    2 +-
 Test2/expected-results/testPure1.rng          |  507 +++---
 .../testPure1InvalidInstanceRngMessages.txt   |    4 +-
 source/p5subset.xml                           | 1391 +++++++++++------
 24 files changed, 6232 insertions(+), 4653 deletions(-)

diff --git a/Test/expected-results/test.epub b/Test/expected-results/test.epub
index 9e89ccdcde5f7acb7147a510e049a1cfdb4c1a0e..e49603e586d15a3e7b6ba3c5319982da902f3370 100644
GIT binary patch
delta 6267
zcmZXZcRU<h8^>1}y+>KSchR$=3nF?6LPCg6w1^fgtJffitX`sq=w+24+KLiH?}X@G
zvO*AV?!5`_edmwe{r;Zcd7d-#nK|do+2v}ggK8=wZ8Z!`JkVdqxa+cE9FYk2pP$N1
z*dUyLROiM&YJw0N?H{>H7cCXz0#KMpTKwM)o&<;XCm@-4VawNqUr^IzSz+bBl#?x$
zh^&clFTZXOuW<A|@e3OXX^f)_K-oA@YO>u^d9zpLoBBO}h+Ta5SEhSBnZciXd)2}|
zK_@?(QyezTx_tO*<sbR{%s?(x=L5NsFv%)fG}ua1&YmQGe@kl3y`l9RA8?yXC-;k{
zZLVCd^XWU12rJkyS2YYbsAO5GGKkOQM<d;nqwllZQjyH;j;~a1SK_#_(P)tC;%>3h
z6QbkhO4v~^5)lQh11X(>Dv4wf){1*y_-0)AgqSCbCVKA@N4jlXL!|_fc4|I8cp|;&
zc_-%)UNT{M`xMxj2NGrOh<d7boifL{I0u_!NVy=v$GZ-Oo4;#prZ6NGpxH6Jx4*Hn
z@pGL@W1X;JX@`XP$8781%FkD&A2R}<WA-MRd@bXSm6w)RL??S#xkfE)*WR=={VWdj
z`Wfq+{H{8q7^{^|7BgX|TF`L4_vj#4P9;~4r`i(N@G!%GM^Uf+$D77V>l<bz(gPTS
zLemf@#pn0BU`2anKerC{C6ZEZJ9>6)JJn}#$fg!PDmEO*i>p++U5h2UWY;4S!T*xX
zK_`iv@13RQK-;WR76LQAB5%yz8%dtaMVZCP^WEHog}e84O-rsEwH^GLPPtAtH6bz7
zv2mp#U7|uYVaQX~Lz&5|S(j@DyqSq|kZu2LA$1BYz~px;x{|El;f~#04YV>U>EYVN
zYA#N8;i#W#Tt9M@&fshykVu8*$qWQ*H~Sw3gnh)nt`eW5QoSwwiub!r#$0Zv3`;MU
zL#?oA;?R#;c;M!nMHsh{=M%@f$+(KvV1uVVCNn1Nh~3U@#%2DSzGv|SK|F6W@!EfV
z;N<XZ!QSIbmbMW!m2>J(#8Dkq<4GRchcD6Z$M`IExl1n2Rhbn_W^H1ZZlP@@S4;!0
zTAEgq7A+oai6OCPG<XKDWDf1QjqjgMl)dquRV_C)Le11x?qq|y@k!UOArVl0iSm(m
z_tJ+$=m}bu%YX3aubO+CBsE8^`<P+zTQ7uA!y1yZsjR=4E14u!L{a;gX&U!MP_2w~
zrg@uvd$m4hI!^qp;>8&cHH^z@%b@p2LCB)zF_N)|TCCW{)wq^pSG0%9eR|f==99Ij
z$33Zyi7qWfHbfuau|iTZ%-PgP*oK-(gDb)cq%kT)B&&=5(pHV7KgeJrb19a3k*9aN
z9@f%k>&aGTGhS>rUS=m&Xeaj8POQjItkll)?(j}^X}^02(mfIBo`-a=LArM$-A9q`
z%Sd+=(j6ENi%JPi<XxHpZ#@@rGMa@PeRI$kEP~l$lf1ayu>740?ZmO8UZ`SVwe@+~
zE%1oTe97o(LhP~DS&_^vVusNop05`h_R<BAy}@}%6!D$dV4SL|cqOg5SS`OV&!B)|
z{e#W1ri8VVVVp-n-&|6PkHTcqhWgjoK;Fg^F;4MozVZG?Lo=W$-VJ13D|3wekUVcZ
zf+V{-B$7|nt%*fj$Kqh`1(aJ^l}14+?1g=QBDZLSvQnJMwUfal37K3I<?ax47~zab
z;)4dK(bbi;1ch&`_t{2q=Ok}?_Cg;!oQpSYvQxg1fA%3L-EC(@Ia6P`%>dAAU5VKp
zRr=06I<*q0mXy^P6*gTA^GnJxg`N2RoRF$%F4jBjlj>oRbU!a_eBkQ#is{x{N9UC0
zhI)q>4?Gy9E9EVG70Mdzju6}R+548G^2UO(@6tn$u64+Brb4jArL(%&yv=yVXvHG~
zv<n<$TBu|Xn(Gbs<e4c%A}G^jrwwKg>8YH~?ZwX+|BTK5jKbDmp>-et1hOUufoKy*
zZ&Fv?=O6$s#$N|s$;-jGls^ppA|fTUb_u+qLzgzpo4%J2E?ImD60%vB@LB#Y=0!G%
zJ9w87HC2tvNTw#{Wu!=_6_fn;ba0f#%ljS!1R}!yr{`e!!VrK}m42`5(r^EO>M~P=
zN!ewOWzA?VZI3K_E+axV#lPD8Gjk;@*)w1C5#Is5ob-2b_$FyB3=0HG$ASwg0AK`!
z4lN4nj}t!k6^#|K$%1BP`)|o3>WYN;<qH0{0nRuE00{PM4C8<62&zu>%UlT9bqtD&
z(?X;QVGLcC{+Wfrf_QZk<BI*46m*&IZ$l9-=A{Atw<P-X|D@)r|C5vzfXjvj<;B3o
zbweOZ0BwNe_x1U%rM09&0s_S$sH%WCESR^}3_4g+R|1EBxx(CNC<AQf+s<p~p_{3s
zBwrIpaNS}fSJIh}SZKP2&?uYl<5)(hL<JD8FUP6hbIs#m;FDuyx9O9E%ABcpB{X(8
zlT4NYMkCsLat3bWjL)JqvN8kZU3_;@zT$e;1|%^m1YQB<rUE$aKh+5%19Nvf!(e5O
znx+0E9nlTbn?(j%lHK*)Z2t0CEO;sFE7w=f!ugT?i7NEEAj2_==*e2Lu?`WewpN`)
z9!)c7_E<fmpXCYAAABSbQ*mZjJt5Ab=ewpQJ!PhA4=UtV%p}0mX?kQ%_Hatw5lgoR
z%DJMHSDrc-!!uP{`i--D3D*_k4V&VEh}}sr%%9TL05dfBno#CV<?2j0;m>^1O!?4p
z2s=KTW+Z;%&7o_xv9rEYJnOE-Yt7NDnsJ+SaYK6>T;etT>EO{cTCEym?QBem-B1@2
zA6~<Jq<iR4<TuGqN-#xkgql##F)ga1drr^7k6C0^=XeIzjHtJheLw+EgmHe-#`b)l
zZT{)C*kUxlmg(X-M{$bCt%BRl9gvc|a`3>-IG4a4y=Z9dTWaKDj4)fM->WBWpKX7X
zi?_dYe4-u>Z29j~)#cSCS1rOqPpd0~?=7iMaJ$c}iLGfThr8H?C7M4AfYVJc7e07w
zwWe$8bFg<ZJf}YB=PfWrOAOnN*=FcLHIbOakUE{Nt<)?{1svdLB@%KxW->0WQBWYJ
zIS%Q%w<-YwMucmmKkoPLy74ZE&J>nm+5G4^8=LPrNi%hf9DKu#VJ<BTHmqIV)Awmv
z?6$f-*cXcWQQrP3ds~ub?<DBD=ExY!GD6fme-}?2Ea7C$)6ww8`v9g<cV2!zXntrQ
z_{BN)hqfDM<IDi)EM02DRh&9R?<p2--p<oj{t>*BrZNvQEB4w4*l7td?sA<dE6zuY
z$1<X7cg9Ao@Pi26(jycJHT1(Rj5I!r4G}z8YKm^I_3D45>)-Hs#CR?cLYC!W+r(l~
zslV1vSY)&1`x(ow(wzmCz_SZjgm8A#1##`T7t=YT_~svfp(o&LDAO<I3tP#*J+a$&
zSf~l|^7Ve<ow4t(MSNS*=Pq)7IdLIKNhfyXJs(H<hXo&nll<K<?|D?5)RC{lOu;~%
zU%o&%VH`YKT}`O{Isbetc<S9dFb-F;A@&kiRpUGKuZ4wKKDUZtddcoJgMJT_i|lge
z6L*j)<##m(4eZ^?j|SzmnPn7tH%YQG*Ft;qMkDd8r{CC7baL3(s{pwoV+Gh%Z<T9D
zRS}p)f;_v%37)52+ll@$Ou{22-z`rnx;#6FxKwBF`&#Dsf`MFq>bn`KUnOew?styz
zqk7gq7Kx<2?q*enfws}Mn+WMLdGp_k-bpmS#;3F-F_}%1WYvv%lH#qgAL>S_m>H!z
znTfyDJp@qzYc0Bq2YU&JdI<;D)3h5Cnw545jw@LR<5uk$w(Q=RQA35{<PL5|sLN1<
z9CqC2FDLf9AvH113pL*tQZ6g7{<f}-Y@x`DuGYnlSrW8{ed2v|+-g6Cxx-*Ta)UL$
zxh$)i6W#bktmW>5LfB|SQF6KryVPnauA@$)(}7%gXkl31%QBgbS33(YGD?ma{N3-q
z(o90EZdIQXw1Vq~4)Bf7Ylc^&>K!C~_oxfb#MjCg??+ru62LusigV-55w0V({j+SM
zRBENscVbX2Sy<<w>O`@po2_<@pHzf5>(m@Mn)o)foDO$$92A<o<3J$8yt*Ay{dqDc
z8D<{Cz!XF5hoZ&HecOU6tc_nh#oi^zn%wtgbwe_23?wAKNKkm(a+^4&GW3}219L|g
z({sBU4G+`yr%@}}_Zi0+iy&+gvK6Slu!PCobS~F;99W8O+VE{qlx}{;_u3`1nvS%b
zgCxDxP1Ma}uc0@MrE?LL9<lv8*ydycIbsg{I(jVW*dlqxd^S~@0Qqnlt~ZhD%SmJ5
zl1cLeJ{*Q;HUX9fD;nr36Ai9{*!@let>oph&R#CAM5Sa~?|bu`i5+y)1JIY+lP0DL
zi^dPCSYWIpvOB<NnzyO_G6uQA+UrexTUI*4Q_>+BAsS!&d<mM<Ye;rtrRn5P^PCnv
zdZvaC=Wc4*ZY5N6o-ICgd!B^w-j>vTh;b7oLS4<|v)&q{e?YR1?MxuuL(h54@o=~#
z*8H4-57lLx6y%O}UpjP{%#TiBCR(`Jr&KEX+YQ*zwykt6!=CUD<XFbxNiO#q9T>8H
z1ifp@XECc5Ums(8!l&(Hkxj6XHa`=n_ze4Jm@Ho?#(d@vsSPD{;<YfwIlfR<1;ysL
zmKddG`slh5$EBM~%rall$4gHn9BG>$Gp4Wder<Fzeb~So3NLg8=RfrqB27^d8$DWA
z9!0?n3x75~X(8dpn)jiC${5So(n80!Vs4&~pJ73HS0J7oM#_(md-zQ2ds|fMPIH%e
z3b+BY-INd3f%AGA-)QDB-r2`$PYbBT>i0xW)o(l%$VyA)aK$~{^1iXN{IGPT@llig
zX7R1^?WYZMME)wC)7y?D=9Mwj{2!+n&$tL-q(I@Y0bz97^9PhU;}3!?=ia6pW0Uk_
zXqk>*@0$Yc*d;QZ3*7x#Q)Js6Ag?-8GySR48GtvrIYB?qF;G7{D?DcGYTZHA^ylnp
zhrFBiZFPN*kbDtYRL`#IvFuVTnHf(WPL#aLVi#L96h>ZMxL@EponMp`ZZ{hdEX&mZ
zGZUt;s?tio(a-+MJM|IMl)K8Lf2!Zc#v$HhOTK6O+jb#ox>c&{F35-LL7(sxEHQ2|
z^u1^>E3#<iwZJ8A2zVT)D8l77C>^GNpq!t~uWGShFfk@vu-Pex?p2*ph(!;^6iAdd
z2zGoY!(%<bK1eUg+=IV-7oPa^6mH^Z3tOx>aB`wWXYO!GJ<*u!eoTzQ%YBWvW>w0C
zqbnoUdyr8XdTUqRN2o&&zs|~aIi=yb{QNzLrQ-OT;2-rnw9rZOgeavgrkB3FMRTq5
zJ{rriD0owcy_9qVltGH#wQzs~;>VEhmnYh17&g$o^I+<nFUqg-D|fK)Ogi`D37GKK
z+B%oHt{lyHj?eJn!p1F<3<MRk=eALK;`M?C#%FFs@?Sr*TTIV4vEr8Kjx}S9aG%ms
zC+nUQCEue!vyX@51neH6{JLN778sr}M)tMHCENCbh;#e~ywm6iF<4*nic6!KXEzu{
zGR3VcI3p&{l5@398@!zJr<HVf(O?UC=k%YgcA1a-nbXPaI}zd)yCzN3j5WtijJD#U
zsNpVBlRgKU(L(TX_nJ_S6Kza+8kT0lEuyyCLxuTKrZ>W}H6hAy!S5{29IiMa(V<P|
ze0p)+My#R!MH3>Pnz39qX9E9zv5@LHqX<U_fiQlplF1Me?LhA3Qc)BMjG_Hm8Y4(Q
z04Hb!zZZ^RDYHmcIJgI3he7&1Un=$txfPF;-cQg>DY9#WXlOfx`$OHdWVdQJ3#CWD
z7+9+BNH@Pn3zd>-6H=?E@v<*LV9d+X5pglAOEWPW{M@x}8Q*VbvOUQ!-fhiL?ZjmC
z@|wQ06&+@;8ow`?lLF$TruT}7!IFISj0C@wd;FfQH`^p6kBc(71(x=(Zv~O5epF83
z76fs+5p-|*tJ<gPLALY+iu6eO@pDWf9toQ-NuFm7y(~PY-%*Tq*GL7DHP@dNuIt2d
z3O-cJcT*x)k04(k6qpM8sdh*6(7@8@v>#ZaF%&+?U{q&*lo}sqpR6r@a8Q|K0B3u>
zt{d6-MlkQ>SZuF%lM^PVEzIC0p;de1$hM@an#r$!zhxvlQR1!gLnzu8oz2xQ6j}<U
zTou8dpT>|6mplelir=%S!2Mtb**Uf0(7m$Y?Klk0-Zr~Lmld(9uib7dM5JS3wnik|
z!X4j)66JTmAAf-9@pE*M?{O&kOkXf@Yb8O{XhroOjJ8KA9xT9Q<R3;A8Rg@VLZ_2&
zWG>Yu+$7K)U|CO8Nx^ZV09-PSp1vS!eu{Jfmo|qC3oKQWu!%apk944wi_b-qWGHy4
zoF(DGVL!^*9&o)bt8Yx{35SYOn$Q#xxJ=53d5S2|mDz2F8VKfmwBo+M&^PL`P|5zB
zmv82_ppL4t2H{<pY87;!3d+4i>seQdk#^nI*ldj<kUe7PTI7i9Lixw%ydyJro^(H+
zu-SP;>(B@`_yESnS>YR#^pXeqGB>Lx<dOPH5Y^@fa_W6?ciwu8q<7^(Y9n1jqAKF{
zw`>pCtrwm0wB0}k38}r4v7Y!xr_0_I(5NS$(Jg7I4Y;UbVqaC-#I`W0EU>99rjd2>
zT@y#o>^#(h%vBXA5>LzrdcH?RiFit2Gl$i_Xvbr=u=uk6pgaj8S5apc({>lqr_}P;
z|HW4DhIo=hwFdpYBpO<MSb?xGd+*GBx-Gh92^ND1YFg>kay%mSvX9IZ2R?1M{7(j-
z+S-f19Xyz2;~|qI^!`Y$DDSYrIL}JvT%>)vYOn5>PJ51~t%in9j&Zrc3OD@-2>f|x
zg(rRl1pho-@V<|L^hJcEAK<-+$oB)n7vS>?uI{tK>#j!k`vLh2tHc1HZ~?(rq5mp?
z2d~)7ufp4_aCjBuK3%C3aTSKH0`1Tho8?s~xeA9@L3a2`cOtIB@KvB60d8DeuKOc^
z(8Za?jR3M2Fg^mvT)@sKKm&)20_^`*p#P_|{YSaX_jd}-u`4OO$F5Xpxe77kzsfO;
z18f)N{#Gphqg?jy@9_42!ZdK<iT|eXysEsO`0K{`XOjrNG69JG->W^GXY$I8W;O}X
zpn1WelK{g-v+Tb#A^5vVfRXKYs^^dlk$yA~DB;)64dq{d5d1!J1BgBVaHbCc74PNU
k{ZIA3r-Wbjb3zaZ|BwIIcWwX){MHn}fMxvg*9I2ofA2?L1poj5

delta 6234
zcmZXY1z3~q8pj7?ba!`m#}E-vK^p0h?vfHDry>mkij0tkfwa^FWJ-&qbO?yRfWbf-
z$>VpvPvD$y*RJ>4?|=XA=YHPzdiT^$9nEqb4Y95U5DOmwzy$!nPNs&*#1c4veyXwJ
z;Nt$RK5YJ@z7oS=_#@ZqV`Ks^VIQlDf#9D66a7zjUUjhwK;$@|652;%JEuS8;~GjV
zdtv*~mdU;MwLR_y!c7kE_H#RPi>IBNwPnW5HG<l{)HmNzB|XZpNA<<k5AYx^c6Npr
z^$;6)jXU9Ckd3&IwPg0i3#y@IGW!e>xz7?J_<<c9i8sOxEbN^uht`8fMkpoY(j2J*
z$Rp_OkGlp5(jm0|l*dRB1pJ+a00P?CYn=()zd*F4M~M}d_evC*Qe)nYZHqyIpFSuI
zS7Loi`O4@fT5mox`<1C+<1nATeOIBH_L)#ODMe~UY?feuE|z}I>I9>@USA>ip>eGe
zL~;j~lnyX2kJ*OVHuH8-Lkm3LJ>F{o%Zln1`K5hZgq+pOgs$Mbr6Te6l#`E1pcBx5
z#E-08xXy~S!`8CQ2U?pC*D^LZbn})PyQD5Mb~?JrxG8j(o<->-@lk9t&36!Ri3*wB
zlTzrI^&*rIp~f@zZU&_d><cK{0V<-gi+W!2SWn7Z7Lkq!trxF-NiD-0Tn$8GbZun3
zXA`IgLkuDyM2<8h#&dNRqr&KbaGN4gq!an;5UNEBGd}au&pA)~ZfC@5Ci_-!Sy4LR
zV_S+97oYocd=h%<5E2ulrPCOh(n0Q(@5<vSVo=I&wyS|p<}~ZdPCq^^qI#xaHBu?p
zpf57+a{t$6*8!g3ARPbK`tY&S8?=*bP_*ht0L0=ub8xij3wUelK;zQX-7@|!%}=*n
zjli`QTi-;(Xu5Z?dUN3e#>cywCY;nmv%8{!$y^#QeaIiw#*ckzNsP*@`*vr^6l*<!
z(4$BaF<V3_Yk2&yBPX~{?Clq<HlMU{A0UsXZZDIpHx5oC0a;7fy~qM^c_x1Q?+b1L
z7_yN};cpSe1hz?Bujb&{xX0wbF-{sK|AXmpGQlmNBg?LRJmA(mk;M#fRLriK0Qut0
zbWO1*`nDTEPLmX6g-|GJ{C-`-(OYwU(3x4axjD$+oG!rX8F>WZ_VaBaD?{QNLRMwt
zYi)$b^FAh_G!&C*pYSBA#eh70$q8~kZ4g3_z9Bq`8Zi!@zR9lmEYWUh<RqT2t)2E8
z(f1D1`x61cP(gdRI*dg<y=hGROt){eB4aJe2Zly9-VkPZ6+pin2SZz$IV}VQ`;W74
zq<8DU^E?Y_oZl(PpFFfO=U<^C<uvHv2izCyI(LdyC9kvJ=?jjSl{-&jtEm0<26EyS
z-=MnV=&z*G{QFxF>E9md|NFWa>EBI+*3LkEGjN_ZaG5r6oi=crHgKOd@R&C6oHlqk
zZQymoLQ=B)0o{6+wc8uK5frSoxVY?@>JgCXmNK<%@0Kv8|4j5FJKOBR59yDwP4kIQ
zJj;<eA$<^(@!=X`;heVC-c$jSr0IP0RzYl%XKvQYGHXzH#uvLmI9*tzC8%Ew=VmW_
zczY-Eb#8D+e}YTk!xA(73YT*|To3<?15UU6MEq!zRGBBp*e0n>XBHZzVK#x(0Nl8I
zV!j&D)*!Cj_VJ~Ko4=H6QtBh)57>;AS8IkSZA@=_Y4xeNp&sW1Ri-3C=t<u<@=N)-
zj};%RE{5&_%{lk+=1lJdv_EilKa^`hb1|co!Jkzs{5)5%2Kfca$}myZzP*P&38A!k
z4ULre+)D?i=g6HL7Ua^zd{~ZRosNgKz-tBXsG4G<Sw(AO4xCyn(9YDJ<CO6P4f?Cm
z!k}%d$|`ARJ275F3ez`JEh8p&&VbJ|uF;B0!lF}k3ZGFJjQUFv>$EaH<iNP{nqQ}u
zr=L!cA#C_setlG?xZC!Yk1_+^eEe0lya)L+Hvc^eJMM<O2Y>(oM-l*l;T4%IU9BlM
zA?R}abr+Do8jLH2qcATcH^f%2KtOW%%7!HydIiz)Wmf=J%)NpI<@;Edt$|hXuOb@i
zT33-AZLF(Esa`7<<v-KGQLcc%Cm;YojQ4lXX=|ZI{a02uGn%VLVl1n!I;&_ye`T|_
z|8f-(b1M6t^Y^6nYSE4DvU>#XnAK$e)P=5-H9)WdfGljNs0xS{F3pG$hyBM1o!iCW
zfUmP-*f{@>1kD`-f#AV$7#5d0{I~V_CH<WkZ-M!LiEx_EYZ4qH1f;sWEqJCFaQLe9
zc`lG0o+=BxY61RR3co7xUqdM#)|CPJmjor9{M|P>AFQjs{a1%0rvKjxS5pC9WfxbM
zfi52&99{v^1(E*qkQ5b2CT@}f0M2llT2L}J#QEz!QPuYutx$Tj!dS54x1Vo;8y|>n
zbkI*o(?`@u%KOvDx~}637zcld;M1AxQB;NVA^lo=dS9UC8m9BuI0KWudFZLM0u}lm
zK)y>I_=n-+ckZ`L94_nPnJdX6xtBm~VJ)nLGs055_&$v^EQp4;4VcQLGHISwWtQn1
zkfm?jN&tMiXkKSna823(M-wf>eQpj-3~N(kNyiy=liq$>TpS+VQrU>@2(y*2qhvIV
zEX9wHvRwzoUu}7I%4!C4^y=DS&jGsnRyXNJp+T)3oI$1O(}b{;U)p^M{1!59OjM;0
z8dnEHyD5;Lcl}h|za((K)2uJfSOxo?Kt2en*WW8}{x)7wkR^!`g}&H1fh#h9*VTlT
z4$h9u8aJ<J8}(_1yuJ~~-Z7RpEoQdcpts!G0Cb1mbZ=%dA1O>spb>Uc`B}U%WnfyP
z!A@J3UhA5be%@lBDoHEP=t)|leYdAxi>rb~<!4UjL4l#SX&^b#qdsg#erlm04#?c<
z&K}qK!x|Gg3O}<YjSYkue%y9E1szX`=4*sg*=rlYO<onmiW43W;|mx`riA7cqVu`Q
zCt_O2Q}ftNIe~L0HF*IIXDMy3Ec~v7u<))|F|<&B6TV2A#{usiyok*;ioCgB&(nfX
zME7H%ix2Z#wud$+H}fp!2^N-V7a(1Uo|f{JOuUIdDF?0dvD@m+<R$lVldT@RKdP)2
z$-Vs+?efAZtXSZ5#H#>7|7K0#&>SML<r`Mdr(6spjNU)Bww_9DH%8aT@Z71tCBZQ6
zRz<8D)v)FKX^W%*scRmWGCv%h?$5tuz4|_#?-T_?^~fxow>K!qO<AQSeS|2WRK8|y
z_$UJR0(MFUm+dL<_t3egH06Vubp<vK5!3flUQa49d1-^kF{ma2(w@YuoD2yvnHocd
z2*s=YzmZEx8ipp!ibu?=Nvu9Tls=wD%7trTpd$5sc?hP}o=oTM$Hw;<<&nsgWWPI%
zU?}VvkI^jsKod`u&FM>+{~j{I<n^JvHl!>$K(u-lVN_AWn2||s^KoIi0F1G;zovu=
z?3z%hAVY85qk}+=pOG9ZD%=OwrunglZxNw05iF?C3Fe*ehwr>|4i=8n5r<N@Ev3bU
zIteA3_!VuPcXw=AbM0-J;tTpVwekB3@}F&jD(*Xsk13x#awvr*he3>+dR*JorIf5H
z#`M0c0F@$+NGr-!o`mHy2t$no_|rU!VTP2MZz{N`k_Jq2nEPtjr;G$<$xGTwKKN?Q
zZL`2ZnBZrhb>VZb(A~`QR2l`mkDT_C6Ao-BlbY<+0zC)TC+|B@88?p#6w8zic*Sxj
zvSQTX)E&Nj7*d&rIRarcjMb{9O<1>&a<xw7qS$alNp;2znv#YJYdb)M<9Re@2yJe}
zOe~WkduWk8q)1mnU#aJf%<UEo2|b*BO?GDpxSPlr3wx4s6_5BY1IlR%r^ZhQ2V+02
zt*U-5cXYG1WM_OWR-wBvN|7GcW|Do;o_43|$udrr3&s23ay<w<D(x8YY&aX&3q60T
z?vi(IxL)e$f1L93O*41h9duI<kc~c{IrTo`xWv3ETqURh84MV|X9~8N%dQ<cU&plj
zuHGx+bvB`$BZ90!@3lI;Iata47-rAaV2$A1>t!1){J~S_P`(fWc6X#T+@1TWaMq?Q
zU{jUdou@Q*tOemjB{&D`V=dL~w)$|Ei~J&zn4O{xQ688faA~hqmAL3&RJg@Bzl|y;
zQ!|CE>v?c>{vw&9yH&e*a(6XeVKj$Ff{iC?G%Svp(Sc}}D@i3fQHgfM)z3wC5x(B9
zQhT#p(ZEB^FU)p5orI@$US1E$NhVn=TO0?VF4k<B_JDM^yT-_=E{nY#m{|AT*)7x$
zc+f)OfM(7rAnxF_y!&v{BERG|n8Z=N(PY3e3!fJzN3qA4!du&DZ&us6WJ-GD=Ky9;
zWnU)N%j!of*2HgSv%~qUA#*!Fkc<{wlTV>qp)8XyFc8!gCHAgf&#-FQ>CW8}$Txyg
zxqZa=7aRz0<j|c7nxVV0^hX?pp|+C8)S8bZk9guWnByBH3O?#|rMyK{H+}H7?3#o+
z>Ku12uhNR?{G47XXu|eFIf*+f9Sn!#lr6ChlVlSIrO0dVXf?siSvt=ZOi+nmMRC?K
zYl0SGT&J>@?-?9I4lM%d*W3zcz6QA~d}rECs8E2Q5AW#@$%(oTZ~rPpm~=Jau=_H7
zJ*dw)=u)N|mHXHTidlMR3pr}HmHm14cCf&+WA91W(L%qitoZFEhF|N>OEX`iHD;w>
zNHG665%fYgRgE+(lpTBxd@cTQ{Xnd!+4gY^ILd|}hn6BQ-A_Lu=Y_$8#0b<!f<uC2
z+n+4~kk*y<<?x19r~b|8UC8XiPdwJ1zD_j}g{f72JFlBhGoSbBm{s~@+$TM#jB)2a
z(i*#6wXN`}`2e^6?B$+GQF%#LneZXzmqr(H=%>L-<3-E4Wmg2jcyj}S9&1LpcpVK$
z^MlXMVY6|sr!5SZp9v)nlj=PIhmH+>?kRB)g9JU7QbYDn_dEhDe3;pLG}~5A^gY`M
zZ|8!2*{Uoym65lw<3TgigHt1~DUFpbnoV@_(}~243vb2^X2bOx_#}p(n`dcm;Dj^-
z-<D*U|FAb^hBxi<-Fv#46e#@ipoBkEO(~8ZLI(FJjg3hg&r&;*&tu@$*ONXOHC?o@
zeG7r(Vdp=9rVzbfE3WjcN;-23lIa68j<kD+eI<AL_WCAmh3IW*(xq0yw+t{a^#}3P
zpScVr)b}LAm2qZ$W&PZ?vpm2j&DfirV}LLuaW9VIjFtBYF8XolVkv=2h)A9&JA`$9
z>KG5g+7oBO*9}=4i{xe&*g`h2kt#F78zJ*cS>*@1Rk!#{pI9PepNTH})(UR%xzX+o
z)X}JD);}?qHm-cz%e&{{pmNtQOTENu0nrK-l5TYFAXc7&=cAZTTP6(7^&wLlAG$^g
zdRJOU#G;PfZ5LN;P~EES@sEz)Y*ZGV4c4sk$mb~Yw$G;LM+&vS$bP{t4J!0jXoARi
zkW?~bEd&OW`Ai@{=2JeUC$o1~SS493#T(9M<zEhg9nkW(vfAd8ljZiel3WbQs<~Yx
z=#O4lZ9xT(!)(Sb&bm(tQeqkie~O|G%e#BNii#>Xz8ultnyENX*h#me4t|+7n{y9;
zzbNz2vB^VnpBZ3zJWpnMFc&~VI}G7_XB3i2ak4qqe5RK<e=_@8MPD(LaiOyhrk4<#
zoD<J1fofR5?REJsNw>u6?xwi+faoRvE`eFJAD*wsj-z;#?xgdiK$kLA`Ufdn+>%%Y
z-<7>+pYaRK|J_a8_;N-SjR^n%f3J_p0RVuGuD*z$i=R6@ryZ1jwNzB>0*zz*Ss%k0
zKZ8y%2>)3)5=UZxW`lBk0dYZy2Le)Ve;M{G8?7{brJYgg(k7jt=N|ne#7{?YqhY;7
zVQk6RUUO3c@d@MZ4RD*7Mk9T2%=k>+77H;BB?XK*Daq|3z-?&jSgCeuTg!MpT;X*r
z-pzxZhQ!Itcyje0J-h`O03JG~;CIAP^3=hkc$It;M$SQ;Q_@Ae<mn$F8CHEX@Epw}
z)=&Mp;o;g<BYUU!C50sK(b#J_*>>+MJ}m<~Eu{sVHT5d<TOIDRxY&_Zq-n3&7q02)
zz(h4T^}!tYj<;j|mT1r%7eyRACjvD>VKmRYi3FL02T5S0)mlC6_3>{Rg9A<b$~4G_
z_xL(zHPeRAP8p7t_bFH*ymSc)Sv)iJAt|eZLeV+Cry`H6i-`H}(^vrlM~{DbhdxOK
z4e<j%=%@ve+;RS{JVNqNPn3CNu{+phn)IBiR>9|!i@7XXeBg&;*v+i|S+-}#q)Y_)
z`jKf0u=}5x3Jh5a+-&@MX=z(uE)$S*E{lygx`e~j%YsbuqFKJFLQ0(U_P-clJbNf#
zi}Ym-Adj*^nRA|r-y>+P$Y<U3)gabyn;4KKZkMX|!ghEg{VWYeWb(=bsKzK`-CdAE
zj%T1cV2?hwfA2z2Y3jJnD*K9)V}O<kC*C-_g4BbiwUHEj7?0UzC%W78*b9jQdrgsd
zQBiNQrSWqW!m#;@Af|{T0z}Gog1p5b#sIZsrKlfEYwYtiygMj)uSv%)DpzLK_x4g7
zwO-Xk4G-c4?Bg?WsRf7S1C>F2IqS8P%3X$crPUE;%D4NHRm%fLv$~6<8)Cg9;@%~1
zpE~b!I{xr1()GhN9?9(el^CFLbh;eW7!>EVhH1}0XUt0nhwR*Ili9$cvBROWo9TM5
z+&y{p*uh^T+*VzM>h+23;FrU=IEer-4jWEGQaC=Fo!yctyUA^aT$52zRU1AA#{w&v
zTWbEw`;3}QlQ3d_&4h%~kNR{OFC8`oiT#N!nUV!I;uEs9Oh7m=3SYH|(`>J21dMfz
zlV-&Hbs;iDoxIxN+G)>pqqWW!gVpl2sA4Zd5_+n9Un%NpU|>=LuZ~xt?)@N<KigJl
zem_X`&tD5V)elm*j4%y=1TG^w10eBBi2e=NPg$Xz*Q4hHAmvM|>L5tv5|XdO%yr-z
zx@LQL9U89#@ar|3*4JxwQm@1Ob>JPoX7j!dP1gZ9a?PeWa;;A4b@+ZA_(wrfmygSF
z6eM<er`e+*#Y<Qk1>L*^rEw5FRAmgr^}kBYzm&m$DOBVCn{`zoYW!M-zUx3XaV_#2
z=%HQ{AkNF$|5fV$r5yiDQJnn$tmoI2s>#1zoWGBVpu3YG$$xF^p)ym~UNp}s5Iu$`
zG-e9Ke3@4Hm&Oh4nF6s~YFmG4Kq&q+h@JiVi2wT>=Yj|TAox9J{P`3<1wpl^LCn}X
K{lCwr0RI6~lHw@<

diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch
index 7bdf4f0c7..8359f3043 100644
--- a/Test/expected-results/test.isosch
+++ b/Test/expected-results/test.isosch
@@ -17,22 +17,27 @@
    <!-- ************ -->
    <!-- constraints: -->
    <!-- ************ -->
-   <pattern id="schematron-constraint-test-att.datable.w3c-att-datable-w3c-when-1">
+   <pattern id="schematron-constraint-test-att.cmc-generatedBy-CMC_generatedBy_within_post-1">
+      <rule context="tei:*[@generatedBy]">
+         <assert test="ancestor-or-self::tei:post">The @generatedBy attribute is for use within a &lt;post&gt; element.</assert>
+      </rule>
+   </pattern>
+   <pattern id="schematron-constraint-test-att.datable.w3c-att-datable-w3c-when-2">
       <rule context="tei:*[@when]">
          <report test="@notBefore|@notAfter|@from|@to" role="nonfatal">The @when attribute cannot be used with any other att.datable.w3c attributes.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.datable.w3c-att-datable-w3c-from-2">
+   <pattern id="schematron-constraint-test-att.datable.w3c-att-datable-w3c-from-3">
       <rule context="tei:*[@from]">
          <report test="@notBefore" role="nonfatal">The @from and @notBefore attributes cannot be used together.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.datable.w3c-att-datable-w3c-to-3">
+   <pattern id="schematron-constraint-test-att.datable.w3c-att-datable-w3c-to-4">
       <rule context="tei:*[@to]">
          <report test="@notAfter" role="nonfatal">The @to and @notAfter attributes cannot be used together.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.global.source-source-only_1_ODD_source-4">
+   <pattern id="schematron-constraint-test-att.global.source-source-only_1_ODD_source-5">
       <rule context="tei:*[@source]">
          <let name="srcs" value="tokenize( normalize-space(@source),' ')"/>
          <report test="( self::tei:classRef               | self::tei:dataRef               | self::tei:elementRef               | self::tei:macroRef               | self::tei:moduleRef               | self::tei:schemaSpec )               and               $srcs[2]">
@@ -42,57 +47,57 @@
             </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.measurement-att-measurement-unitRef-5">
+   <pattern id="schematron-constraint-test-att.measurement-att-measurement-unitRef-6">
       <rule context="tei:*[@unitRef]">
          <report test="@unit" role="info">The @unit attribute may be unnecessary when @unitRef is present.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.typed-subtypeTyped-6">
+   <pattern id="schematron-constraint-test-att.typed-subtypeTyped-7">
       <rule context="tei:*[@subtype]">
          <assert test="@type">The <name/> element should not be categorized in detail with @subtype unless also categorized in general with @type</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.pointing-targetLang-targetLang-7">
+   <pattern id="schematron-constraint-test-att.pointing-targetLang-targetLang-8">
       <rule context="tei:*[not(self::tei:schemaSpec)][@targetLang]">
          <assert test="@target">@targetLang should only be used on <name/> if @target is specified.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.spanning-spanTo-spanTo-points-to-following-8">
+   <pattern id="schematron-constraint-test-att.spanning-spanTo-spanTo-points-to-following-9">
       <rule context="tei:*[@spanTo]">
          <assert test="id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)]">
 The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the current element <name/>
          </assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.styleDef-schemeVersion-schemeVersionRequiresScheme-9">
+   <pattern id="schematron-constraint-test-att.styleDef-schemeVersion-schemeVersionRequiresScheme-10">
       <rule context="tei:*[@schemeVersion]">
          <assert test="@scheme and not(@scheme = 'free')">
               @schemeVersion can only be used if @scheme is specified.
             </assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-att.calendarSystem-calendar-calendar_attr_on_empty_element-10">
+   <pattern id="schematron-constraint-test-att.calendarSystem-calendar-calendar_attr_on_empty_element-11">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
               systems or calendars to which the date represented by the content of this element belongs,
               but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-ab-or-p-11">
+   <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-ab-or-p-12">
       <rule context="tei:p">
          <report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
           Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-l-or-lg-12">
+   <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-l-or-lg-13">
       <rule context="tei:p">
          <report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
           Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-desc-deprecationInfo-only-in-deprecated-13">
+   <pattern id="schematron-constraint-test-desc-deprecationInfo-only-in-deprecated-14">
       <rule context="tei:desc[ @type eq 'deprecationInfo']">
          <assert test="../@validUntil">Information about a
         deprecation should only be present in a specification element
@@ -101,195 +106,195 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
         type="deprecationInfo"&gt;.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-rt-target-rt-target-not-span-14">
+   <pattern id="schematron-constraint-test-rt-target-rt-target-not-span-15">
       <rule context="tei:rt/@target">
          <report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-rt-from-rt-from-15">
+   <pattern id="schematron-constraint-test-rt-from-rt-from-16">
       <rule context="tei:rt/@from">
          <assert test="../@to">When from= is present, the to= attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-rt-to-rt-to-16">
+   <pattern id="schematron-constraint-test-rt-to-rt-to-17">
       <rule context="tei:rt/@to">
          <assert test="../@from">When to= is present, the from= attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-name-calendar-calendar-check-name-17">
+   <pattern id="schematron-constraint-test-name-calendar-calendar-check-name-18">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-ptr-ptrAtts-18">
+   <pattern id="schematron-constraint-test-ptr-ptrAtts-19">
       <rule context="tei:ptr">
          <report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <name/>.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-ref-refAtts-19">
+   <pattern id="schematron-constraint-test-ref-refAtts-20">
       <rule context="tei:ref">
          <report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <name/>
          </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-list-gloss-list-must-have-labels-20">
+   <pattern id="schematron-constraint-test-list-gloss-list-must-have-labels-21">
       <rule context="tei:list[@type='gloss']">
          <assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-author-calendar-calendar-check-author-21">
+   <pattern id="schematron-constraint-test-author-calendar-calendar-check-author-22">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-editor-calendar-calendar-check-editor-22">
+   <pattern id="schematron-constraint-test-editor-calendar-calendar-check-editor-23">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-resp-calendar-calendar-check-resp-23">
+   <pattern id="schematron-constraint-test-resp-calendar-calendar-check-resp-24">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-title-calendar-calendar-check-title-24">
+   <pattern id="schematron-constraint-test-title-calendar-calendar-check-title-25">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-meeting-calendar-calendar-check-meeting-25">
+   <pattern id="schematron-constraint-test-meeting-calendar-calendar-check-meeting-26">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-relatedItem-targetorcontent1-26">
+   <pattern id="schematron-constraint-test-relatedItem-targetorcontent1-27">
       <rule context="tei:relatedItem">
          <report test="@target and count( child::* ) &gt; 0">If the @target attribute on <name/> is used, the relatedItem element must be empty</report>
          <assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-l-abstractModel-structure-l-in-l-27">
+   <pattern id="schematron-constraint-test-l-abstractModel-structure-l-in-l-28">
       <rule context="tei:l">
          <report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-lg-atleast1oflggapl-28">
+   <pattern id="schematron-constraint-test-lg-atleast1oflggapl-29">
       <rule context="tei:lg">
          <assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-lg-abstractModel-structure-lg-in-l-29">
+   <pattern id="schematron-constraint-test-lg-abstractModel-structure-lg-in-l-30">
       <rule context="tei:lg">
          <report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-sponsor-calendar-calendar-check-sponsor-30">
+   <pattern id="schematron-constraint-test-sponsor-calendar-calendar-check-sponsor-31">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-funder-calendar-calendar-check-funder-31">
+   <pattern id="schematron-constraint-test-funder-calendar-calendar-check-funder-32">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-principal-calendar-calendar-check-principal-32">
+   <pattern id="schematron-constraint-test-principal-calendar-calendar-check-principal-33">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-idno-calendar-calendar-check-idno-33">
+   <pattern id="schematron-constraint-test-idno-calendar-calendar-check-idno-34">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-licence-calendar-calendar-check-licence-34">
+   <pattern id="schematron-constraint-test-licence-calendar-calendar-check-licence-35">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-quotation-quotationContents-35">
+   <pattern id="schematron-constraint-test-quotation-quotationContents-36">
       <rule context="tei:quotation">
          <report test="not( @marks )  and  not( tei:p )">
           On <name/>, either the @marks attribute should be used, or a paragraph of description provided
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-citeStructure-match-citestructure-outer-match-36">
+   <pattern id="schematron-constraint-test-citeStructure-match-citestructure-outer-match-37">
       <rule context="tei:citeStructure[not(parent::tei:citeStructure)]">
          <assert test="starts-with(@match,'/')">An XPath in @match on the outer <name/> must start with '/'.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-citeStructure-match-citestructure-inner-match-37">
+   <pattern id="schematron-constraint-test-citeStructure-match-citestructure-inner-match-38">
       <rule context="tei:citeStructure[parent::tei:citeStructure]">
          <assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <name/>.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-unitDecl-calendar-calendar-check-unitDecl-38">
+   <pattern id="schematron-constraint-test-unitDecl-calendar-calendar-check-unitDecl-39">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-unitDef-calendar-calendar-check-unitDef-39">
+   <pattern id="schematron-constraint-test-unitDef-calendar-calendar-check-unitDef-40">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-conversion-calendar-calendar-check-conversion-40">
+   <pattern id="schematron-constraint-test-conversion-calendar-calendar-check-conversion-41">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-application-calendar-calendar-check-application-41">
+   <pattern id="schematron-constraint-test-application-calendar-calendar-check-application-42">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-creation-calendar-calendar-check-creation-42">
+   <pattern id="schematron-constraint-test-creation-calendar-calendar-check-creation-43">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-change-calendar-calendar-check-change-43">
+   <pattern id="schematron-constraint-test-change-calendar-calendar-check-change-44">
       <rule context="tei:*[@calendar]">
          <assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
                         but this <name/> element has no textual content.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-facsimile-no_facsimile_text_nodes-44">
+   <pattern id="schematron-constraint-test-facsimile-no_facsimile_text_nodes-45">
       <rule context="tei:facsimile//tei:line | tei:facsimile//tei:zone">
          <report test="child::text()[ normalize-space(.) ne '']">
           A facsimile element represents a text with images, thus
@@ -297,7 +302,7 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-path-pathmustnotbeclosed-45">
+   <pattern id="schematron-constraint-test-path-pathmustnotbeclosed-46">
       <rule context="tei:path[@points]">
          <let name="firstPair" value="tokenize( normalize-space( @points ), ' ')[1]"/>
          <let name="lastPair"
@@ -311,62 +316,62 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
           the zone element rather than the path element. </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-addSpan-addSpan-requires-spanTo-46">
+   <pattern id="schematron-constraint-test-addSpan-addSpan-requires-spanTo-47">
       <rule context="tei:addSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-damageSpan-damageSpan-requires-spanTo-48">
+   <pattern id="schematron-constraint-test-damageSpan-damageSpan-requires-spanTo-49">
       <rule context="tei:damageSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-delSpan-delSpan-requires-spanTo-50">
+   <pattern id="schematron-constraint-test-delSpan-delSpan-requires-spanTo-51">
       <rule context="tei:delSpan">
          <assert test="@spanTo">The @spanTo attribute of <name/> is required.</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-subst-substContents1-52">
+   <pattern id="schematron-constraint-test-subst-substContents1-53">
       <rule context="tei:subst">
          <assert test="child::tei:add and (child::tei:del or child::tei:surplus)">
             <name/> must have at least one child add and at least one child del or surplus</assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-div-abstractModel-structure-div-in-l-or-lg-56">
+   <pattern id="schematron-constraint-test-div-abstractModel-structure-div-in-l-or-lg-57">
       <rule context="tei:div">
          <report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
           Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-div-abstractModel-structure-div-in-ab-or-p-57">
+   <pattern id="schematron-constraint-test-div-abstractModel-structure-div-in-ab-or-p-58">
       <rule context="tei:div">
          <report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
           Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-link-linkTargets3-58">
+   <pattern id="schematron-constraint-test-link-linkTargets3-59">
       <rule context="tei:link">
          <assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <name/>
          </assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-ab-abstractModel-structure-ab-in-l-or-lg-59">
+   <pattern id="schematron-constraint-test-ab-abstractModel-structure-ab-in-l-or-lg-60">
       <rule context="tei:ab">
          <report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
           Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
         </report>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-join-joinTargets3-60">
+   <pattern id="schematron-constraint-test-join-joinTargets3-61">
       <rule context="tei:join">
          <assert test="contains( normalize-space( @target ),' ')">
           You must supply at least two values for @target on <name/>
          </assert>
       </rule>
    </pattern>
-   <pattern id="schematron-constraint-test-standOff-nested_standOff_should_be_typed-61">
+   <pattern id="schematron-constraint-test-standOff-nested_standOff_should_be_typed-62">
       <rule context="tei:standOff">
          <assert test="@type or not(ancestor::tei:standOff)">This
         <name/> element must have a @type attribute, since it is
diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html
index dc7ca0623..0f547a78f 100644
--- a/Test/expected-results/test.odd.html
+++ b/Test/expected-results/test.odd.html
@@ -62,18 +62,18 @@ <h2>Table of contents</h2>
         </div></li>
         <li class="item">
         <span class="specList-elementSpec">
-          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">eTree</a>
+          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">eTree</a>
         </span>(
         <span xml:lang="en" lang="en">embedding tree</span>) 
         <span xml:lang="en" lang="en">provides an alternative to the 
-        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [19.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span></li>
+        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [20.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span></li>
         <li class="item">
         <span class="specList-elementSpec">
-          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">eTree</a>
+          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">eTree</a>
         </span>(
         <span xml:lang="en" lang="en">embedding tree</span>) 
         <span xml:lang="en" lang="en">provides an alternative to the 
-        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [19.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>
+        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [20.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>
         <div class="table">
           <table class="specDesc">
             <tr>
@@ -88,11 +88,11 @@ <h2>Table of contents</h2>
         </div></li>
         <li class="item">
         <span class="specList-elementSpec">
-          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">eTree</a>
+          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">eTree</a>
         </span>(
         <span xml:lang="en" lang="en">embedding tree</span>) 
         <span xml:lang="en" lang="en">provides an alternative to the 
-        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [19.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>
+        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [20.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>
         <div class="table">
           <table class="specDesc">
             <tr>
@@ -107,11 +107,11 @@ <h2>Table of contents</h2>
         </div></li>
         <li class="item">
         <span class="specList-elementSpec">
-          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">eTree</a>
+          <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">eTree</a>
         </span>(
         <span xml:lang="en" lang="en">embedding tree</span>) 
         <span xml:lang="en" lang="en">provides an alternative to the 
-        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [19.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>
+        <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [20.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>
         <div class="table">
           <table class="specDesc">
             <tr>
@@ -196,7 +196,7 @@ <h1>
               <a class="link_ref" href="#TEI.TEI" title="TEI (TEI document) contains a single TEIconformant document combining a single TEI header with one or more members of the model...">&lt;TEI&gt;</a>(or 
               <a class="link_ref" href="#TEI.teiCorpus" title="teiCorpus (TEI corpus) contains the whole of a TEI encoded corpus comprising a single corpus header and one or more &lt;TEI&gt; eleme...">&lt;teiCorpus&gt;</a>) element.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ab">
@@ -205,7 +205,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">anonymous block</span>) 
               <span xml:lang="en" lang="en">contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>]</td>
             </tr>
             <tr>
               <td id="TEI.abbr">
@@ -241,7 +241,7 @@ <h1>
               <span xml:lang="en" lang="en">added span of text</span>) 
               <span xml:lang="en" lang="en">marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also 
               <a class="link_ref" href="#TEI.add" title="add (addition) contains letters words or phrases inserted in the source text by an author scribe or a previous annotator or cor...">&lt;add&gt;</a>).</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.addrLine">
@@ -272,7 +272,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">alternation</span>) 
               <span xml:lang="en" lang="en">identifies an alternation or a set of choices among elements or passages.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.altGrp">
@@ -281,8 +281,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">alternation group</span>) 
               <span xml:lang="en" lang="en">groups a collection of 
-              <a class="link_ref" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]">&lt;alt&gt;</a>elements and possibly pointers.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</a>]</td>
+              <a class="link_ref" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]">&lt;alt&gt;</a>elements and possibly pointers.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.am">
@@ -291,7 +291,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">abbreviation marker</span>) 
               <span xml:lang="en" lang="en">contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAB">11.3.1.2. Abbreviation and Expansion</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAB">12.3.1.2. Abbreviation and Expansion</a>]</td>
             </tr>
             <tr>
               <td id="TEI.analytic">
@@ -310,7 +310,7 @@ <h1>
               <span xml:lang="en" lang="en">anchor point</span>) 
               <span xml:lang="en" lang="en">attaches an identifier to a point within a text, whether or not it corresponds with a textual element.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSSAPA">8.4.2. Synchronization and Overlap</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">16.5. Correspondence and Alignment</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">17.5. Correspondence and Alignment</a>]</td>
             </tr>
             <tr>
               <td id="TEI.annotation">
@@ -318,7 +318,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-annotation.html">annotation</a>
               </span>: 
               <span xml:lang="en" lang="en">represents an annotation following the Web Annotation Data Model.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.appInfo">
@@ -344,7 +344,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">arc</span>) 
               <span xml:lang="en" lang="en">encodes an arc, the connection from one node to another in a graph.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDGR">19.1. Graphs and Digraphs</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDGR">20.1. Graphs and Digraphs</a>]</td>
             </tr>
             <tr>
               <td id="TEI.argument">
@@ -405,7 +405,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for indicating calendar systems to which a date belongs.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.canonical">
@@ -413,7 +413,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.canonical.html">att.canonical</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.citeStructurePart">
@@ -430,6 +430,14 @@ <h1>
               <span xml:lang="en" lang="en">provides attributes for specifying the specific part of a bibliographic item being cited.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
+            <tr>
+              <td id="TEI.att.cmc">
+              <span class="hi">
+                <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.cmc.html">att.cmc</a>
+              </span>: (
+              <span xml:lang="en" lang="en">computer-mediated communication</span>) 
+              <span xml:lang="en" lang="en">provides attributes categorizing how the element content was created in a CMC environment.</span></td>
+            </tr>
             <tr>
               <td id="TEI.att.coordinated">
               <span class="hi">
@@ -443,7 +451,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.damaged.html">att.damaged</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes describing the nature of any physical damage affecting a reading.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
             <tr>
@@ -453,7 +461,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for normalization of elements that contain dates, times, or datable events.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.datable.w3c">
@@ -462,7 +470,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for normalization of elements that contain datable events conforming to the W3C XML Schema Part 2: Datatypes Second Edition.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.datcat">
@@ -470,8 +478,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.datcat.html">att.datcat</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by an external taxonomy, in this way establishing the identity of information containers and values, and providing means of interpreting them.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">9.5.2. Lexical View</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">18.3. Other Atomic Feature Values</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">10.5.2. Lexical View</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">19.3. Other Atomic Feature Values</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.declarable">
@@ -480,7 +488,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for those elements in the TEI header which may be independently selected by means of the special purpose 
               <span class="att">decls</span>attribute.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual Information with a Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual Information with a Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.declaring">
@@ -488,7 +496,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.declaring.html">att.declaring</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements which may be independently associated with a particular declarable element within the header, thus overriding the inherited default for that element.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual Information with a Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual Information with a Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.dimensions">
@@ -519,9 +527,9 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes describing the nature of an encoded scholarly intervention or interpretation of any kind.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">10.3.1. Origination</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">11.3.1. Origination</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.edition">
@@ -536,8 +544,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.entryLike.html">att.entryLike</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes used to distinguish different styles of dictionary entries.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.formula">
@@ -575,7 +583,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.global.facs.html">att.global.facs</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes used to express correspondence between an element and all or part of a facsimile image or surface.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.global.linking">
@@ -583,7 +591,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.global.linking.html">att.global.linking</a>
               </span>: 
               <span xml:lang="en" lang="en">provides a set of attributes for hypertextual linking.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.global.rendition">
@@ -601,9 +609,9 @@ <h1>
               <span xml:lang="en" lang="en">provides attributes indicating the agent responsible for some aspect of the text, the markup or something asserted by the markup, and the degree of certainty associated with it.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STGAso">1.3.1.1.4. Sources, certainty, and responsibility</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">11.3.2.2. Hand, Responsibility, and Certainty Attributes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">17.3. Spans and Interpretations</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">12.3.2.2. Hand, Responsibility, and Certainty Attributes</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">18.3. Spans and Interpretations</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.global.source">
@@ -621,7 +629,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.handFeatures.html">att.handFeatures</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes describing aspects of the hand in which a manuscript is written.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.internetMedia">
@@ -636,7 +644,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.lexicographic.html">att.lexicographic</a>
               </span>: 
               <span xml:lang="en" lang="en">provides a set of attributes for specifying standard and normalized values, grammatical functions, alternate or equivalent forms, and information about composite parts.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.locatable">
@@ -645,7 +653,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for referencing locations by pointing to entries in a canonical list of places.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HDUDECL">2.3.9. The Unit Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.measurement">
@@ -678,7 +686,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes common to elements which refer to named persons, places, organizations etc.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">13.3.7. Names and Nyms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">14.3.7. Names and Nyms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.notated">
@@ -700,7 +708,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.patternReplacement.html">att.patternReplacement</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for regular-expression matching and replacement.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54M">2.3.6.3. Milestone Method</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54">2.3.6. The Reference System Declaration</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54S">2.3.6.2. Search-and-Replace Method</a>]</td>
@@ -712,7 +720,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">attributes for components of names usually, but not necessarily, personal names</span>) 
               <span xml:lang="en" lang="en">common attributes for those elements which form part of a name usually, but not necessarily, a personal name.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.placement">
@@ -721,7 +729,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for describing where on the source page or object a textual element appears.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.pointing">
@@ -738,7 +746,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.pointing.group.html">att.pointing.group</a>
               </span>: 
               <span xml:lang="en" lang="en">provides a set of attributes common to all elements which enclose groups of pointer elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.ranging">
@@ -760,8 +768,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.segLike.html">att.segLike</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements used for arbitrary segmentation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.sortable">
@@ -769,7 +777,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.sortable.html">att.sortable</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements in lists or groups that are sortable, but whose sorting key cannot be derived mechanically from the element content.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.spanning">
@@ -777,7 +785,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.spanning.html">att.spanning</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements which delimit a span of text by pointing mechanisms rather than by enclosing it.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
             <tr>
@@ -793,7 +801,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.tableDecoration.html">att.tableDecoration</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes used to decorate rows or cells of a table.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FT">14. Tables, Formulæ, Graphics, and Notated Music</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FT">15. Tables, Formulæ, Graphics, and Notated Music</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.timed">
@@ -809,7 +817,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.transcriptional.html">att.transcriptional</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes specific to elements encoding authorial or scribal intervention in a text when transcribing manuscript or similar sources.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.typed">
@@ -818,7 +826,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes that can be used to classify or subclassify elements in any way.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">17.1.1. Words and Above</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">18.1.1. Words and Above</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAB">3.6.5. Abbreviations and Their Expansions</a>
@@ -828,14 +836,14 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSDIV2">4.1.2. Numbered Divisions</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSHD">4.2.1. Headings and Trailers</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSVIRT">4.4. Virtual Divisions</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">13.3.2.3. Personal Relationships</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">16.1.1. Pointers and Links</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">12.2. Linking the Apparatus to the Text</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">22.5.1.2. Defining Content Models: RELAX NG</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">14.3.2.3. Personal Relationships</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">17.1.1. Pointers and Links</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">13.2. Linking the Apparatus to the Text</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">23.5.1.2. Defining Content Models: RELAX NG</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSBA">8.3. Elements Unique to Spoken Texts</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">23.3.1.3. Modification of Attribute and Attribute Value Lists</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">24.3.1.3. Modification of Attribute and Attribute Value Lists</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.written">
@@ -892,7 +900,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.biblFull">
@@ -904,7 +912,7 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.biblScope">
@@ -924,7 +932,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.binaryObject">
@@ -990,7 +998,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">case</span>) 
               <span xml:lang="en" lang="en">contains grammatical case information given by a dictionary for a given form.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.catDesc">
@@ -1036,7 +1044,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">cell</span>) 
               <span xml:lang="en" lang="en">contains one cell of a table.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">14.1.1. TEI Tables</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">15.1.1. TEI Tables</a>]</td>
             </tr>
             <tr>
               <td id="TEI.change">
@@ -1047,7 +1055,7 @@ <h1>
               <span xml:lang="en" lang="en">documents a change or set of changes made during the production of a source document, or during the revision of an electronic file.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4C">2.4.1. Creation</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.choice">
@@ -1067,7 +1075,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHQQ">3.3.3. Quotation</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">9.3.5.1. Examples</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">10.3.5.1. Examples</a>]</td>
             </tr>
             <tr>
               <td id="TEI.citeData">
@@ -1077,7 +1085,7 @@ <h1>
               <span xml:lang="en" lang="en">citation data</span>) 
               <span xml:lang="en" lang="en">specifies how information may be extracted from citation structures.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</a>]</td>
             </tr>
             <tr>
               <td id="TEI.citeStructure">
@@ -1087,7 +1095,7 @@ <h1>
               <span xml:lang="en" lang="en">citation structure</span>) 
               <span xml:lang="en" lang="en">declares a structure and method for citing the current document.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</a>]</td>
             </tr>
             <tr>
               <td id="TEI.citedRange">
@@ -1134,7 +1142,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">collocate</span>) 
               <span xml:lang="en" lang="en">contains any sequence of words that co-occur with the headword with significant frequency.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.conversion">
@@ -1161,7 +1169,7 @@ <h1>
               <span xml:lang="en" lang="en">correction principles</span>) 
               <span xml:lang="en" lang="en">states how and under what circumstances corrections have been made in the text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.correspAction">
@@ -1207,7 +1215,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">damage</span>) 
               <span xml:lang="en" lang="en">contains an area of damage to the text witness.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.damageSpan">
@@ -1216,7 +1224,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">damaged span of text</span>) 
               <span xml:lang="en" lang="en">marks the beginning of a longer sequence of text which is damaged in some way but still legible.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.date">
@@ -1229,8 +1237,8 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">15.2.3. The Setting Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">16.2.3. The Setting Description</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.dateline">
@@ -1248,7 +1256,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">definition</span>) 
               <span xml:lang="en" lang="en">contains definition text in a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPDE">9.3.3.1. Definitions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPDE">10.3.3.1. Definitions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.del">
@@ -1266,7 +1274,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">deleted span of text</span>) 
               <span xml:lang="en" lang="en">marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.desc">
@@ -1275,7 +1283,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">description</span>) 
               <span xml:lang="en" lang="en">contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</a>]</td>
             </tr>
             <tr>
               <td id="TEI.dictScrap">
@@ -1284,8 +1292,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">dictionary scrap</span>) 
               <span xml:lang="en" lang="en">encloses a part of a dictionary entry in which other phrase-level dictionary elements are freely combined.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.distinct">
@@ -1437,8 +1445,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">leaf or terminal node of an embedding tree</span>) 
               <span xml:lang="en" lang="en">provides explicitly for a leaf of an embedding tree, which may also be encoded with the 
-              <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">&lt;eTree&gt;</a>element.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">19.3. Another Tree Notation</a>]</td>
+              <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">&lt;eTree&gt;</a>element.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">20.3. Another Tree Notation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.eTree">
@@ -1447,8 +1455,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">embedding tree</span>) 
               <span xml:lang="en" lang="en">provides an alternative to the 
-              <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [19.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">19.3. Another Tree Notation</a>]</td>
+              <a class="link_ref" href="#TEI.tree" title="tree (tree) encodes a tree which is made up of a root internal nodes leaves and arcs from root to leaves. [20.2. Trees]">&lt;tree&gt;</a>element for representing ordered rooted tree structures.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">20.3. Another Tree Notation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.edition">
@@ -1486,7 +1494,7 @@ <h1>
               <span xml:lang="en" lang="en">provides details of editorial principles and practices applied during the encoding of a text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ellipsis">
@@ -1533,8 +1541,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">entry</span>) 
               <span xml:lang="en" lang="en">contains a single structured entry in any kind of lexical resource, such as a dictionary or lexicon.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.entryFree">
@@ -1543,8 +1551,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">unstructured entry</span>) 
               <span xml:lang="en" lang="en">contains a single unstructured entry in any kind of lexical resource, such as a dictionary or lexicon.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.epigraph">
@@ -1564,7 +1572,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">etymology</span>) 
               <span xml:lang="en" lang="en">encloses the etymological information in a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPET">9.3.4. Etymological Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPET">10.3.4. Etymological Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ex">
@@ -1573,7 +1581,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">editorial expansion</span>) 
               <span xml:lang="en" lang="en">contains a sequence of letters added by an editor or transcriber when expanding an abbreviation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAB">11.3.1.2. Abbreviation and Expansion</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAB">12.3.1.2. Abbreviation and Expansion</a>]</td>
             </tr>
             <tr>
               <td id="TEI.expan">
@@ -1594,7 +1602,7 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD23">2.2.3. Type and Extent of File</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">10.7.1. Object Description</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">11.7.1. Object Description</a>]</td>
             </tr>
             <tr>
               <td id="TEI.facsimile">
@@ -1602,7 +1610,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-facsimile.html">facsimile</a>
               </span>: 
               <span xml:lang="en" lang="en">contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>]</td>
             </tr>
             <tr>
               <td id="TEI.figDesc">
@@ -1611,7 +1619,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">description of figure</span>) 
               <span xml:lang="en" lang="en">contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">14.4. Specific Elements for Graphic Images</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">15.4. Specific Elements for Graphic Images</a>]</td>
             </tr>
             <tr>
               <td id="TEI.figure">
@@ -1620,7 +1628,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">figure</span>) 
               <span xml:lang="en" lang="en">groups elements representing or containing graphic information such as an illustration, formula, or figure.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">14.4. Specific Elements for Graphic Images</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">15.4. Specific Elements for Graphic Images</a>]</td>
             </tr>
             <tr>
               <td id="TEI.fileDesc">
@@ -1657,7 +1665,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">forest</span>) 
               <span xml:lang="en" lang="en">provides for groups of rooted trees.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">19.3. Another Tree Notation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">20.3. Another Tree Notation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.form">
@@ -1666,7 +1674,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">form information group</span>) 
               <span xml:lang="en" lang="en">groups all the information on the written and spoken forms of one headword.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.formula">
@@ -1675,7 +1683,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">formula</span>) 
               <span xml:lang="en" lang="en">contains a mathematical or other formula.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTFOR">14.2. Formulæ and Mathematical Expressions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTFOR">15.2. Formulæ and Mathematical Expressions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.front">
@@ -1703,7 +1711,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">forme work</span>) 
               <span xml:lang="en" lang="en">contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSK">11.6. Headers, Footers, and Similar Matter</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSK">12.6. Headers, Footers, and Similar Matter</a>]</td>
             </tr>
             <tr>
               <td id="TEI.gap">
@@ -1730,7 +1738,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">gender</span>) 
               <span xml:lang="en" lang="en">identifies the morphological gender of a lexical item, as given in the dictionary.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.geoDecl">
@@ -1750,7 +1758,7 @@ <h1>
               <span xml:lang="en" lang="en">gloss</span>) 
               <span xml:lang="en" lang="en">identifies a phrase or word used to provide a gloss or definition for some other word or phrase.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHTG">3.4.1. Terms and Glosses</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</a>]</td>
             </tr>
             <tr>
               <td id="TEI.gram">
@@ -1759,7 +1767,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">grammatical information</span>) 
               <span xml:lang="en" lang="en">within an entry in a dictionary or a terminological data file, contains grammatical information relating to a term, word, or form.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.gramGrp">
@@ -1768,12 +1776,12 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">grammatical information group</span>) 
               <span xml:lang="en" lang="en">groups morpho-syntactic information about a lexical item, e.g. 
-              <a class="link_ref" href="#TEI.pos" title="pos (part of speech) indicates the part of speech assigned to a dictionary headword such as noun verb or adjective. [9.3.2. Gra...">&lt;pos&gt;</a>, 
-              <a class="link_ref" href="#TEI.gen" title="gen (gender) identifies the morphological gender of a lexical item as given in the dictionary. [9.3.1. Information on Written a...">&lt;gen&gt;</a>, 
-              <a class="link_ref" href="#TEI.number" title="number (number) indicates grammatical number associated with a form as given in a dictionary. [9.3.1. Information on Written an...">&lt;number&gt;</a>, 
-              <a class="link_ref" href="#TEI.case" title="case (case) contains grammatical case information given by a dictionary for a given form. [9.3.1. Information on Written and Sp...">&lt;case&gt;</a>, or 
-              <a class="link_ref" href="#TEI.iType" title="iType (inflectional class) indicates the inflectional class associated with a lexical item. [9.3.1. Information on Written and ...">&lt;iType&gt;</a>(inflectional class).</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="#TEI.pos" title="pos (part of speech) indicates the part of speech assigned to a dictionary headword such as noun verb or adjective. [10.3.2. Gr...">&lt;pos&gt;</a>, 
+              <a class="link_ref" href="#TEI.gen" title="gen (gender) identifies the morphological gender of a lexical item as given in the dictionary. [10.3.1. Information on Written ...">&lt;gen&gt;</a>, 
+              <a class="link_ref" href="#TEI.number" title="number (number) indicates grammatical number associated with a form as given in a dictionary. [10.3.1. Information on Written a...">&lt;number&gt;</a>, 
+              <a class="link_ref" href="#TEI.case" title="case (case) contains grammatical case information given by a dictionary for a given form. [10.3.1. Information on Written and S...">&lt;case&gt;</a>, or 
+              <a class="link_ref" href="#TEI.iType" title="iType (inflectional class) indicates the inflectional class associated with a lexical item. [10.3.1. Information on Written and...">&lt;iType&gt;</a>(inflectional class).</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.graph">
@@ -1782,7 +1790,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">graph</span>) 
               <span xml:lang="en" lang="en">encodes a graph, which is a collection of nodes, and arcs which connect the nodes.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDGR">19.1. Graphs and Digraphs</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDGR">20.1. Graphs and Digraphs</a>]</td>
             </tr>
             <tr>
               <td id="TEI.graphic">
@@ -1792,7 +1800,7 @@ <h1>
               <span xml:lang="en" lang="en">graphic</span>) 
               <span xml:lang="en" lang="en">indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COGR">3.10. Graphics and Other Non-textual Components</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>]</td>
             </tr>
             <tr>
               <td id="TEI.group">
@@ -1803,7 +1811,7 @@ <h1>
               <span xml:lang="en" lang="en">contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.handNote">
@@ -1812,7 +1820,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">note on hand</span>) 
               <span xml:lang="en" lang="en">describes a particular style or hand distinguished within a manuscript.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</a>]</td>
             </tr>
             <tr>
               <td id="TEI.handNotes">
@@ -1820,8 +1828,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-handNotes.html">handNotes</a>
               </span>: 
               <span xml:lang="en" lang="en">contains one or more 
-              <a class="link_ref" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing Decoration and...">&lt;handNote&gt;</a>elements documenting the different hands identified within the source texts.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</a>]</td>
+              <a class="link_ref" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing Decoration and...">&lt;handNote&gt;</a>elements documenting the different hands identified within the source texts.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</a>]</td>
             </tr>
             <tr>
               <td id="TEI.handShift">
@@ -1830,7 +1838,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">handwriting shift</span>) 
               <span xml:lang="en" lang="en">marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</a>]</td>
             </tr>
             <tr>
               <td id="TEI.head">
@@ -1876,7 +1884,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">homograph</span>) 
               <span xml:lang="en" lang="en">groups information relating to one homograph within an entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.hyph">
@@ -1885,7 +1893,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">hyphenation</span>) 
               <span xml:lang="en" lang="en">contains a hyphenated form of a dictionary headword, or hyphenation information in some other form.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.hyphenation">
@@ -1895,7 +1903,7 @@ <h1>
               <span xml:lang="en" lang="en">hyphenation</span>) 
               <span xml:lang="en" lang="en">summarizes the way in which hyphenation in a source text has been treated in an encoded version of it.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.iNode">
@@ -1904,7 +1912,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">intermediate (or internal) node</span>) 
               <span xml:lang="en" lang="en">represents an intermediate (or internal) node of a tree.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">19.2. Trees</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">20.2. Trees</a>]</td>
             </tr>
             <tr>
               <td id="TEI.iType">
@@ -1913,7 +1921,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">inflectional class</span>) 
               <span xml:lang="en" lang="en">indicates the inflectional class associated with a lexical item.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.idno">
@@ -1922,7 +1930,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">identifier</span>) 
               <span xml:lang="en" lang="en">supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD26">2.2.5. The Series Statement</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>]</td>
@@ -1979,7 +1987,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">join</span>) 
               <span xml:lang="en" lang="en">identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.joinGrp">
@@ -1989,7 +1997,7 @@ <h1>
               <span xml:lang="en" lang="en">join group</span>) 
               <span xml:lang="en" lang="en">groups a collection of 
               <a class="link_ref" href="#TEI.join" title="join (join) identifies a possibly fragmented segment of text by pointing at the possibly discontiguous elements which compose i...">&lt;join&gt;</a>elements and possibly pointers.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.keywords">
@@ -2027,7 +2035,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">language name</span>) 
               <span xml:lang="en" lang="en">contains the name of a language mentioned in etymological or other linguistic discussion.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPET">9.3.4. Etymological Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPET">10.3.4. Etymological Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.langUsage">
@@ -2038,7 +2046,7 @@ <h1>
               <span xml:lang="en" lang="en">describes the languages, sublanguages, registers, dialects, etc. represented within a text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD41">2.4.2. Language Usage</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4">2.4. The Profile Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.language">
@@ -2066,9 +2074,9 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">label</span>) 
               <span xml:lang="en" lang="en">contains a label for a form, example, translation, or other piece of information, e.g. abbreviation for, contraction of, literally, approximately, synonyms:, etc.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPTR">9.3.3.2. Translation Equivalents</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPXR">9.3.5.3. Cross-References to Other Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPTR">10.3.3.2. Translation Equivalents</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPXR">10.3.5.3. Cross-References to Other Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.leaf">
@@ -2077,7 +2085,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">leaf</span>) 
               <span xml:lang="en" lang="en">encodes the leaves (terminal nodes) of a tree.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">19.2. Trees</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">20.2. Trees</a>]</td>
             </tr>
             <tr>
               <td id="TEI.lg">
@@ -2104,7 +2112,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-line.html">line</a>
               </span>: 
               <span xml:lang="en" lang="en">contains the transcription of a topographic line in the source document</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">12.2.2. Embedded Transcription</a>]</td>
             </tr>
             <tr>
               <td id="TEI.link">
@@ -2113,7 +2121,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">link</span>) 
               <span xml:lang="en" lang="en">defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.linkGrp">
@@ -2122,7 +2130,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">link group</span>) 
               <span xml:lang="en" lang="en">defines a collection of associations or hypertextual links.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.list">
@@ -2139,11 +2147,11 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-listAnnotation.html">listAnnotation</a>
               </span>: 
               <span xml:lang="en" lang="en">contains a list of annotations, typically encoded as 
-              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container]">&lt;annotation&gt;</a>, 
+              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container]">&lt;annotation&gt;</a>, 
               <span class="gi">&lt;annotationBlock&gt;</span>, or 
               <a class="link_ref" href="#TEI.note" title="note (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">&lt;note&gt;</a>, possibly organized with nested 
               <a class="link_ref" href="#TEI.listAnnotation" title="listAnnotation contains a list of annotations typically encoded as &lt;annotation&gt; annotationBlock or &lt;note&gt; possibly organized wi...">&lt;listAnnotation&gt;</a>elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listBibl">
@@ -2154,7 +2162,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a list of bibliographic citations of any kind.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listChange">
@@ -2163,7 +2171,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listForest">
@@ -2171,7 +2179,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-listForest.html">listForest</a>
               </span>: 
               <span xml:lang="en" lang="en">provides for lists of forests.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">19.3. Another Tree Notation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">20.3. Another Tree Notation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listPrefixDef">
@@ -2181,7 +2189,7 @@ <h1>
               <span xml:lang="en" lang="en">list of prefix definitions</span>) 
               <span xml:lang="en" lang="en">contains a list of definitions of prefixing schemes used in 
               <span class="ident-datatype">teidata.pointer</span>values, showing how abbreviated URIs using each scheme may be expanded into full URIs.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listTranspose">
@@ -2189,7 +2197,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-listTranspose.html">listTranspose</a>
               </span>: 
               <span xml:lang="en" lang="en">supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#transpo">11.3.4.5. Transpositions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#transpo">12.3.4.5. Transpositions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.macro.abContent">
@@ -2269,7 +2277,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">measure group</span>) 
               <span xml:lang="en" lang="en">contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">10.3.4. Dimensions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">11.3.4. Dimensions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.media">
@@ -2301,7 +2309,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-metamark.html">metamark</a>
               </span>: 
               <span xml:lang="en" lang="en">contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-meta">11.3.4.2. Metamarks</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-meta">12.3.4.2. Metamarks</a>]</td>
             </tr>
             <tr>
               <td id="TEI.milestone">
@@ -2318,7 +2326,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-mod.html">mod</a>
               </span>: 
               <span xml:lang="en" lang="en">represents any kind of modification identified within a single document.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-mod">11.3.4.1. Generic Modification</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-mod">12.3.4.1. Generic Modification</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.addrPart">
@@ -2342,7 +2350,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.annotationLike.html">model.annotationLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements used to represent annotations.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.annotationPart.body">
@@ -2350,7 +2358,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.annotationPart.body.html">model.annotationPart.body</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which may be used as an 
-              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container]">&lt;annotation&gt;</a>body.</span></td>
+              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container]">&lt;annotation&gt;</a>body.</span></td>
             </tr>
             <tr>
               <td id="TEI.model.applicationLike">
@@ -2416,6 +2424,19 @@ <h1>
               <a class="link_ref" href="#TEI.choice" title="choice (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]">&lt;choice&gt;</a>alternation.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>]</td>
             </tr>
+            <tr>
+              <td id="TEI.model.cmc">
+              <span class="hi">
+                <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.cmc.html">model.cmc</a>
+              </span>: 
+              <span xml:lang="en" lang="en">includes the CMC-specific element 
+              <span class="gi">&lt;post&gt;</span>and makes it available on the divPart level. This allows for using (and combining) occurrences of 
+              <span class="gi">&lt;post&gt;</span>, 
+              <span class="gi">&lt;u&gt;</span>, 
+              <span class="gi">&lt;incident&gt;</span>, and 
+              <span class="gi">&lt;kinesic&gt;</span>in one and the same 
+              <a class="link_ref" href="#TEI.div" title="div (text division) contains a subdivision of the front body or back of a text. [4.1. Divisions of the Body]">&lt;div&gt;</a>in order to be able to represent the combined use of written and spoken posts, utterances, and nonverbal acts on the GUI of multimodal CMC environments.</span></td>
+            </tr>
             <tr>
               <td id="TEI.model.common">
               <span class="hi">
@@ -2452,7 +2473,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">groups elements containing temporal expressions.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.descLike">
@@ -2594,7 +2615,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.egLike.html">model.egLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements containing examples or illustrations.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">22.1.1. Phrase Level Terms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">23.1.1. Phrase Level Terms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.emphLike">
@@ -2618,7 +2639,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.entryLike.html">model.entryLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements structurally analogous to paragraphs within dictionaries.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STEC">1.3. The TEI Class System</a>]</td>
             </tr>
             <tr>
@@ -2627,7 +2648,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.entryPart.html">model.entryPart</a>
               </span>: 
               <span xml:lang="en" lang="en">groups non-morphological elements appearing within a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.entryPart.top">
@@ -2635,7 +2656,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.entryPart.top.html">model.entryPart.top</a>
               </span>: 
               <span xml:lang="en" lang="en">groups high level elements within a structured dictionary entry</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.formPart">
@@ -2643,8 +2664,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.formPart.html">model.formPart</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements allowed within a 
-              <a class="link_ref" href="#TEI.form" title="form (form information group) groups all the information on the written and spoken forms of one headword. [9.3.1. Information o...">&lt;form&gt;</a>element in a dictionary.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="#TEI.form" title="form (form information group) groups all the information on the written and spoken forms of one headword. [10.3.1. Information ...">&lt;form&gt;</a>element in a dictionary.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.frontPart">
@@ -2700,7 +2721,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">groups elements allowed within a 
               <a class="link_ref" href="#TEI.gramGrp" title="gramGrp (grammatical information group) groups morphosyntactic information about a lexical item e.g. &lt;pos&gt; &lt;gen&gt; &lt;number&gt; &lt;case...">&lt;gramGrp&gt;</a>element in a dictionary.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.graphicLike">
@@ -2825,7 +2846,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.morphLike.html">model.morphLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which provide morphological information within a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITP">9.3. Top-level Constituents of Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITP">10.3. Top-level Constituents of Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.nameLike">
@@ -2863,7 +2884,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.offsetLike.html">model.offsetLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which can appear only as part of a place name.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.pLike">
@@ -2910,7 +2931,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.pPart.msdesc.html">model.pPart.msdesc</a>
               </span>: 
               <span xml:lang="en" lang="en">groups phrase-level elements used in manuscript description.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">10. Manuscript Description</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">11. Manuscript Description</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.pPart.transcriptional">
@@ -2942,7 +2963,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.phrase.xml.html">model.phrase.xml</a>
               </span>: 
               <span xml:lang="en" lang="en">groups phrase-level elements used to encode XML constructs such as element names, attribute names, and attribute values</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.placeNamePart">
@@ -2950,7 +2971,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.placeNamePart.html">model.placeNamePart</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which form part of a place name.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.placeStateLike">
@@ -2981,7 +3002,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.ptrLike.form.html">model.ptrLike.form</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements used for purposes of location of particular orthographic or pronunciation forms within a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DI">9. Dictionaries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DI">10. Dictionaries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.publicationStmtPart.agency">
@@ -3029,8 +3050,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.segLike.html">model.segLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements used for arbitrary segmentation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.sourceDescPart">
@@ -3046,7 +3067,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.specDescLike.html">model.specDescLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements for referring to specification elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.stageLike">
@@ -3099,7 +3120,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">mood</span>) 
               <span xml:lang="en" lang="en">contains information about the grammatical mood of verbs (e.g. indicative, subjunctive, imperative).</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.name">
@@ -3126,7 +3147,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">node</span>) 
               <span xml:lang="en" lang="en">encodes a node, a possibly labeled point in a graph.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDGR">19.1. Graphs and Digraphs</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDGR">20.1. Graphs and Digraphs</a>]</td>
             </tr>
             <tr>
               <td id="TEI.normalization">
@@ -3136,7 +3157,7 @@ <h1>
               <span xml:lang="en" lang="en">normalization</span>) 
               <span xml:lang="en" lang="en">indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.notatedMusic">
@@ -3144,7 +3165,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-notatedMusic.html">notatedMusic</a>
               </span>: 
               <span xml:lang="en" lang="en">encodes the presence of music notation in a text</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTNM">14.3. Notated Music in Written Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTNM">15.3. Notated Music in Written Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.note">
@@ -3156,7 +3177,7 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONONO">3.9.1. Notes and Simple Annotation</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD27">2.2.6. The Notes Statement</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICON">3.12.2.8. Notes and Statement of Language</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">9.3.5.4. Notes within Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">10.3.5.4. Notes within Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.noteGrp">
@@ -3193,8 +3214,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">number</span>) 
               <span xml:lang="en" lang="en">indicates grammatical number associated with a form, as given in a dictionary.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.oRef">
@@ -3203,7 +3224,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">orthographic-form reference</span>) 
               <span xml:lang="en" lang="en">in a dictionary example, indicates a reference to the orthographic form(s) of the headword.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIHW">9.4. Headword and Pronunciation References</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIHW">10.4. Headword and Pronunciation References</a>]</td>
             </tr>
             <tr>
               <td id="TEI.opener">
@@ -3222,7 +3243,7 @@ <h1>
               <span xml:lang="en" lang="en">original form</span>) 
               <span xml:lang="en" lang="en">contains a reading which is marked as following the original, rather than being normalized or corrected.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and Normalization</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</a>]</td>
             </tr>
             <tr>
               <td id="TEI.orth">
@@ -3231,7 +3252,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">orthographic form</span>) 
               <span xml:lang="en" lang="en">gives the orthographic form of a dictionary headword.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.p">
@@ -3250,7 +3271,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">pronunciation reference</span>) 
               <span xml:lang="en" lang="en">in a dictionary example, indicates a reference to the pronunciation(s) of the headword.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIHW">9.4. Headword and Pronunciation References</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIHW">10.4. Headword and Pronunciation References</a>]</td>
             </tr>
             <tr>
               <td id="TEI.path">
@@ -3260,8 +3281,8 @@ <h1>
               <span xml:lang="en" lang="en">path</span>) 
               <span xml:lang="en" lang="en">defines any line passing through two or more points within a 
               <a class="link_ref" href="#TEI.surface" title="surface defines a written surface as a twodimensional coordinate space optionally grouping one or more graphic representations ...">&lt;surface&gt;</a>element.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">12.2.2. Embedded Transcription</a>]</td>
             </tr>
             <tr>
               <td id="TEI.pb">
@@ -3279,7 +3300,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">person</span>) 
               <span xml:lang="en" lang="en">contains an indication of the grammatical person (1st, 2nd, 3rd, etc.) associated with a given inflected form in a dictionary.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.pos">
@@ -3288,7 +3309,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">part of speech</span>) 
               <span xml:lang="en" lang="en">indicates the part of speech assigned to a dictionary headword such as noun, verb, or adjective.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.postBox">
@@ -3324,7 +3345,7 @@ <h1>
               <span xml:lang="en" lang="en">prefix definition</span>) 
               <span xml:lang="en" lang="en">defines a prefixing scheme used in 
               <span class="ident-datatype">teidata.pointer</span>values, showing how abbreviated URIs using the scheme may be expanded into full URIs.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>]</td>
             </tr>
             <tr>
               <td id="TEI.principal">
@@ -3354,7 +3375,7 @@ <h1>
               <span xml:lang="en" lang="en">describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD51">2.3.1. The Project Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.pron">
@@ -3363,7 +3384,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">pronunciation</span>) 
               <span xml:lang="en" lang="en">contains the pronunciation(s) of the word.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ptr">
@@ -3373,7 +3394,7 @@ <h1>
               <span xml:lang="en" lang="en">pointer</span>) 
               <span xml:lang="en" lang="en">defines a pointer to another location.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.pubPlace">
@@ -3430,7 +3451,7 @@ <h1>
               <span xml:lang="en" lang="en">quotation</span>) 
               <span xml:lang="en" lang="en">specifies editorial practice adopted with respect to quotation marks in the original.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.quote">
@@ -3458,7 +3479,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">related entry</span>) 
               <span xml:lang="en" lang="en" class="outOfDateTranslation">contains a dictionary entry for a lexical item related to the headword, such as a compound phrase or derived form, embedded inside a larger entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPRE">9.3.6. Related Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPRE">10.3.6. Related Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.redo">
@@ -3466,7 +3487,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-redo.html">redo</a>
               </span>: 
               <span xml:lang="en" lang="en">indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#undo">11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#undo">12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ref">
@@ -3476,7 +3497,7 @@ <h1>
               <span xml:lang="en" lang="en">reference</span>) 
               <span xml:lang="en" lang="en">defines a reference to another location, possibly modified by additional text or comment.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.refState">
@@ -3507,7 +3528,7 @@ <h1>
               <span xml:lang="en" lang="en">regularization</span>) 
               <span xml:lang="en" lang="en">contains a reading which has been regularized or normalized in some sense.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and Normalization</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</a>]</td>
             </tr>
             <tr>
               <td id="TEI.relatedItem">
@@ -3557,7 +3578,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">restore</span>) 
               <span xml:lang="en" lang="en">indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCD">11.3.1.6. Cancellation of Deletions and Other Markings</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCD">12.3.1.6. Cancellation of Deletions and Other Markings</a>]</td>
             </tr>
             <tr>
               <td id="TEI.retrace">
@@ -3565,7 +3586,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-retrace.html">retrace</a>
               </span>: 
               <span xml:lang="en" lang="en">contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-fix">11.3.4.3. Fixation and Clarification</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-fix">12.3.4.3. Fixation and Clarification</a>]</td>
             </tr>
             <tr>
               <td id="TEI.revisionDesc">
@@ -3584,7 +3605,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">root node</span>) 
               <span xml:lang="en" lang="en">represents the root node of a tree.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">19.2. Trees</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">20.2. Trees</a>]</td>
             </tr>
             <tr>
               <td id="TEI.row">
@@ -3593,7 +3614,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">row</span>) 
               <span xml:lang="en" lang="en">contains one row of a table.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">14.1.1. TEI Tables</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">15.1.1. TEI Tables</a>]</td>
             </tr>
             <tr>
               <td id="TEI.rs">
@@ -3602,7 +3623,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">referencing string</span>) 
               <span xml:lang="en" lang="en">contains a general purpose name or referring string.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>]</td>
             </tr>
             <tr>
@@ -3650,7 +3671,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD52">2.3.2. The Sampling Declaration</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.schemaRef">
@@ -3667,7 +3688,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-scriptNote.html">scriptNote</a>
               </span>: 
               <span xml:lang="en" lang="en">describes a particular script distinguished within the description of a manuscript or similar resource.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</a>]</td>
             </tr>
             <tr>
               <td id="TEI.secl">
@@ -3676,7 +3697,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">secluded text</span>) 
               <span xml:lang="en" lang="en">Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown).</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">11.3.1.7. Text Omitted from or Supplied in the Transcription</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">12.3.1.7. Text Omitted from or Supplied in the Transcription</a>]</td>
             </tr>
             <tr>
               <td id="TEI.seg">
@@ -3685,7 +3706,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">arbitrary segment</span>) 
               <span xml:lang="en" lang="en">represents any segmentation of text below the ‘chunk’ level.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/VE.html#VESE">6.2. Components of the Verse Line</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DR.html#DRPAL">7.2.5. Speech Contents</a>]</td>
             </tr>
@@ -3697,7 +3718,7 @@ <h1>
               <span xml:lang="en" lang="en">segmentation</span>) 
               <span xml:lang="en" lang="en">describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.sense">
@@ -3705,7 +3726,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-sense.html">sense</a>
               </span>: 
               <span xml:lang="en" lang="en">groups together all information relating to one word sense in a dictionary entry, for example definitions, examples, and translation equivalents.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">9.2. The Structure of Dictionary Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIEN">10.2. The Structure of Dictionary Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.series">
@@ -3759,7 +3780,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-sourceDesc.html">sourceDesc</a>
               </span>: (
               <span xml:lang="en" lang="en">source description</span>) 
-              <span xml:lang="en" lang="en">describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence.</span>[
+              <span xml:lang="en" lang="en">describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as 
+              <span class="q">‘born digital’</span>for a text which has no previous existence.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>]</td>
             </tr>
             <tr>
@@ -3769,8 +3791,8 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">contains a transcription or other representation of a single source document potentially forming part of a 
               <span class="foreign">dossier génétique</span>or collection of sources.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">12.2.2. Embedded Transcription</a>]</td>
             </tr>
             <tr>
               <td id="TEI.sp">
@@ -3790,7 +3812,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">space</span>) 
               <span xml:lang="en" lang="en">indicates the location of a significant space in the text.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSP">11.4.1. Space</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSP">12.4.1. Space</a>]</td>
             </tr>
             <tr>
               <td id="TEI.speaker">
@@ -3826,7 +3848,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-standOff.html">standOff</a>
               </span>: 
               <span xml:lang="en" lang="en">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.stdVals">
@@ -3836,7 +3858,7 @@ <h1>
               <span xml:lang="en" lang="en">standard values</span>) 
               <span xml:lang="en" lang="en">specifies the format used when standardized date or number values are supplied.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.street">
@@ -3853,7 +3875,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">stress</span>) 
               <span xml:lang="en" lang="en">contains the stress pattern for a dictionary headword, if given separately.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.styleDefDecl">
@@ -3871,7 +3893,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">subcategorization</span>) 
               <span xml:lang="en" lang="en">contains subcategorization information (transitive/intransitive, countable/non-countable, etc.)</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">9.3.2. Grammatical Information</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPGR">10.3.2. Grammatical Information</a>]</td>
             </tr>
             <tr>
               <td id="TEI.subst">
@@ -3880,7 +3902,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">substitution</span>) 
               <span xml:lang="en" lang="en">groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSU">11.3.1.5. Substitutions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSU">12.3.1.5. Substitutions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.substJoin">
@@ -3889,7 +3911,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">substitution join</span>) 
               <span xml:lang="en" lang="en">identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSU">11.3.1.5. Substitutions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHSU">12.3.1.5. Substitutions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.superEntry">
@@ -3898,7 +3920,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">super entry</span>) 
               <span xml:lang="en" lang="en" class="outOfDateTranslation">groups a sequence of entries within any kind of lexical resource, such as a dictionary or lexicon which function as a single unit, for example a set of homographs.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr>
               <td id="TEI.supplied">
@@ -3907,7 +3929,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">supplied</span>) 
               <span xml:lang="en" lang="en">signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.surface">
@@ -3915,8 +3937,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-surface.html">surface</a>
               </span>: 
               <span xml:lang="en" lang="en">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">12.2.2. Embedded Transcription</a>]</td>
             </tr>
             <tr>
               <td id="TEI.surfaceGrp">
@@ -3925,7 +3947,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">surface group</span>) 
               <span xml:lang="en" lang="en">defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>]</td>
             </tr>
             <tr>
               <td id="TEI.surplus">
@@ -3934,7 +3956,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">surplus</span>) 
               <span xml:lang="en" lang="en">marks text present in the source which the editor believes to be superfluous or redundant.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.syll">
@@ -3943,7 +3965,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">syllabification</span>) 
               <span xml:lang="en" lang="en">contains the syllabification of the headword.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.table">
@@ -3952,7 +3974,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">table</span>) 
               <span xml:lang="en" lang="en">contains text displayed in tabular form, in rows and columns.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">14.1.1. TEI Tables</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">15.1.1. TEI Tables</a>]</td>
             </tr>
             <tr>
               <td id="TEI.tagUsage">
@@ -3991,7 +4013,7 @@ <h1>
               <span xml:lang="en" lang="en">contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more 
               <a class="link_ref" href="#TEI.TEI" title="TEI (TEI document) contains a single TEIconformant document combining a single TEI header with one or more members of the model...">&lt;TEI&gt;</a>elements, each containing a single text header and a text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.teiHeader">
@@ -4001,7 +4023,7 @@ <h1>
               <span xml:lang="en" lang="en">TEI header</span>) 
               <span xml:lang="en" lang="en">supplies descriptive and declarative metadata associated with a digital resource or set of resources.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD11">2.1.1. The TEI Header and Its Components</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.teidata.certainty">
@@ -4212,7 +4234,7 @@ <h1>
               <span xml:lang="en" lang="en">text</span>) 
               <span xml:lang="en" lang="en">contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.textClass">
@@ -4231,7 +4253,7 @@ <h1>
               <span xml:lang="en" lang="en">text language</span>) 
               <span xml:lang="en" lang="en">describes the languages and writing systems identified within the bibliographic work being described, rather than its description.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">10.6.6. Languages and Writing Systems</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">11.6.6. Languages and Writing Systems</a>]</td>
             </tr>
             <tr>
               <td id="TEI.time">
@@ -4249,7 +4271,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">timeline</span>) 
               <span xml:lang="en" lang="en">provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</a>]</td>
             </tr>
             <tr>
               <td id="TEI.title">
@@ -4297,7 +4319,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">tense</span>) 
               <span xml:lang="en" lang="en">indicates the grammatical tense associated with a given inflected form in a dictionary.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.trailer">
@@ -4314,7 +4336,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-transpose.html">transpose</a>
               </span>: 
               <span xml:lang="en" lang="en">describes a single textual transposition as an ordered list of at least two pointers specifying the order in which the elements indicated should be re-combined.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#transpo">11.3.4.5. Transpositions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#transpo">12.3.4.5. Transpositions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.tree">
@@ -4323,7 +4345,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">tree</span>) 
               <span xml:lang="en" lang="en">encodes a tree, which is made up of a root, internal nodes, leaves, and arcs from root to leaves.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">19.2. Trees</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDTR">20.2. Trees</a>]</td>
             </tr>
             <tr>
               <td id="TEI.triangle">
@@ -4332,9 +4354,9 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">underspecified embedding tree, so called because of its characteristic shape when drawn</span>) 
               <span xml:lang="en" lang="en">provides for an underspecified 
-              <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">&lt;eTree&gt;</a>, that is, an 
-              <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [19.3. An...">&lt;eTree&gt;</a>with information left out.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">19.3. Another Tree Notation</a>]</td>
+              <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">&lt;eTree&gt;</a>, that is, an 
+              <a class="link_ref" href="#TEI.eTree" title="eTree (embedding tree) provides an alternative to the &lt;tree&gt; element for representing ordered rooted tree structures. [20.3. An...">&lt;eTree&gt;</a>with information left out.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/GD.html#GDAT">20.3. Another Tree Notation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.unclear">
@@ -4343,7 +4365,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">unclear</span>) 
               <span xml:lang="en" lang="en">contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</a>]</td>
             </tr>
             <tr>
@@ -4352,7 +4374,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-undo.html">undo</a>
               </span>: 
               <span xml:lang="en" lang="en">indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#undo">11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#undo">12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications</a>]</td>
             </tr>
             <tr>
               <td id="TEI.unit">
@@ -4387,7 +4409,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">usage</span>) 
               <span xml:lang="en" lang="en">contains usage information in a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPUS">9.3.5.2. Usage Information and Other Labels</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPUS">10.3.5.2. Usage Information and Other Labels</a>]</td>
             </tr>
             <tr>
               <td id="TEI.when">
@@ -4395,7 +4417,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-when.html">when</a>
               </span>: 
               <span xml:lang="en" lang="en">indicates a point in time either relative to other elements in the same timeline tag, or absolutely.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</a>]</td>
             </tr>
             <tr>
               <td id="TEI.xenoData">
@@ -4413,7 +4435,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">cross-reference phrase</span>) 
               <span xml:lang="en" lang="en">contains a phrase, sentence, or icon referring the reader to some other location in this or another text.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPXR">9.3.5.3. Cross-References to Other Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPXR">10.3.5.3. Cross-References to Other Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.zone">
@@ -4422,8 +4444,8 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">defines any two-dimensional area within a 
               <a class="link_ref" href="#TEI.surface" title="surface defines a written surface as a twodimensional coordinate space optionally grouping one or more graphic representations ...">&lt;surface&gt;</a>element.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">11.2.2. Embedded Transcription</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHZLAB">12.2.2. Embedded Transcription</a>]</td>
             </tr>
           </table>
         </div>
diff --git a/Test/expected-results/test.odt b/Test/expected-results/test.odt
index acf13f5b6cfed10727ec5be34075bfd49ef72ab2..34946cf5216de7f0abb768d99cbf8bb2eee9a3cd 100644
GIT binary patch
delta 1917
zcmZWpX;4#F6wY=-41sA-7NZgnmnuqu$f5&ikQk^NIsq9$OKMR@Hd#bmgCZ_iLPC}c
zY7{D1u_&<tLa?Gh9mN_EqcAmWt)d{9QlU^_D18Z8K;Ex=zVAEdop<g#AGh3wTW&)N
z-iXB!QQC)Q&nE?%A%_>qU19w2rG_J1mjfK2B_EKCVuDs&>u*p9h-e2h6hW6Lb3<ET
zwS)wzB4FT5L@W+1CF@nNmt4ugBO*LZB;sskqVfxPLj`!p3B3?r%>_WV<!(f@0hS|h
zhB4BK<h#B{vp<9056*xRcVSE_`R@-gb8v<}&=pB9i;zBQC;O0FKfy>%jr1qs93e*t
zfIM{<#?%Sa;_}qhSX0$WXrgcibdHEKspLrFDO10?G8ff4!Q|8-CIBo1$c$+Aa9IGT
zF@C!y01UfL67mnJ;7hc*evs$dtV`g6G~mb~yxJ)Y4hi`&WdF+`WzqfwuHuWbNGJ8_
zK6RsKr~k{8LC|pM{@9xViSok`OVmz2U3B@@cr<y`-nB0INmj)~%$RT0P=d_5<F92W
zSG_MPNiQkDWctQ6e3xZi*8Cs6WDVm+oSJbr;=r~7Z&KNFN$99=pk>&NiVlJ}X+_B<
z&fMGUu4fhfg7>W2!aT5F)q@++C>c$C+ySq7XByZ&fqy=zCKnecohrb+`R0dcvg4!O
zPksF_5;~(d&0i@VX|=FR&AtEN<FWA852HCs`tm>AGX*O|n^_w@x~*CV6prO*BO9@G
zKT({ko!Rqa8yOxgeD<SCYBQ}`q1Z65)RHqKJDeolef)e&oR^ndJ$Lq=%@tU;F@m&i
z`?#dJ_|hqb%V_>wb+RTkhP39}?ke2DUh-zYhqGK72=Qw(!|B%N(6)Q4kM3M|eru`S
z^&mNGJ<AD|?G6K;9~tUT9ZY*)DU>N2dtGuK#;W%u7M57IE4S9x&5kJ$Y<Sh1PFl>l
zl=S*lkGmSX&-1FC&*cLl(4nJ8)tBMgmu9<^cI#7Jw(YeoA3HN{J~3Av&M0jzTpX1E
zw_Q8fUEEJT(&lrIhh_aMQQpU>ChE~q+u3{1lu{d;RJLQ9LK<XN{=6d)O*(zzZ9wJm
zw81&UR}M<9u6%c|#wTt^Hz~YpQ3y-K;k6weHlr8cln!d{baoL}OA3>^moOeNLme))
zQ5}f?6rM-L3QyK#J6x#uo>iAXPpinzO__WBx3`C=$A~*y;7a_h+OMBx;ca<n8BwmW
zO252(yaxC7tEL5cjN?_bzlF+q?Bs?M@%8;oyZE~PuBXo&B~eav-0Hq%8Lcuaj!G3X
z!T+eR9f`KIX{;9yNPlH(a+vb$7tEj_Gqt&Y$0`d|z1@g}7h0WyOeM3`zDH4R&*uwf
zMGzvWc!t&RMe&8!rl1!am20h*jD}KKEs4=qOu>>3)bYDf6DWgGX_q68o?@{hJ{q7<
zi=0p>65=+=a_^(y2+*&HJRQVZAgp$eo^!!MD20GXG8kPG;!H4-3taRH0T+0i#K@ZI
z^3rmUyk~iUL^R|f#r$%Bhl!`@kJ214ElZP+cqJM$2Wv1^=)ePR2DgM^Jm6&v#5}NG
zzwzxn5NyQD_<#bp@_~)P17Iv4_!x{8BDAZKdB+ES#=toj_!@(R+$jtaP~fv%uxKhx
zfwKjlBVjWT$yDUAV9Fav!YM)UX8{G?76K>Z>kyg(Kg~cqMN>49qUrT0utrDg4YFGV
z-1Xz4iUHkNdY{;cUl9Y3Y4+GI2G05%OQ^j+oxcV`V7R|@sI7!T>3)pI5cuiu)jSUb
s>W_$IK1|62i}kT<J`z{wfu;KRT^?YVDC9<U|Bx<Am_I%1bv{`2KacL$CjbBd

delta 1917
zcmZWqdo<Kp9RJOj>oJB+H6!D(L@I3>VbgO-UZ-~0Jt;&U$BM#|X)0_Zn%dGZW0-5E
zEQvj+U5fmqt)-65W3!bcj~%u4ctm51Bb3_TZ_I=IcR!Es_kPd4zx(-RRM9f3XcV8F
z8YD7;Xd{R{O+fL~!WRepeFghgDwohX6PQDN0idYN+PJxXyV4;f6U?==F%m1Rv?J(g
z;KEFVzpv1ZBp24>LNtj`VSu@C0EZ2#IhqKPrwQZ9B*V&_s&q}fgIv32Nmvf^vjC`M
z-U^IV(kMo!sSw0XXwZ2==qJ>`_yQ_Eh^Tg<oejjLB;_208;741VRO{a&Vf>!i52QW
z{yR*vfShaqP<9YeJqg5ll)X_y-F24wcxeIkBblUjp;%$6dR}=ONw?fEd+Lz511tyl
zNz&lz9pH}gP*K?q@YZftKwq-KDuS-!xT&u{(xK@wV8QXMy|L<2SsC-nlQN;it6gf6
zV6ng6y;^4o&5x<$maxV_)6w7G^^N5{n4aEElNy{Vx)}35(qP(*ao4{24ew*pJIk8!
z@;1lb(bXrd`ig8%mKKn>TVtBSQ>p7Vd~hkXaVd$CxK#$m2`)QP);;9ynKt#*_bcHA
z>x$yODBZ<bX6s^o&gwVf(_2i<xUjY;&?#$odo+?Uw%7P{(}^L^f9lF;+~W1A1xR0T
zVWfe@eP+Lz#n+@b2kQ)4OSDXrvbj0<dBmNyv8<Uh{pLAw;=5k7X6v$II!i}3)w8I}
zwPJwq;yW(&Zz_XQJy3XYxUs^u`?F!AprD{akE{BeiLuG&A-AU&mv_g;hMhLG{^R9g
zt*{A$5N>gzaYu1p>P_2Pu~AoojD3g_P&iscJ=mckNj|qEkWc7ICT~c!S+v#mPu9_@
z6k@)g)LR%^Dk%v-=;5|!3))9s#0<S?jahx*LVib(*;r@w{p7+@s`P<({awpL1()61
zhf~H^aEueW+M^_|QtU5yQ)JAVt7QJ@c+`Z;GImY6P`qbjd|yL}@8-#Z=CH6$<^1+d
zRRtqQ=#BwrnB2^VEq(XwH#(o~?HpOdnEA@Y$C?@u(OCQ1WXliNM$I-Q94|VQ#QnF<
zdC-Gd)O{<-JATxwW2z}k+A?;J&1<bV;=b6;m%tg~9Zg!ayKM2!QJU`ltAaKon>6;f
ztmJTTT{;5_eGDbqb?!!k-P(_x&i9#<(<Z}=8=4y4hEKinHcX}jbhOcKKMes9$9V~!
zC;hqmP#tIYoD;#sH|{L0pT9Ab?b;Gi8SpIdad0=|z0v8+(8=V80shnLBJ)(rM7B%6
z|5?t^5RdcML{ECMgI4-LXv^_u&7rbP50v-V!^=yzTX%b}gJavhWmCWKMYXKkjFD44
zW<xit=zM`t=b~<)X<~zo%t6mke0lE`=D`mF#v?Sby!O1S(24G7H$B+9c1BAXRQThF
zabfB0jg15dVr7XS6a+yMP^To22oz5QO##t*K%QyvVFp+ZD<B|KltCvCnUD-%t8fT2
zfRoycJu^HD;jv7tt~D1>$jUm5+?EL()w;c6S&<3mRmsFyRuYIyHI%^$&H2DinU>Ix
z4>qWPh!0#9FJ8(AJ}SOk0O-(L0BFh#fYAc5MH#FRlNring#7}rO$F9ufvqa=ebyWW
z19aG$1+3=Ebht$LDdV?*$(zeG3g_%V$({pzJ^^(2Yc{Y{ZHLKp_+|m~WzHN=NY4Cz
zba+QDD*|#b2dq~d*XJVOg15&1I`Du<#s4G%j`QMCDgtX1HTn?0KY6}-LZH0A6o_|1
zX8%5o5NuQ2t8OmvR4g%z31sDh6$;D{W4JaKtW@CsT;Qgbup5<sL-ML@@%*YTF>v@F
DpkAHn

diff --git a/Test/expected-results/test.odt.listing b/Test/expected-results/test.odt.listing
index 1826cb941..befe54623 100644
--- a/Test/expected-results/test.odt.listing
+++ b/Test/expected-results/test.odt.listing
@@ -1,31 +1,25 @@
-Archive:  actual-results/test.odt
-No errors detected in compressed data of actual-results/test.odt.
-    testing: Configurations2/accelerator/current.xml   OK
+    testing: Configurations2/         OK
     testing: Configurations2/accelerator/   OK
+    testing: Configurations2/accelerator/current.xml   OK
     testing: Configurations2/floater/   OK
-    testing: Configurations2/images/Bitmaps/   OK
     testing: Configurations2/images/   OK
+    testing: Configurations2/images/Bitmaps/   OK
     testing: Configurations2/menubar/   OK
-    testing: Configurations2/         OK
     testing: Configurations2/popupmenu/   OK
     testing: Configurations2/progressbar/   OK
     testing: Configurations2/statusbar/   OK
     testing: Configurations2/toolbar/   OK
     testing: Configurations2/toolpanel/   OK
-    testing: content.xml              OK
-    testing: manifest.rdf             OK
-    testing: META-INF/manifest.xml    OK
     testing: META-INF/                OK
-    testing: meta.xml                 OK
-    testing: mimetype                 OK
+    testing: META-INF/manifest.xml    OK
     testing: Pictures/                OK
     testing: Pictures/pageimage1.jpg   OK
+    testing: Pictures/resource1.jpg   OK
     testing: Pictures/resource10.jpg   OK
     testing: Pictures/resource11.jpg   OK
     testing: Pictures/resource12.jpg   OK
     testing: Pictures/resource13.jpg   OK
     testing: Pictures/resource14.jpg   OK
-    testing: Pictures/resource1.jpg   OK
     testing: Pictures/resource2.jpg   OK
     testing: Pictures/resource3.jpg   OK
     testing: Pictures/resource4.jpg   OK
@@ -34,7 +28,13 @@ No errors detected in compressed data of actual-results/test.odt.
     testing: Pictures/resource7.jpg   OK
     testing: Pictures/resource8.jpg   OK
     testing: Pictures/resource9.jpg   OK
-    testing: settings.xml             OK
-    testing: styles.xml               OK
     testing: Thumbnails/              OK
     testing: Thumbnails/thumbnail.png   OK
+    testing: content.xml              OK
+    testing: manifest.rdf             OK
+    testing: meta.xml                 OK
+    testing: mimetype                 OK
+    testing: settings.xml             OK
+    testing: styles.xml               OK
+Archive:  actual-results/test.odt
+No errors detected in compressed data of actual-results/test.odt.
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 49046fc88..a0576f31d 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -406,6 +406,37 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="att.cmc.attributes">
+    <ref name="att.cmc.attribute.generatedBy"/>
+  </define>
+  <define name="att.cmc.attribute.generatedBy">
+    <optional>
+      <attribute name="generatedBy">
+        <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generated by) categorizes how the content of an element was generated in a CMC environment.
+Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified</a:documentation>
+        <choice>
+          <value>human</value>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was naturally typed or spoken by a human user</a:documentation>
+          <value>template</value>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated after a human user activated a template for its insertion</a:documentation>
+          <value>system</value>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by the system, i.e. the CMC environment</a:documentation>
+          <value>bot</value>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself</a:documentation>
+          <value>unspecified</value>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by an unknown or unspecified process</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1">
+    <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@generatedBy]">
+      <sch:assert test="ancestor-or-self::tei:post">The @generatedBy attribute is for use within a &lt;post&gt; element.</sch:assert>
+    </sch:rule>
+  </pattern>
   <define name="att.cReferencing.attributes">
     <ref name="att.cReferencing.attribute.cRef"/>
   </define>
@@ -509,17 +540,17 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.datable.w3c-att-datable-w3c-when-constraint-rule-1">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.datable.w3c-att-datable-w3c-when-constraint-rule-2">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@when]">
       <sch:report test="@notBefore|@notAfter|@from|@to" role="nonfatal">The @when attribute cannot be used with any other att.datable.w3c attributes.</sch:report>
     </sch:rule>
   </pattern>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.datable.w3c-att-datable-w3c-from-constraint-rule-2">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.datable.w3c-att-datable-w3c-from-constraint-rule-3">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@from]">
       <sch:report test="@notBefore" role="nonfatal">The @from and @notBefore attributes cannot be used together.</sch:report>
     </sch:rule>
   </pattern>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.datable.w3c-att-datable-w3c-to-constraint-rule-3">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.datable.w3c-att-datable-w3c-to-constraint-rule-4">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@to]">
       <sch:report test="@notAfter" role="nonfatal">The @to and @notAfter attributes cannot be used together.</sch:report>
     </sch:rule>
@@ -837,7 +868,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.global.source-source-only_1_ODD_source-constraint-rule-4">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.global.source-source-only_1_ODD_source-constraint-rule-5">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@source]">
       <sch:let name="srcs" value="tokenize( normalize-space(@source),' ')"/>
       <sch:report test="( self::tei:classRef               | self::tei:dataRef               | self::tei:elementRef               | self::tei:macroRef               | self::tei:moduleRef               | self::tei:schemaSpec )               and               $srcs[2]">
@@ -1161,7 +1192,7 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.measurement-att-measurement-unitRef-constraint-rule-5">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.measurement-att-measurement-unitRef-constraint-rule-6">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@unitRef]">
       <sch:report test="@unit" role="info">The @unit attribute may be unnecessary when @unitRef is present.</sch:report>
     </sch:rule>
@@ -1280,7 +1311,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.typed-subtypeTyped-constraint-rule-6">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.typed-subtypeTyped-constraint-rule-7">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@subtype]">
       <sch:assert test="@type">The <sch:name/> element should not be categorized in detail with @subtype unless also categorized in general with @type</sch:assert>
     </sch:rule>
@@ -1304,7 +1335,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.pointing-targetLang-targetLang-constraint-rule-7">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.pointing-targetLang-targetLang-constraint-rule-8">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[not(self::tei:schemaSpec)][@targetLang]">
       <sch:assert test="@target">@targetLang should only be used on <sch:name/> if @target is specified.</sch:assert>
     </sch:rule>
@@ -1457,7 +1488,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@spanTo]">
       <sch:assert test="id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)]">
 The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow the current element <sch:name/>
@@ -1495,7 +1526,7 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@schemeVersion]">
       <sch:assert test="@scheme and not(@scheme = 'free')">
               @schemeVersion can only be used if @scheme is specified.
@@ -3673,6 +3704,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
     <choice>
       <ref name="model.respLike"/>
       <ref name="model.imprintPart"/>
+      <ref name="quote"/>
       <ref name="series"/>
       <ref name="citedRange"/>
       <ref name="bibl"/>
@@ -3775,10 +3807,14 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <ref name="model.attributable"/>
     </choice>
   </define>
+  <define name="model.cmc">
+    <notAllowed/>
+  </define>
   <define name="model.common">
     <choice>
       <ref name="model.divPart"/>
       <ref name="model.inter"/>
+      <ref name="model.cmc"/>
       <ref name="q"/>
       <ref name="model.entryLike"/>
     </choice>
@@ -3939,6 +3975,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <ref name="model.biblLike"/>
       <ref name="model.listLike"/>
       <ref name="model.annotationLike"/>
+      <ref name="xenoData"/>
       <ref name="listChange"/>
       <ref name="zone"/>
       <ref name="graph"/>
@@ -4089,7 +4126,7 @@ Suggested values include: 1] full (full form); 2] pref (prefix); 3] suff (suffix
       </attribute>
     </optional>
   </define>
-  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
+  <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
       <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
               systems or calendars to which the date represented by the content of this element belongs,
@@ -4140,14 +4177,14 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
     <element name="p">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]</a:documentation>
       <ref name="macro.paraContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:p">
           <sch:report test="(ancestor::tei:ab or ancestor::tei:p) and                        not( ancestor::tei:floatingText                           | parent::tei:exemplum                           | parent::tei:item                           | parent::tei:note                           | parent::tei:q                           | parent::tei:quote                           | parent::tei:remarks                           | parent::tei:said                           | parent::tei:sp                           | parent::tei:stage                           | parent::tei:cell                           | parent::tei:figure )">
           Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
         </sch:report>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:p">
           <sch:report test="( ancestor::tei:l  or  ancestor::tei:lg ) and                        not( ancestor::tei:floatingText                           | parent::tei:figure                           | parent::tei:note )">
           Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
@@ -4158,6 +4195,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="att.declaring.attributes"/>
       <ref name="att.fragmentable.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4166,6 +4204,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4174,6 +4213,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4183,6 +4223,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4192,6 +4233,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the sublanguage or register to which the word or phrase is being assigned</a:documentation>
@@ -4227,6 +4269,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="macro.specialPara"/>
       <ref name="att.global.attributes"/>
       <ref name="att.ascribed.directed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="aloud">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.</a:documentation>
@@ -4265,6 +4308,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.notated.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4274,6 +4318,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="macro.specialPara"/>
       <ref name="att.global.attributes"/>
       <ref name="att.ascribed.directed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
@@ -4308,7 +4353,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
   </define>
   <define name="cit">
     <element name="cit">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="model.biblLike"/>
@@ -4323,6 +4368,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
       </oneOrMore>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4331,6 +4377,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">marks words or phrases mentioned, not used. [3.3.3. Quotation]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4339,14 +4386,15 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="desc">
     <element name="desc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]</a:documentation>
       <ref name="macro.limitedContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-desc-deprecationInfo-only-in-deprecated-constraint-rule-13">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-desc-deprecationInfo-only-in-deprecated-constraint-rule-14">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:desc[ @type eq 'deprecationInfo']">
           <sch:assert test="../@validUntil">Information about a
         deprecation should only be present in a specification element
@@ -4357,18 +4405,13 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.
-Suggested values include: 1] deprecationInfo (deprecation information)</a:documentation>
-          <choice>
-            <value>deprecationInfo</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation
-          information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <empty/>
@@ -4376,13 +4419,14 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
   </define>
   <define name="gloss">
     <element name="gloss">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.pointing.attributes"/>
       <ref name="att.cReferencing.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4397,6 +4441,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
       <ref name="att.canonical.attributes"/>
       <ref name="att.sortable.attributes"/>
       <ref name="att.cReferencing.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4411,6 +4456,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4439,7 +4485,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-target-rt-target-not-span-constraint-rule-14">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-target-rt-target-not-span-constraint-rule-15">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:rt/@target">
           <sch:report test="../@from | ../@to">When target= is present, neither from= nor to= should be.</sch:report>
         </sch:rule>
@@ -4452,7 +4498,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-from-rt-from-constraint-rule-15">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-from-rt-from-constraint-rule-16">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:rt/@from">
           <sch:assert test="../@to">When from= is present, the to= attribute of <sch:name/> is required.</sch:assert>
         </sch:rule>
@@ -4465,7 +4511,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
           </data>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-to-rt-to-constraint-rule-16">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-rt-to-rt-to-constraint-rule-17">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:rt/@to">
           <sch:assert test="../@from">When to= is present, the from= attribute of <sch:name/> is required.</sch:assert>
         </sch:rule>
@@ -4478,6 +4524,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4488,6 +4535,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4509,26 +4557,29 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
         </choice>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="reg">
     <element name="reg">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus]</a:documentation>
+Normalization 13. Critical Apparatus]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="orig">
     <element name="orig">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus]</a:documentation>
+Normalization 13. Critical Apparatus]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4545,6 +4596,7 @@ Normalization 12. Critical Apparatus]</a:documentation>
       <ref name="att.timed.attributes"/>
       <ref name="att.editLike.attributes"/>
       <ref name="att.dimensions.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="reason">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reason) gives the reason for omission
@@ -4613,6 +4665,7 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
       <ref name="att.placement.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.dimensions.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4624,16 +4677,18 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
       <ref name="att.transcriptional.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.dimensions.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="unclear">
     <element name="unclear">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
       <ref name="att.dimensions.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="reason">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates why the material is hard to transcribe.
@@ -4680,6 +4735,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
       <ref name="att.datable.attributes"/>
       <ref name="att.editLike.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="calendar">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -4692,7 +4748,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-name-calendar-calendar-check-name-constraint-rule-17">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-name-calendar-calendar-check-name-constraint-rule-18">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -4704,11 +4760,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
   </define>
   <define name="rs">
     <element name="rs">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.naming.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4717,6 +4774,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4735,6 +4793,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4778,23 +4837,13 @@ Measures]</a:documentation>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
       <ref name="att.ranging.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of numeric value.
-Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:documentation>
-          <choice>
-            <value>cardinal</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">absolute number, e.g. 21, 21.5</a:documentation>
-            <value>ordinal</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">ordinal number, e.g. 21st</a:documentation>
-            <value>fraction</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">fraction, e.g. one half or three-quarters</a:documentation>
-            <value>percentage</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a percentage</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of numeric value.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <optional>
@@ -4820,6 +4869,7 @@ Measures]</a:documentation>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
       <ref name="att.measurement.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <ref name="att.ranging.attributes"/>
       <optional>
         <attribute name="type">
@@ -4834,7 +4884,7 @@ Measures]</a:documentation>
   </define>
   <define name="measureGrp">
     <element name="measureGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -4845,6 +4895,7 @@ Measures]</a:documentation>
       <ref name="att.global.attributes"/>
       <ref name="att.measurement.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4856,12 +4907,13 @@ Measures]</a:documentation>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.measurement.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="date">
     <element name="date">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -4877,6 +4929,7 @@ Measures]</a:documentation>
       <ref name="att.editLike.attributes"/>
       <ref name="att.dimensions.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4898,6 +4951,7 @@ Measures]</a:documentation>
       <ref name="att.editLike.attributes"/>
       <ref name="att.dimensions.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -4907,10 +4961,10 @@ Measures]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) allows the encoder to classify the abbreviation according to some convenient typology.
-Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) allows the encoder to classify the abbreviation according to some convenient typology.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -4925,14 +4979,15 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="ptr">
     <element name="ptr">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ptr-ptrAtts-constraint-rule-18">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ptr-ptrAtts-constraint-rule-19">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:ptr">
           <sch:report test="@target and @cRef">Only one of the attributes @target and @cRef may be supplied on <sch:name/>.</sch:report>
         </sch:rule>
@@ -4943,14 +4998,15 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
       <ref name="att.internetMedia.attributes"/>
       <ref name="att.pointing.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="ref">
     <element name="ref">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]</a:documentation>
       <ref name="macro.paraContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ref-refAtts-constraint-rule-19">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ref-refAtts-constraint-rule-20">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:ref">
           <sch:report test="@target and @cRef">Only one of the attributes @target' and @cRef' may be supplied on <sch:name/>
                </sch:report>
@@ -4962,6 +5018,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
       <ref name="att.internetMedia.attributes"/>
       <ref name="att.pointing.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5011,7 +5068,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
           </zeroOrMore>
         </zeroOrMore>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-list-gloss-list-must-have-labels-constraint-rule-20">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-list-gloss-list-must-have-labels-constraint-rule-21">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:list[@type='gloss']">
           <sch:assert test="tei:label">The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element</sch:assert>
         </sch:rule>
@@ -5019,25 +5076,13 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
       <ref name="att.global.attributes"/>
       <ref name="att.sortable.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) describes the nature of the items in the list.
-Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)</a:documentation>
-          <choice>
-            <value>gloss</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) each list item glosses some term or concept, which is given by a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;label&gt;</code> element preceding the list item.</a:documentation>
-            <value>index</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.</a:documentation>
-            <value>instructions</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(instructions) each list item is a step in a sequence of instructions, as in a recipe.</a:documentation>
-            <value>litany</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.</a:documentation>
-            <value>syllogism</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) describes the nature of the items in the list.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <empty/>
@@ -5060,6 +5105,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.typed.attributes"/>
       <ref name="att.placement.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5081,6 +5127,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.typed.attributes"/>
       <ref name="att.placement.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5102,7 +5149,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
   </define>
   <define name="note">
     <element name="note">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]</a:documentation>
       <ref name="macro.specialPara"/>
       <ref name="att.global.attributes"/>
       <ref name="att.placement.attributes"/>
@@ -5110,6 +5157,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.typed.attributes"/>
       <ref name="att.written.attributes"/>
       <ref name="att.anchoring.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5133,6 +5181,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.typed.attributes"/>
       <ref name="att.written.attributes"/>
       <ref name="att.anchoring.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5147,6 +5196,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       </zeroOrMore>
       <ref name="att.global.attributes"/>
       <ref name="att.spanning.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="indexName">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.</a:documentation>
@@ -5170,6 +5220,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.resourced.attributes"/>
       <ref name="att.declaring.attributes"/>
       <ref name="att.timed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <attribute name="mimeType">
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type</a:documentation>
         <list>
@@ -5185,7 +5236,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
   </define>
   <define name="graphic">
     <element name="graphic">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]</a:documentation>
       <zeroOrMore>
         <ref name="model.descLike"/>
       </zeroOrMore>
@@ -5194,6 +5245,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.resourced.attributes"/>
       <ref name="att.declaring.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5205,6 +5257,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
       <ref name="att.media.attributes"/>
       <ref name="att.timed.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="encoding">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="http://en.wikipedia.org/wiki/Base64">Base64</a>.</a:documentation>
@@ -5231,6 +5284,7 @@ Elements]</a:documentation>
       <ref name="att.edition.attributes"/>
       <ref name="att.spanning.attributes"/>
       <ref name="att.breaking.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5244,6 +5298,7 @@ Elements]</a:documentation>
       <ref name="att.spanning.attributes"/>
       <ref name="att.breaking.attributes"/>
       <ref name="att.edition.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5257,6 +5312,7 @@ Elements]</a:documentation>
       <ref name="att.edition.attributes"/>
       <ref name="att.spanning.attributes"/>
       <ref name="att.breaking.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5270,6 +5326,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
       <ref name="att.edition.attributes"/>
       <ref name="att.spanning.attributes"/>
       <ref name="att.breaking.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5283,6 +5340,7 @@ Elements]</a:documentation>
       <ref name="att.edition.attributes"/>
       <ref name="att.spanning.attributes"/>
       <ref name="att.breaking.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5437,7 +5495,7 @@ Elements]</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-author-calendar-calendar-check-author-constraint-rule-21">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-author-calendar-calendar-check-author-constraint-rule-22">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5466,7 +5524,7 @@ Elements]</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-editor-calendar-calendar-check-editor-constraint-rule-22">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-editor-calendar-calendar-check-editor-constraint-rule-23">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5526,7 +5584,7 @@ Elements]</a:documentation>
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-resp-calendar-calendar-check-resp-constraint-rule-23">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-resp-calendar-calendar-check-resp-constraint-rule-24">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5544,10 +5602,10 @@ Elements]</a:documentation>
       <ref name="att.typed.attribute.subtype"/>
       <ref name="att.canonical.attributes"/>
       <ref name="att.datable.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the title according to some convenient typology.
-Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive)</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the title according to some convenient typology.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -5565,7 +5623,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-title-calendar-calendar-check-title-constraint-rule-24">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-title-calendar-calendar-check-title-constraint-rule-25">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5599,6 +5657,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
       <ref name="att.global.attributes"/>
       <ref name="att.datable.attributes"/>
       <ref name="att.canonical.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="calendar">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -5611,7 +5670,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-meeting-calendar-calendar-check-meeting-constraint-rule-25">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-meeting-calendar-calendar-check-meeting-constraint-rule-26">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -5687,7 +5746,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
   </define>
   <define name="bibl">
     <element name="bibl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -5706,12 +5765,13 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
       <ref name="att.typed.attributes"/>
       <ref name="att.sortable.attributes"/>
       <ref name="att.docStatus.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="biblStruct">
     <element name="biblStruct">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="analytic"/>
@@ -5736,12 +5796,13 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
       <ref name="att.typed.attributes"/>
       <ref name="att.sortable.attributes"/>
       <ref name="att.docStatus.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="listBibl">
     <element name="listBibl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.headLike"/>
@@ -5769,6 +5830,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
       <ref name="att.sortable.attributes"/>
       <ref name="att.declarable.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5781,7 +5843,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           <ref name="model.ptrLike"/>
         </choice>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-relatedItem-targetorcontent1-constraint-rule-26">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-relatedItem-targetorcontent1-constraint-rule-27">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:relatedItem">
           <sch:report test="@target and count( child::* ) &gt; 0">If the @target attribute on <sch:name/> is used, the relatedItem element must be empty</sch:report>
           <sch:assert test="@target or child::*">A relatedItem element should have either a @target attribute or a child element to indicate the related bibliographic item</sch:assert>
@@ -5812,13 +5874,14 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           <ref name="model.global"/>
         </choice>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-l-abstractModel-structure-l-in-l-constraint-rule-27">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-l-abstractModel-structure-l-in-l-constraint-rule-28">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:l">
           <sch:report test="ancestor::tei:l[not(.//tei:note//tei:l[. = current()])]">Abstract model violation: Lines may not contain lines or lg elements.</sch:report>
         </sch:rule>
       </pattern>
       <ref name="att.global.attributes"/>
       <ref name="att.fragmentable.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5856,12 +5919,12 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
           </zeroOrMore>
         </zeroOrMore>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-atleast1oflggapl-constraint-rule-28">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-atleast1oflggapl-constraint-rule-29">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:lg">
           <sch:assert test="count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) &gt; 0">An lg element must contain at least one child l, lg, or gap element.</sch:assert>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-abstractModel-structure-lg-in-l-constraint-rule-29">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-lg-abstractModel-structure-lg-in-l-constraint-rule-30">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:lg">
           <sch:report test="ancestor::tei:l[not(.//tei:note//tei:lg[. = current()])]">Abstract model violation: Lines may not contain line groups.</sch:report>
         </sch:rule>
@@ -5870,6 +5933,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
       <ref name="att.divLike.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.declaring.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -5926,6 +5990,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
       <ref name="att.global.attributes"/>
       <ref name="att.placement.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the kind of stage direction.
@@ -5964,7 +6029,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
   </define>
   <define name="teiCorpus">
     <element name="teiCorpus">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
       <group>
         <ref name="teiHeader"/>
         <zeroOrMore>
@@ -5997,8 +6062,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
       <ref name="att.typed.attribute.subtype"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -6009,7 +6073,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
   </define>
   <define name="textLang">
     <element name="textLang">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]</a:documentation>
       <ref name="macro.specialPara"/>
       <ref name="att.global.attributes"/>
       <optional>
@@ -6070,7 +6134,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
   </define>
   <define name="teiHeader">
     <element name="teiHeader">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]</a:documentation>
       <group>
         <ref name="fileDesc"/>
         <zeroOrMore>
@@ -6146,7 +6210,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-sponsor-calendar-calendar-check-sponsor-constraint-rule-30">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-sponsor-calendar-calendar-check-sponsor-constraint-rule-31">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6175,7 +6239,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-funder-calendar-calendar-check-funder-constraint-rule-31">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-funder-calendar-calendar-check-funder-constraint-rule-32">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6204,7 +6268,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-principal-calendar-calendar-check-principal-constraint-rule-32">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-principal-calendar-calendar-check-principal-constraint-rule-33">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6242,7 +6306,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
   </define>
   <define name="extent">
     <element name="extent">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <empty/>
@@ -6286,7 +6350,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
   </define>
   <define name="idno">
     <element name="idno">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -6298,30 +6362,13 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
       <ref name="att.sortable.attributes"/>
       <ref name="att.datable.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">categorizes the identifier, for example as an ISBN, Social Security number, etc.
-Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC</a:documentation>
-          <choice>
-            <value>ISBN</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://www.isbn-international.org"> International ISBN Agency.</a>
-                  </a:documentation>
-            <value>ISSN</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.</a:documentation>
-            <value>DOI</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.</a:documentation>
-            <value>URI</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
-            <value>VIAF</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.</a:documentation>
-            <value>ESTC</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.</a:documentation>
-            <value>OCLC</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">categorizes the identifier, for example as an ISBN, Social Security number, etc.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <optional>
@@ -6336,7 +6383,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-idno-calendar-calendar-check-idno-constraint-rule-33">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-idno-calendar-calendar-check-idno-constraint-rule-34">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6392,7 +6439,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-licence-calendar-calendar-check-licence-constraint-rule-34">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-licence-calendar-calendar-check-licence-constraint-rule-35">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -6447,7 +6494,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="sourceDesc">
     <element name="sourceDesc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]</a:documentation>
       <choice>
         <oneOrMore>
           <ref name="model.pLike"/>
@@ -6467,7 +6514,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="biblFull">
     <element name="biblFull">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
       <choice>
         <group>
           <group>
@@ -6499,6 +6546,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
       <ref name="att.declarable.attributes"/>
       <ref name="att.sortable.attributes"/>
       <ref name="att.docStatus.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -6535,7 +6583,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="projectDesc">
     <element name="projectDesc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6546,7 +6594,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="samplingDecl">
     <element name="samplingDecl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6557,7 +6605,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="editorialDecl">
     <element name="editorialDecl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="model.pLike"/>
@@ -6571,7 +6619,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="correction">
     <element name="correction">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6608,7 +6656,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="normalization">
     <element name="normalization">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6630,11 +6678,11 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="quotation">
     <element name="quotation">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
       <zeroOrMore>
         <ref name="model.pLike"/>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-quotation-quotationContents-constraint-rule-35">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-quotation-quotationContents-constraint-rule-36">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:quotation">
           <sch:report test="not( @marks )  and  not( tei:p )">
           On <sch:name/>, either the @marks attribute should be used, or a paragraph of description provided
@@ -6661,7 +6709,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="hyphenation">
     <element name="hyphenation">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6687,7 +6735,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="segmentation">
     <element name="segmentation">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6698,7 +6746,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
   </define>
   <define name="stdVals">
     <element name="stdVals">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
       <oneOrMore>
         <ref name="model.pLike"/>
       </oneOrMore>
@@ -6877,7 +6925,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
   </define>
   <define name="citeStructure">
     <element name="citeStructure">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="citeData"/>
@@ -6903,12 +6951,12 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(match) supplies an XPath selection pattern using the syntax defined in  which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> on a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> without a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code> parent must be an absolute XPath. If it is relative, its context is set by the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@match</code> of the parent <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;citeStructure&gt;</code>.</a:documentation>
         <text/>
       </attribute>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-outer-match-constraint-rule-36">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-outer-match-constraint-rule-37">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[not(parent::tei:citeStructure)]">
           <sch:assert test="starts-with(@match,'/')">An XPath in @match on the outer <sch:name/> must start with '/'.</sch:assert>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-inner-match-constraint-rule-37">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-citeStructure-match-citestructure-inner-match-constraint-rule-38">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:citeStructure[parent::tei:citeStructure]">
           <sch:assert test="not(starts-with(@match,'/'))">An XPath in @match must not start with '/' except on the outer <sch:name/>.</sch:assert>
         </sch:rule>
@@ -6927,7 +6975,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
   </define>
   <define name="citeData">
     <element name="citeData">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <ref name="att.citeStructurePart.attributes"/>
@@ -6953,7 +7001,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
   </define>
   <define name="prefixDef">
     <element name="prefixDef">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]</a:documentation>
       <zeroOrMore>
         <ref name="model.pLike"/>
       </zeroOrMore>
@@ -6970,7 +7018,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
   </define>
   <define name="listPrefixDef">
     <element name="listPrefixDef">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="desc"/>
@@ -7147,7 +7195,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7190,7 +7238,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDef-calendar-calendar-check-unitDef-constraint-rule-39">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-unitDef-calendar-calendar-check-unitDef-constraint-rule-40">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7220,7 +7268,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-conversion-calendar-calendar-check-conversion-constraint-rule-40">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-conversion-calendar-calendar-check-conversion-constraint-rule-41">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7283,7 +7331,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-application-calendar-calendar-check-application-constraint-rule-41">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-application-calendar-calendar-check-application-constraint-rule-42">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7315,7 +7363,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
   </define>
   <define name="handNote">
     <element name="handNote">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing, Decoration, and Other Notations]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing, Decoration, and Other Notations]</a:documentation>
       <ref name="macro.specialPara"/>
       <ref name="att.global.attributes"/>
       <ref name="att.handFeatures.attributes"/>
@@ -7360,7 +7408,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-creation-calendar-calendar-check-creation-constraint-rule-42">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-creation-calendar-calendar-check-creation-constraint-rule-43">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7372,7 +7420,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
   </define>
   <define name="langUsage">
     <element name="langUsage">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]</a:documentation>
       <choice>
         <oneOrMore>
           <ref name="model.pLike"/>
@@ -7533,23 +7581,10 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
       <ref name="att.sortable.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
-Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded</a:documentation>
-          <choice>
-            <value>sent</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
-            <value>received</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
-            <value>transmitted</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
-            <value>redirected</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
-            <value>forwarded</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <empty/>
@@ -7599,7 +7634,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   </define>
   <define name="change">
     <element name="change">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]</a:documentation>
       <ref name="macro.specialPara"/>
       <ref name="att.ascribed.attributes"/>
       <ref name="att.datable.attributes"/>
@@ -7618,7 +7653,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
           </list>
         </attribute>
       </optional>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-change-calendar-calendar-check-change-constraint-rule-43">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-change-calendar-calendar-check-change-constraint-rule-44">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*[@calendar]">
           <sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
                         systems or calendars to which the date represented by the content of this element belongs,
@@ -7642,7 +7677,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   </define>
   <define name="listChange">
     <element name="listChange">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="desc"/>
@@ -7799,7 +7834,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   </define>
   <define name="facsimile">
     <element name="facsimile">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text. [11.1. Digital Facsimiles]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text. [12.1. Digital Facsimiles]</a:documentation>
       <group>
         <optional>
           <ref name="front"/>
@@ -7815,7 +7850,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
           <ref name="back"/>
         </optional>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-facsimile-no_facsimile_text_nodes-constraint-rule-44">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-facsimile-no_facsimile_text_nodes-constraint-rule-45">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:facsimile//tei:line | tei:facsimile//tei:zone">
           <sch:report test="child::text()[ normalize-space(.) ne '']">
           A facsimile element represents a text with images, thus
@@ -7830,7 +7865,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   </define>
   <define name="sourceDoc">
     <element name="sourceDoc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="model.global"/>
@@ -7846,7 +7881,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
   </define>
   <define name="surface">
     <element name="surface">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>
@@ -7892,7 +7927,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="surfaceGrp">
     <element name="surfaceGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [11.1. Digital Facsimiles]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [12.1. Digital Facsimiles]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="model.global"/>
@@ -7908,7 +7943,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="zone">
     <element name="zone">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines any two-dimensional area within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">defines any two-dimensional area within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -7934,9 +7969,9 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="path">
     <element name="path">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path) defines any line passing through two or more points within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(path) defines any line passing through two or more points within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;surface&gt;</code> element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-path-pathmustnotbeclosed-constraint-rule-45">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-path-pathmustnotbeclosed-constraint-rule-46">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:path[@points]">
           <sch:let name="firstPair" value="tokenize( normalize-space( @points ), ' ')[1]"/>
           <sch:let name="lastPair" value="tokenize( normalize-space( @points ), ' ')[last()]"/>
@@ -7980,14 +8015,14 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="addSpan">
     <element name="addSpan">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;add&gt;</code>). [11.3.1.4. Additions and Deletions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;add&gt;</code>). [12.3.1.4. Additions and Deletions]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-constraint-rule-46">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-constraint-rule-47">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:addSpan">
           <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-fr-constraint-rule-47">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-addSpan-addSpan-requires-spanTo-fr-constraint-rule-48">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:addSpan">
           <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
         </sch:rule>
@@ -8003,7 +8038,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="damage">
     <element name="damage">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(damage) contains an area of damage to the text witness. [11.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(damage) contains an area of damage to the text witness. [12.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
@@ -8013,14 +8048,14 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="damageSpan">
     <element name="damageSpan">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [12.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-constraint-rule-48">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-constraint-rule-49">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:damageSpan">
           <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-49">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-50">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:damageSpan">
           <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
         </sch:rule>
@@ -8034,14 +8069,14 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="delSpan">
     <element name="delSpan">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [11.3.1.4. Additions and Deletions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [12.3.1.4. Additions and Deletions]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-constraint-rule-50">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-constraint-rule-51">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:delSpan">
           <sch:assert test="@spanTo">The @spanTo attribute of <sch:name/> is required.</sch:assert>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-fr-constraint-rule-51">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-delSpan-delSpan-requires-spanTo-fr-constraint-rule-52">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:delSpan">
           <sch:assert test="@spanTo">L'attribut spanTo est requis.</sch:assert>
         </sch:rule>
@@ -8056,7 +8091,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="ex">
     <element name="ex">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial expansion) contains a sequence of letters added by an editor or transcriber when expanding an abbreviation. [11.3.1.2. Abbreviation and Expansion]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial expansion) contains a sequence of letters added by an editor or transcriber when expanding an abbreviation. [12.3.1.2. Abbreviation and Expansion]</a:documentation>
       <ref name="macro.xtext"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
@@ -8066,7 +8101,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
   </define>
   <define name="fw">
     <element name="fw">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(forme work) contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page. [11.6. Headers, Footers, and Similar Matter]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(forme work) contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page. [12.6. Headers, Footers, and Similar Matter]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
@@ -8074,8 +8109,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
       <ref name="att.written.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the material encoded according to some useful typology.
-Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNum (line number); 5] sig (signature); 6] catch (catchword)</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the material encoded according to some useful typology.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -8086,7 +8120,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="handNotes">
     <element name="handNotes">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains one or more <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;handNote&gt;</code> elements documenting the different hands identified within the source texts. [12.3.2.1. Document Hands]</a:documentation>
       <oneOrMore>
         <ref name="handNote"/>
       </oneOrMore>
@@ -8096,7 +8130,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="handShift">
     <element name="handShift">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(handwriting shift) marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint. [11.3.2.1. Document Hands]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(handwriting shift) marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint. [12.3.2.1. Document Hands]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <ref name="att.handFeatures.attributes"/>
@@ -8113,7 +8147,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="am">
     <element name="am">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(abbreviation marker) contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation. [11.3.1.2. Abbreviation and Expansion]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(abbreviation marker) contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation. [12.3.1.2. Abbreviation and Expansion]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -8129,7 +8163,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="restore">
     <element name="restore">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(restore) indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction. [11.3.1.6. Cancellation of Deletions and Other Markings]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(restore) indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction. [12.3.1.6. Cancellation of Deletions and Other Markings]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.transcriptional.attributes"/>
@@ -8140,7 +8174,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="space">
     <element name="space">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(space) indicates the location of a significant space in the text. [11.4.1. Space]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(space) indicates the location of a significant space in the text. [12.4.1. Space]</a:documentation>
       <zeroOrMore>
         <choice>
           <ref name="model.descLike"/>
@@ -8197,7 +8231,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="subst">
     <element name="subst">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(substitution) groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text. [11.3.1.5. Substitutions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(substitution) groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text. [12.3.1.5. Substitutions]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="add"/>
@@ -8206,7 +8240,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
           <ref name="model.milestoneLike"/>
         </choice>
       </oneOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-subst-substContents1-constraint-rule-52">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-subst-substContents1-constraint-rule-53">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:subst">
           <sch:assert test="child::tei:add and (child::tei:del or child::tei:surplus)"><sch:name/> must have at least one child add and at least one child del or surplus</sch:assert>
         </sch:rule>
@@ -8219,7 +8253,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="substJoin">
     <element name="substJoin">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [12.3.1.5. Substitutions]</a:documentation>
       <zeroOrMore>
         <choice>
           <ref name="model.descLike"/>
@@ -8235,7 +8269,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="supplied">
     <element name="supplied">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(supplied) signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe. [11.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(supplied) signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe. [12.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
@@ -8257,7 +8291,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="surplus">
     <element name="surplus">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(surplus) marks text present in the source which the editor believes to be superfluous or redundant. [11.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(surplus) marks text present in the source which the editor believes to be superfluous or redundant. [12.3.3.1. Damage, Illegibility, and Supplied Text]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
@@ -8279,7 +8313,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="secl">
     <element name="secl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [11.3.1.7. Text Omitted from or Supplied in the Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [12.3.1.7. Text Omitted from or Supplied in the Transcription]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.editLike.attributes"/>
@@ -8301,7 +8335,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="line">
     <element name="line">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains the transcription of a topographic line in the source document [11.2.2. Embedded Transcription]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains the transcription of a topographic line in the source document [12.2.2. Embedded Transcription]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -8319,7 +8353,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="listTranspose">
     <element name="listTranspose">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [11.3.4.5. Transpositions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [12.3.4.5. Transpositions]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="desc"/>
@@ -8334,7 +8368,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="metamark">
     <element name="metamark">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [11.3.4.2. Metamarks]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [12.3.4.2. Metamarks]</a:documentation>
       <ref name="macro.specialPara"/>
       <ref name="att.spanning.attributes"/>
       <ref name="att.placement.attributes"/>
@@ -8364,7 +8398,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="mod">
     <element name="mod">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents any kind of modification identified within a single document. [11.3.4.1. Generic Modification]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents any kind of modification identified within a single document. [12.3.4.1. Generic Modification]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.transcriptional.attributes"/>
@@ -8376,7 +8410,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="redo">
     <element name="redo">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <ref name="att.spanning.attributes"/>
@@ -8399,7 +8433,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="retrace">
     <element name="retrace">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [11.3.4.3. Fixation and Clarification]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [12.3.4.3. Fixation and Clarification]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.spanning.attributes"/>
@@ -8410,7 +8444,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="transpose">
     <element name="transpose">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes a single textual transposition as an ordered list of at least two pointers specifying the order in which the elements indicated should be re-combined. [11.3.4.5. Transpositions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes a single textual transposition as an ordered list of at least two pointers specifying the order in which the elements indicated should be re-combined. [12.3.4.5. Transpositions]</a:documentation>
       <group>
         <ref name="ptr"/>
         <ref name="ptr"/>
@@ -8424,7 +8458,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="undo">
     <element name="undo">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <ref name="att.spanning.attributes"/>
@@ -8447,7 +8481,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
   </define>
   <define name="graph">
     <element name="graph">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graph) encodes a graph, which is a collection of nodes, and arcs which connect the nodes. [19.1. Graphs and Digraphs]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graph) encodes a graph, which is a collection of nodes, and arcs which connect the nodes. [20.1. Graphs and Digraphs]</a:documentation>
       <group>
         <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
           <rng:group>
@@ -8492,21 +8526,10 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu
       <ref name="att.typed.attribute.subtype"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the type of graph.
-Suggested values include: 1] undirected; 2] directed; 3] transitionNetwork; 4] transducer</a:documentation>
-          <choice>
-            <value>undirected</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">undirected graph</a:documentation>
-            <value>directed</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">directed graph</a:documentation>
-            <value>transitionNetwork</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a directed graph with distinguished initial and final nodes</a:documentation>
-            <value>transducer</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a transition network with up to two labels on each arc</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the type of graph.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <optional>
@@ -8526,7 +8549,7 @@ Suggested values include: 1] undirected; 2] directed; 3] transitionNetwork; 4] t
   </define>
   <define name="node">
     <element name="node">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(node) encodes a node, a possibly labeled point in a graph. [19.1. Graphs and Digraphs]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(node) encodes a node, a possibly labeled point in a graph. [20.1. Graphs and Digraphs]</a:documentation>
       <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
         <rng:group>
           <rng:ref name="label"/>
@@ -8539,17 +8562,10 @@ Suggested values include: 1] undirected; 2] directed; 3] transitionNetwork; 4] t
       <ref name="att.typed.attribute.subtype"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a type for a node.
-Suggested values include: 1] initial; 2] final</a:documentation>
-          <choice>
-            <value>initial</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">initial node in a transition network</a:documentation>
-            <value>final</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">final node in a transition network</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a type for a node.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <optional>
@@ -8619,7 +8635,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="arc">
     <element name="arc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arc) encodes an arc, the connection from one node to another in a graph. [19.1. Graphs and Digraphs]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arc) encodes an arc, the connection from one node to another in a graph. [20.1. Graphs and Digraphs]</a:documentation>
       <rng:optional xmlns:rng="http://relaxng.org/ns/structure/1.0">
         <rng:group>
           <rng:ref name="label"/>
@@ -8646,7 +8662,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="tree">
     <element name="tree">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(tree) encodes a tree, which is made up of a root, internal nodes, leaves, and arcs from root to leaves. [19.2. Trees]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(tree) encodes a tree, which is made up of a root, internal nodes, leaves, and arcs from root to leaves. [20.2. Trees]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8696,7 +8712,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="root">
     <element name="root">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(root node) represents the root node of a tree. [19.2. Trees]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(root node) represents the root node of a tree. [20.2. Trees]</a:documentation>
       <optional>
         <ref name="label"/>
       </optional>
@@ -8744,7 +8760,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="iNode">
     <element name="iNode">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(intermediate (or internal) node) represents an intermediate (or internal) node of a tree. [19.2. Trees]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(intermediate (or internal) node) represents an intermediate (or internal) node of a tree. [20.2. Trees]</a:documentation>
       <optional>
         <ref name="label"/>
       </optional>
@@ -8808,7 +8824,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="leaf">
     <element name="leaf">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(leaf) encodes the leaves (terminal nodes) of a tree. [19.2. Trees]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(leaf) encodes the leaves (terminal nodes) of a tree. [20.2. Trees]</a:documentation>
       <optional>
         <ref name="label"/>
       </optional>
@@ -8842,7 +8858,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="eTree">
     <element name="eTree">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(embedding tree) provides an alternative to the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;tree&gt;</code> element for representing ordered rooted tree structures. [19.3. Another Tree Notation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(embedding tree) provides an alternative to the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;tree&gt;</code> element for representing ordered rooted tree structures. [20.3. Another Tree Notation]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8872,7 +8888,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   <define name="triangle">
     <element name="triangle">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(underspecified embedding tree, so called because of its
-  characteristic shape when drawn) provides for an underspecified <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code>, that is, an <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> with information left out. [19.3. Another Tree Notation]</a:documentation>
+  characteristic shape when drawn) provides for an underspecified <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code>, that is, an <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> with information left out. [20.3. Another Tree Notation]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8899,7 +8915,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="eLeaf">
     <element name="eLeaf">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(leaf or terminal node of an embedding tree) provides explicitly for a leaf of an embedding tree, which may also be encoded with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> element. [19.3. Another Tree Notation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(leaf or terminal node of an embedding tree) provides explicitly for a leaf of an embedding tree, which may also be encoded with the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;eTree&gt;</code> element. [20.3. Another Tree Notation]</a:documentation>
       <group>
         <optional>
           <ref name="label"/>
@@ -8923,7 +8939,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="forest">
     <element name="forest">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(forest) provides for groups of rooted trees. [19.3. Another Tree Notation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(forest) provides for groups of rooted trees. [20.3. Another Tree Notation]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="tree"/>
@@ -8938,7 +8954,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="listForest">
     <element name="listForest">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides for lists of forests. [19.3. Another Tree Notation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides for lists of forests. [20.3. Another Tree Notation]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="desc"/>
@@ -8962,7 +8978,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="TEI">
     <element name="TEI">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
       <group>
         <ref name="teiHeader"/>
         <choice>
@@ -9000,7 +9016,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="text">
     <element name="text">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.global"/>
@@ -9131,7 +9147,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
   </define>
   <define name="group">
     <element name="group">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>
@@ -9196,6 +9212,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       <ref name="att.global.attributes"/>
       <ref name="att.declaring.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9248,14 +9265,14 @@ Suggested values include: 1] initial; 2] final</a:documentation>
           </rng:group>
         </rng:optional>
       </group>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-53">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-54">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:div">
           <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)">
           Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
         </sch:report>
         </sch:rule>
       </pattern>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-54">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-55">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" context="tei:div">
           <sch:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)">
           Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.
@@ -9658,6 +9675,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       <ref name="att.typed.attributes"/>
       <ref name="att.placement.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9674,6 +9692,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         </choice>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9690,6 +9709,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         </choice>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9711,6 +9731,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         </oneOrMore>
       </group>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9724,6 +9745,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
         </choice>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9746,6 +9768,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9765,6 +9788,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9774,6 +9798,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9783,6 +9808,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9812,6 +9838,7 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9870,23 +9897,10 @@ Suggested values include: 1] initial; 2] final</a:documentation>
       <ref name="att.typed.attribute.subtype"/>
       <optional>
         <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" name="type" a:defaultValue="main">
-          <a:documentation>(type) specifies the role of this subdivision of the title.
-Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)</a:documentation>
-          <choice>
-            <value>main</value>
-            <a:documentation>(main) main title of the work</a:documentation>
-            <value>sub</value>
-            <a:documentation>(subordinate) subtitle of the work</a:documentation>
-            <value>alt</value>
-            <a:documentation>(alternate) alternative title of the work</a:documentation>
-            <value>short</value>
-            <a:documentation>(short) abbreviated form of title</a:documentation>
-            <value>desc</value>
-            <a:documentation>(descriptive) descriptive paraphrase of the work</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation>(type) specifies the role of this subdivision of the title.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <empty/>
@@ -9898,6 +9912,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
       <ref name="att.canonical.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
@@ -9940,6 +9955,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(document date) contains the date of a document, as given on a title page or in a dateline. [4.6. Title Pages]</a:documentation>
       <ref name="macro.phraseSeq"/>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <ref name="att.datable.attributes"/>
       <ref name="att.calendarSystem.attributes"/>
       <empty/>
@@ -10160,9 +10176,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
   </define>
   <define name="link">
     <element name="link">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]</a:documentation>
       <empty/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-link-linkTargets3-constraint-rule-55">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-link-linkTargets3-constraint-rule-56">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:link">
           <sch:assert test="contains(normalize-space(@target),' ')">You must supply at least two values for @target or  on <sch:name/>
                </sch:assert>
@@ -10171,12 +10187,13 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="linkGrp">
     <element name="linkGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link group) defines a collection of associations or hypertextual links. [16.1. Links]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link group) defines a collection of associations or hypertextual links. [17.1. Links]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.descLike"/>
@@ -10190,14 +10207,15 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.group.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="ab">
     <element name="ab">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]</a:documentation>
       <ref name="macro.abContent"/>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-56">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-57">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:ab">
           <sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
           Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
@@ -10209,33 +10227,36 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       <ref name="att.declaring.attributes"/>
       <ref name="att.fragmentable.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="anchor">
     <element name="anchor">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="seg">
     <element name="seg">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.segLike.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.written.attributes"/>
       <ref name="att.notated.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="when">
     <element name="when">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <optional>
@@ -10303,11 +10324,12 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="timeline">
     <element name="timeline">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]</a:documentation>
       <oneOrMore>
         <ref name="when"/>
       </oneOrMore>
       <ref name="att.global.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="origin">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">designates the origin of the timeline, i.e. the time at which it begins.</a:documentation>
@@ -10358,14 +10380,14 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="join">
     <element name="join">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation]</a:documentation>
       <zeroOrMore>
         <choice>
           <ref name="model.descLike"/>
           <ref name="model.certLike"/>
         </choice>
       </zeroOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-join-joinTargets3-constraint-rule-57">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-join-joinTargets3-constraint-rule-58">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:join">
           <sch:assert test="contains( normalize-space( @target ),' ')">
           You must supply at least two values for @target on <sch:name/>
@@ -10375,6 +10397,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="result">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the name of an element which this aggregation may be understood to represent.</a:documentation>
@@ -10397,7 +10420,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="joinGrp">
     <element name="joinGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(join group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code> elements and possibly pointers. [16.7. Aggregation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(join group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code> elements and possibly pointers. [17.7. Aggregation]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>
@@ -10414,6 +10437,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.group.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="result">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies the default value for the <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">@result</code> on each <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;join&gt;</code> included within the group.</a:documentation>
@@ -10425,12 +10449,13 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="alt">
     <element name="alt">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]</a:documentation>
       <empty/>
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.attribute.targetLang"/>
       <ref name="att.pointing.attribute.evaluate"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="target">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the destination of the reference by supplying one or more URI References</a:documentation>
@@ -10486,7 +10511,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="altGrp">
     <element name="altGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> elements and possibly pointers. [16.8. Alternation]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group) groups a collection of <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;alt&gt;</code> elements and possibly pointers. [17.8. Alternation]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.descLike"/>
@@ -10500,6 +10525,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.pointing.group.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" name="mode" a:defaultValue="excl">
           <a:documentation>states whether the alternations gathered in this collection are exclusive or inclusive.</a:documentation>
@@ -10516,11 +10542,11 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="standOff">
     <element name="standOff">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]</a:documentation>
       <oneOrMore>
         <ref name="model.standOffPart"/>
       </oneOrMore>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-standOff-nested_standOff_should_be_typed-constraint-rule-58">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" id="test-standOff-nested_standOff_should_be_typed-constraint-rule-59">
         <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:standOff">
           <sch:assert test="@type or not(ancestor::tei:standOff)">This
         <sch:name/> element must have a @type attribute, since it is
@@ -10536,7 +10562,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   </define>
   <define name="listAnnotation">
     <element name="listAnnotation">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a list of annotations, typically encoded as <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;listAnnotation&gt;</code> elements. [16.10. The standOff Container]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a list of annotations, typically encoded as <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;listAnnotation&gt;</code> elements. [17.10. The standOff Container]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="model.headLike"/>
@@ -10561,7 +10587,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
   <define name="annotation">
     <element name="annotation">
       <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents an annotation following the <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="#WADM">Web
-      Annotation Data Model</a>. [16.10. The standOff Container]</a:documentation>
+      Annotation Data Model</a>. [17.10. The standOff Container]</a:documentation>
       <group>
         <zeroOrMore>
           <ref name="respStmt"/>
@@ -11010,7 +11036,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="superEntry">
     <element name="superEntry">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(super entry) groups a sequence of entries within any kind of lexical resource, such as a dictionary or lexicon which function as a single unit, for example a set of homographs. [9.1. Dictionary Body and Overall Structure]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(super entry) groups a sequence of entries within any kind of lexical resource, such as a dictionary or lexicon which function as a single unit, for example a set of homographs. [10.1. Dictionary Body and Overall Structure]</a:documentation>
       <choice>
         <group>
           <optional>
@@ -11030,7 +11056,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="entry">
     <element name="entry">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(entry) contains a single structured entry in any kind of lexical resource, such as a dictionary or lexicon. [9.1. Dictionary Body and Overall Structure 9.2. The Structure of Dictionary Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(entry) contains a single structured entry in any kind of lexical resource, such as a dictionary or lexicon. [10.1. Dictionary Body and Overall Structure 10.2. The Structure of Dictionary Entries]</a:documentation>
       <oneOrMore>
         <choice>
           <ref name="hom"/>
@@ -11048,7 +11074,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="entryFree">
     <element name="entryFree">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unstructured entry) contains a single unstructured entry in any kind of lexical resource, such as a dictionary or lexicon. [9.1. Dictionary Body and Overall Structure 9.2. The Structure of Dictionary Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unstructured entry) contains a single unstructured entry in any kind of lexical resource, such as a dictionary or lexicon. [10.1. Dictionary Body and Overall Structure 10.2. The Structure of Dictionary Entries]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11069,7 +11095,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="hom">
     <element name="hom">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(homograph) groups information relating to one homograph within an entry. [9.2. The Structure of Dictionary Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(homograph) groups information relating to one homograph within an entry. [10.2. The Structure of Dictionary Entries]</a:documentation>
       <zeroOrMore>
         <choice>
           <ref name="sense"/>
@@ -11084,7 +11110,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="sense">
     <element name="sense">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups together all information relating to one word sense in a dictionary entry, for example definitions, examples, and translation equivalents. [9.2. The Structure of Dictionary Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups together all information relating to one word sense in a dictionary entry, for example definitions, examples, and translation equivalents. [10.2. The Structure of Dictionary Entries]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11108,7 +11134,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="dictScrap">
     <element name="dictScrap">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(dictionary scrap) encloses a part of a dictionary entry in which other phrase-level dictionary elements are freely combined. [9.1. Dictionary Body and Overall Structure 9.2. The Structure of Dictionary Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(dictionary scrap) encloses a part of a dictionary entry in which other phrase-level dictionary elements are freely combined. [10.1. Dictionary Body and Overall Structure 10.2. The Structure of Dictionary Entries]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11126,7 +11152,7 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
   </define>
   <define name="form">
     <element name="form">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(form information group) groups all the information on the written and spoken forms of one headword. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(form information group) groups all the information on the written and spoken forms of one headword. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11142,27 +11168,10 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference)
       <ref name="att.lexicographic.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies form as simple, compound, etc.
-Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] derivative; 6] inflected; 7] phrase</a:documentation>
-          <choice>
-            <value>simple</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">single free lexical item</a:documentation>
-            <value>lemma</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the headword itself</a:documentation>
-            <value>variant</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a variant form</a:documentation>
-            <value>compound</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">word formed from simple lexical items</a:documentation>
-            <value>derivative</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">word derived from headword</a:documentation>
-            <value>inflected</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">word in other than usual dictionary form</a:documentation>
-            <value>phrase</value>
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">multiple-word lexical item</a:documentation>
-            <data type="token">
-              <param name="pattern">[^\p{C}\p{Z}]+</param>
-            </data>
-          </choice>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies form as simple, compound, etc.</a:documentation>
+          <data type="token">
+            <param name="pattern">[^\p{C}\p{Z}]+</param>
+          </data>
         </attribute>
       </optional>
       <empty/>
@@ -11170,7 +11179,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
   </define>
   <define name="orth">
     <element name="orth">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(orthographic form) gives the orthographic form of a dictionary headword. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(orthographic form) gives the orthographic form of a dictionary headword. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
@@ -11190,7 +11199,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
   </define>
   <define name="pron">
     <element name="pron">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pronunciation) contains the pronunciation(s) of the word. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pronunciation) contains the pronunciation(s) of the word. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11202,7 +11211,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
   </define>
   <define name="hyph">
     <element name="hyph">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) contains a hyphenated form of a dictionary headword, or hyphenation information in some other form. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) contains a hyphenated form of a dictionary headword, or hyphenation information in some other form. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11212,7 +11221,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
   </define>
   <define name="syll">
     <element name="syll">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(syllabification) contains the syllabification of the headword. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(syllabification) contains the syllabification of the headword. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11222,7 +11231,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
   </define>
   <define name="stress">
     <element name="stress">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(stress) contains the stress pattern for a dictionary headword, if given separately. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(stress) contains the stress pattern for a dictionary headword, if given separately. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.notated.attributes"/>
@@ -11231,7 +11240,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
   </define>
   <define name="gram">
     <element name="gram">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information) within an entry in a dictionary or a terminological data file, contains grammatical information relating to a term, word, or form. [9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information) within an entry in a dictionary or a terminological data file, contains grammatical information relating to a term, word, or form. [10.3.2. Grammatical Information]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
@@ -11239,8 +11248,7 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
       <optional>
         <attribute name="type">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies grammatical information provided by <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;gram&gt;</code> according to some convenient and shared typology, ideally one defined in an external reference taxonomy, such as the <a xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" href="https://www.clarin.eu/content/clarin-concept-registry">CLARIN Concept
-          Registry</a>.
-Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number); 4] animate; 5] proper</a:documentation>
+          Registry</a>.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -11251,7 +11259,7 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="gen">
     <element name="gen">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gender) identifies the morphological gender of a lexical item, as given in the dictionary. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gender) identifies the morphological gender of a lexical item, as given in the dictionary. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11260,7 +11268,7 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="number">
     <element name="number">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(number) indicates grammatical number associated with a form, as given in a dictionary. [9.3.1. Information on Written and Spoken Forms 9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(number) indicates grammatical number associated with a form, as given in a dictionary. [10.3.1. Information on Written and Spoken Forms 10.3.2. Grammatical Information]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11269,7 +11277,7 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="case">
     <element name="case">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(case) contains grammatical case information given by a dictionary for a given form. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(case) contains grammatical case information given by a dictionary for a given form. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11278,7 +11286,7 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="per">
     <element name="per">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(person) contains an indication of the grammatical person (1st, 2nd, 3rd, etc.) associated with a given inflected form in a dictionary. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(person) contains an indication of the grammatical person (1st, 2nd, 3rd, etc.) associated with a given inflected form in a dictionary. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11287,7 +11295,7 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="tns">
     <element name="tns">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(tense) indicates the grammatical tense associated with a given inflected form in a dictionary. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(tense) indicates the grammatical tense associated with a given inflected form in a dictionary. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11296,7 +11304,7 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="mood">
     <element name="mood">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(mood) contains information about the grammatical mood of verbs (e.g. indicative, subjunctive, imperative). [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(mood) contains information about the grammatical mood of verbs (e.g. indicative, subjunctive, imperative). [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11305,15 +11313,14 @@ Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number)
   </define>
   <define name="iType">
     <element name="iType">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(inflectional class) indicates the inflectional class associated with a lexical item. [9.3.1. Information on Written and Spoken Forms]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(inflectional class) indicates the inflectional class associated with a lexical item. [10.3.1. Information on Written and Spoken Forms]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
       <ref name="att.lexicographic.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of indicator used to specify the inflection class, when it is necessary to distinguish between the usual abbreviated indications (e.g. inv) and other kinds of indicators, such as special codes referring to conjugation patterns, etc.
-Sample values include: 1] abbrev; 2] verbTable</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of indicator used to specify the inflection class, when it is necessary to distinguish between the usual abbreviated indications (e.g. inv) and other kinds of indicators, such as special codes referring to conjugation patterns, etc.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -11324,7 +11331,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="gramGrp">
     <element name="gramGrp">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information group) groups morpho-syntactic information about a lexical item, e.g. <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;pos&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;gen&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;number&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;case&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;iType&gt;</code> (inflectional class). [9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(grammatical information group) groups morpho-syntactic information about a lexical item, e.g. <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;pos&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;gen&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;number&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;case&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;iType&gt;</code> (inflectional class). [10.3.2. Grammatical Information]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11343,7 +11350,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="pos">
     <element name="pos">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(part of speech) indicates the part of speech assigned to a dictionary headword such as noun, verb, or adjective. [9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(part of speech) indicates the part of speech assigned to a dictionary headword such as noun, verb, or adjective. [10.3.2. Grammatical Information]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11352,7 +11359,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="subc">
     <element name="subc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(subcategorization) contains subcategorization information (transitive/intransitive, countable/non-countable, etc.) [9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(subcategorization) contains subcategorization information (transitive/intransitive, countable/non-countable, etc.) [10.3.2. Grammatical Information]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11361,7 +11368,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="colloc">
     <element name="colloc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(collocate) contains any sequence of words that co-occur with the headword with significant frequency. [9.3.2. Grammatical Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(collocate) contains any sequence of words that co-occur with the headword with significant frequency. [10.3.2. Grammatical Information]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11371,7 +11378,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="def">
     <element name="def">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(definition) contains definition text in a dictionary entry. [9.3.3.1. Definitions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(definition) contains definition text in a dictionary entry. [10.3.3.1. Definitions]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11380,7 +11387,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="etym">
     <element name="etym">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(etymology) encloses the etymological information in a dictionary entry. [9.3.4. Etymological Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(etymology) encloses the etymological information in a dictionary entry. [10.3.4. Etymological Information]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11404,7 +11411,7 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="lang">
     <element name="lang">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language name) contains the name of a language mentioned in etymological or other linguistic discussion. [9.3.4. Etymological Information]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language name) contains the name of a language mentioned in etymological or other linguistic discussion. [10.3.4. Etymological Information]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.lexicographic.attributes"/>
@@ -11413,15 +11420,14 @@ Sample values include: 1] abbrev; 2] verbTable</a:documentation>
   </define>
   <define name="usg">
     <element name="usg">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(usage) contains usage information in a dictionary entry. [9.3.5.2. Usage Information and Other Labels]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(usage) contains usage information in a dictionary entry. [10.3.5.2. Usage Information and Other Labels]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
       <ref name="att.lexicographic.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the usage information using any convenient typology.
-Sample values include: 1] geo (geographic); 2] time; 3] dom (domain); 4] register (register); 5] style; 6] plev (preference level); 7] lang (language); 8] gram (grammatical); 9] syn (synonym); 10] hyper (hypernym); 11] colloc (collocation); 12] comp (complement); 13] obj (object); 14] subj (subject); 15] verb; 16] hint</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the usage information using any convenient typology.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -11432,7 +11438,7 @@ Sample values include: 1] geo (geographic); 2] time; 3] dom (domain); 4] registe
   </define>
   <define name="lbl">
     <element name="lbl">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(label) contains a label for a form, example, translation, or other piece of information, e.g. abbreviation for, contraction of, literally, approximately, synonyms:, etc. [9.3.1. Information on Written and Spoken Forms 9.3.3.2. Translation Equivalents 9.3.5.3. Cross-References to Other Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(label) contains a label for a form, example, translation, or other piece of information, e.g. abbreviation for, contraction of, literally, approximately, synonyms:, etc. [10.3.1. Information on Written and Spoken Forms 10.3.3.2. Translation Equivalents 10.3.5.3. Cross-References to Other Entries]</a:documentation>
       <ref name="macro.paraContent"/>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attribute.subtype"/>
@@ -11450,7 +11456,7 @@ Sample values include: 1] geo (geographic); 2] time; 3] dom (domain); 4] registe
   </define>
   <define name="xr">
     <element name="xr">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cross-reference phrase) contains a phrase, sentence, or icon referring the reader to some other location in this or another text. [9.3.5.3. Cross-References to Other Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cross-reference phrase) contains a phrase, sentence, or icon referring the reader to some other location in this or another text. [10.3.5.3. Cross-References to Other Entries]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11467,8 +11473,7 @@ Sample values include: 1] geo (geographic); 2] time; 3] dom (domain); 4] registe
       <ref name="att.lexicographic.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of cross reference, using any convenient typology.
-Sample values include: 1] syn (synonym); 2] etym (etymological); 3] cf (compare or consult); 4] illus (illustration)</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of cross reference, using any convenient typology.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -11479,7 +11484,7 @@ Sample values include: 1] syn (synonym); 2] etym (etymological); 3] cf (compare
   </define>
   <define name="re">
     <element name="re">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(related entry) contains a dictionary entry for a lexical item related to the headword, such as a compound phrase or derived form, embedded inside a larger entry. [9.3.6. Related Entries]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(related entry) contains a dictionary entry for a lexical item related to the headword, such as a compound phrase or derived form, embedded inside a larger entry. [10.3.6. Related Entries]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11498,7 +11503,7 @@ Sample values include: 1] syn (synonym); 2] etym (etymological); 3] cf (compare
   </define>
   <define name="oRef">
     <element name="oRef">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(orthographic-form reference) in a dictionary example, indicates a reference to the orthographic form(s) of the headword. [9.4. Headword and Pronunciation References]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(orthographic-form reference) in a dictionary example, indicates a reference to the orthographic form(s) of the headword. [10.4. Headword and Pronunciation References]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11513,8 +11518,7 @@ Sample values include: 1] syn (synonym); 2] etym (etymological); 3] cf (compare
       <ref name="att.notated.attributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the kind of typographic modification made to the headword in the reference.
-Sample values include: 1] cap (capital); 2] noHyph (no hyphen)</a:documentation>
+          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the kind of typographic modification made to the headword in the reference.</a:documentation>
           <data type="token">
             <param name="pattern">[^\p{C}\p{Z}]+</param>
           </data>
@@ -11525,7 +11529,7 @@ Sample values include: 1] cap (capital); 2] noHyph (no hyphen)</a:documentation>
   </define>
   <define name="pRef">
     <element name="pRef">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pronunciation reference) in a dictionary example, indicates a reference to the pronunciation(s) of the headword. [9.4. Headword and Pronunciation References]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pronunciation reference) in a dictionary example, indicates a reference to the pronunciation(s) of the headword. [10.4. Headword and Pronunciation References]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11580,7 +11584,7 @@ Suggested values include: 1] label; 2] data</a:documentation>
   </define>
   <define name="table">
     <element name="table">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(table) contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(table) contains text displayed in tabular form, in rows and columns. [15.1.1. TEI Tables]</a:documentation>
       <group>
         <zeroOrMore>
           <choice>
@@ -11611,6 +11615,7 @@ Suggested values include: 1] label; 2] data</a:documentation>
       </group>
       <ref name="att.global.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <optional>
         <attribute name="rows">
           <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(rows) indicates the number of rows in the table.</a:documentation>
@@ -11628,7 +11633,7 @@ Suggested values include: 1] label; 2] data</a:documentation>
   </define>
   <define name="row">
     <element name="row">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(row) contains one row of a table. [14.1.1. TEI Tables]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(row) contains one row of a table. [15.1.1. TEI Tables]</a:documentation>
       <oneOrMore>
         <ref name="cell"/>
       </oneOrMore>
@@ -11639,7 +11644,7 @@ Suggested values include: 1] label; 2] data</a:documentation>
   </define>
   <define name="cell">
     <element name="cell">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cell) contains one cell of a table. [14.1.1. TEI Tables]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cell) contains one cell of a table. [15.1.1. TEI Tables]</a:documentation>
       <ref name="macro.specialPara"/>
       <ref name="att.global.attributes"/>
       <ref name="att.tableDecoration.attributes"/>
@@ -11648,7 +11653,7 @@ Suggested values include: 1] label; 2] data</a:documentation>
   </define>
   <define name="formula">
     <element name="formula">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(formula) contains a mathematical or other formula. [14.2. Formulæ and Mathematical Expressions]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(formula) contains a mathematical or other formula. [15.2. Formulæ and Mathematical Expressions]</a:documentation>
       <zeroOrMore>
         <choice>
           <text/>
@@ -11658,12 +11663,13 @@ Suggested values include: 1] label; 2] data</a:documentation>
       </zeroOrMore>
       <ref name="att.global.attributes"/>
       <ref name="att.notated.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="notatedMusic">
     <element name="notatedMusic">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">encodes the presence of music notation in a text [14.3. Notated Music in Written Text]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">encodes the presence of music notation in a text [15.3. Notated Music in Written Text]</a:documentation>
       <zeroOrMore>
         <choice>
           <ref name="model.labelLike"/>
@@ -11676,12 +11682,13 @@ Suggested values include: 1] label; 2] data</a:documentation>
       <ref name="att.global.attributes"/>
       <ref name="att.placement.attributes"/>
       <ref name="att.typed.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="figure">
     <element name="figure">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [14.4. Specific Elements for Graphic Images]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [15.4. Specific Elements for Graphic Images]</a:documentation>
       <zeroOrMore>
         <choice>
           <ref name="model.headLike"/>
@@ -11696,12 +11703,13 @@ Suggested values include: 1] label; 2] data</a:documentation>
       <ref name="att.placement.attributes"/>
       <ref name="att.typed.attributes"/>
       <ref name="att.written.attributes"/>
+      <ref name="att.cmc.attributes"/>
       <empty/>
     </element>
   </define>
   <define name="figDesc">
     <element name="figDesc">
-      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [14.4. Specific Elements for Graphic Images]</a:documentation>
+      <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [15.4. Specific Elements for Graphic Images]</a:documentation>
       <ref name="macro.limitedContent"/>
       <ref name="att.global.attributes"/>
       <empty/>
diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html
index 62b9e15cd..a6d628926 100644
--- a/Test/expected-results/test15.odd.html
+++ b/Test/expected-results/test15.odd.html
@@ -90,7 +90,7 @@ <h2>
                 <span class="label" itemprop="hi">att.typed</span> 
                 <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">proporciona atributos genéricos utilizables para cualquier clasificación o subclasificación de elementos.</span>[
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">17.1.1. Words and Above</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">18.1.1. Words and Above</a>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAB">3.6.5. Abbreviations and Their Expansions</a>
@@ -100,14 +100,14 @@ <h2>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSDIV2">4.1.2. Numbered Divisions</a>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSHD">4.2.1. Headings and Trailers</a>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSVIRT">4.4. Virtual Divisions</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">13.3.2.3. Personal Relationships</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">16.1.1. Pointers and Links</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">12.2. Linking the Apparatus to the Text</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">22.5.1.2. Defining Content Models: RELAX NG</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">14.3.2.3. Personal Relationships</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">17.1.1. Pointers and Links</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">13.2. Linking the Apparatus to the Text</a>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">23.5.1.2. Defining Content Models: RELAX NG</a>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSBA">8.3. Elements Unique to Spoken Texts</a>
-                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">23.3.1.3. Modification of Attribute and Attribute Value Lists</a>]</td>
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">24.3.1.3. Modification of Attribute and Attribute Value Lists</a>]</td>
               </tr>
               <tr itemprop="row">
                 <td class="wovenodd-col1">
@@ -121,37 +121,37 @@ <h2>
                 </td>
                 <td class="wovenodd-col2">
                   <span class="showmembers1" itemprop="hi">
-                    <a class="link_odd_classSpec" itemprop="ref" href="#TEI.att.pointing.group" title="att.pointing.group define un conjunto de atributos comunes a todos los elementos que incluyen grupos de indicadores. [16. Linki...">att.pointing.group</a>
+                    <a class="link_odd_classSpec" itemprop="ref" href="#TEI.att.pointing.group" title="att.pointing.group define un conjunto de atributos comunes a todos los elementos que incluyen grupos de indicadores. [17. Linki...">att.pointing.group</a>
                     <span class="showmembers2" itemprop="hi">[
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [16.8. Alternation]">altGrp</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [16.7. Aggregation]">joinGrp</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [16.1. Links]">linkGrp</a>]</span>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [17.8. Alternation]">altGrp</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [17.7. Aggregation]">joinGrp</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [17.1. Links]">linkGrp</a>]</span>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.TEI" title="TEI (documento TEI) contiene un solo documento conforme a la norma TEI combinando un solo encabezado TEI (teiHeader) con uno o ...">TEI</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ab" title="ab (bloque anónimo) contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o...">ab</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.abbr" title="abbr (abreviatura) contiene una abreviatura de cualquier clase. [3.6.5. Abbreviations and Their Expansions]">abbr</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.add" title="add (adición) contiene letras palabras o frases introducidas en el texto por el autor transcriptor glosador o corrector. [3.5.3...">add</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.addName" title="addName (nombre adicional) contiene un componente añadido al nombre como un sobrenombre un epíteto alias u otras eventuales exp...">addName</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.affiliation" title="affiliation (affiliation) contiene una descripción informal de la afiliación presente o pasada de una persona a una determinada...">affiliation</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.age" title="age (age) especifica la edad de una persona. [13.3.2.1. Personal Characteristics]">age</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [16.8. Alter...">alt</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.age" title="age (age) especifica la edad de una persona. [14.3.2.1. Personal Characteristics]">age</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [17.8. Alter...">alt</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.anchor" title="anchor (punto de anclaje) enlanza un indentificador con una posición al interno del texto independientemente del hecho que esta...">anchor</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.application" title="application proporciona información sobre la aplicación que ha actuado sobre el documento. [2.3.11. The Application Information...">application</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bibl" title="bibl (cita bibliográfica.) contiene una cita bibliográfica estructurada libremente los componentes de la cual pueden nohaber si...">bibl</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.biblStruct" title="biblStruct (cita bibliográfica estructurada.) contiene una cita bibliográfica estructurada en la cual sólo aparecen los subelem...">biblStruct</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.binaryObject" title="binaryObject proporciona datos binarios codificados que representan un objeto gráfico u otro tipo de objeto inserido en el text...">binaryObject</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.birth" title="birth (birth) contiene información relativa al nacimiento de una persona p.ej. fecha y lugar de nacimiento. [15.2.2. The Partic...">birth</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [13.2.3. Place Na...">bloc</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.birth" title="birth (birth) contiene información relativa al nacimiento de una persona p.ej. fecha y lugar de nacimiento. [16.2.2. The Partic...">birth</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [14.2.3. Place Na...">bloc</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.calendar" title="calendar (calendario) describe un calendario o sistema de datación usado en una fórmula de datación en el texto. [2.4.5. Calend...">calendar</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cb" title="cb (inicio de columna) indica el inicio de una nueva columna de texto en una página divida en columnas . [3.11.3. Milestone Ele...">cb</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.change" title="change (change) resume un cambio o corrección determinada llevada a cabo en una versión dada de un texto electrónico en el que ...">change</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cit" title="cit (cita) Una cita de algún otro documento junto a la referencia bibliográfica a la fuente. [3.3.3. Quotation 4.3.1. Grouped T...">cit</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [13.3.4.3. States Traits and Events]">climate</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [14.3.4.3. States Traits and Events]">climate</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.corr" title="corr (corrección) contiene la forma correcta de un pasaje aparentemente erróneo en el texto de copia. [3.5.1. Apparent Errors]">corr</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.correspAction" title="correspAction (correspondence action) contains a structured description of the place the name of a personorganization and the d...">correspAction</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.correspDesc" title="correspDesc (correspondence description) contains a description of the actions related to one act of correspondence. [2.4.6. Co...">correspDesc</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.country" title="country (country) contiene el nombre de una unidad geopolítica como una nación país colonia etc. más grande o administrativamen...">country</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.date" title="date (date) contiene una fecha en cualquier formato. [3.6.4. Dates and Times 2.2.4. Publication Distribution Licensing etc. 2.6...">date</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.death" title="death (death) contiene informaciones relativas a la defunción de una persona del tipo lugar y fecha. [15.2.2. The Participant D...">death</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.death" title="death (death) contiene informaciones relativas a la defunción de una persona del tipo lugar y fecha. [16.2.2. The Participant D...">death</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.del" title="del (cancelación) contiene una letra palabra o pasaje cancelado marcado como omitido o bien como supérfluo o espurio en el text...">del</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.desc" title="desc (descripción) contiene una breve descripción del objetivo y la aplicación de un elemento atributo o valor de un atributo. ...">desc</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.distinct" title="distinct identifica alguna palabra o locución que se aprecia lingüísticamente distinta por ejemplo como arcaica técnica dialect...">distinct</a>
@@ -165,24 +165,24 @@ <h2>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.div6" title="div6 (división textual de sexto nivel) contiene una subdivisión del sexto nivel en el paratexto inicial en el cuerpo del texto ...">div6</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.div7" title="div7 (división textual de nivel séptimo) contiene la subdivisión más pequeña pero más grande que un párrafo del paratexto inici...">div7</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.divGen" title="divGen (división de texto generada automáticamente) indica la localización en la cual aparece una división textual generada aut...">divGen</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.education" title="education (education) contiene una descripción sobre la experiencia formativa de una persona [15.2.2. The Participant Descripti...">education</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.education" title="education (education) contiene una descripción sobre la experiencia formativa de una persona [16.2.2. The Participant Descripti...">education</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.event" title="event (event) contiene datos relacionados con cualquier tipo de evento significativo asociado con una persona lugar u organizac...">event</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]">eventName</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.faith" title="faith (faith) indica la fe religión o creencias de una persona. [13.3.2.1. Personal Characteristics]">faith</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [14.4. Specific Elements for Graphic Images]">figure</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]">eventName</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.faith" title="faith (faith) indica la fe religión o creencias de una persona. [14.3.2.1. Personal Characteristics]">faith</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [15.4. Specific Elements for Graphic Images]">figure</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.floatingText" title="floatingText (floating text) contiene un texto de cualquier tipo unitario o compuesto que se insiere en algún punto en un texto...">floatingText</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [13.2.1. Personal Names]">forename</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [14.2.1. Personal Names]">forename</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gb" title="gb (gathering beginning) marks the beginning of a new gathering or quire in a transcribed codex. [3.11.3. Milestone Elements]">gb</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.genName" title="genName (componente de nombre generacional) contiene un componente del nombre utilizado para distinguir nombre similares entre ...">genName</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gender" title="gender (gender) especifica la identidad de género de una persona. [13.3.2.1. Personal Characteristics]">gender</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gender" title="gender (gender) especifica la identidad de género de una persona. [14.3.2.1. Personal Characteristics]">gender</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogFeat" title="geogFeat (nombre de un elemento geográfico.) contiene un nombre común que identifica elementos geográficos incluidos en un nomb...">geogFeat</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [13.2.3. Place N...">geogName</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [14.2.3. Place N...">geogName</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gloss" title="gloss (gloss) identifica una locución o palabra usada para proporcionar una glosa o definición sobre otra palabra o frase. [3.4...">gloss</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.graphic" title="graphic (graphic) indica la localización de un gráfico ilustración o figura. [3.10. Graphics and Other Nontextual Components 11...">graphic</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.graphic" title="graphic (graphic) indica la localización de un gráfico ilustración o figura. [3.10. Graphics and Other Nontextual Components 12...">graphic</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.group" title="group (group) contiene el cuerpo de un texto compuesto es decir que agrupa un conjunto de textos distintos (o grupos de textos)...">group</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.head" title="head (encabezamiento) contiene cualquier tipo de encabezamiento por ejemplo el título de una sección o el encabezado de una lis...">head</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.idno" title="idno (número identificativo) proporciona un identificador estándar para un objecto se usa parla la identificación de por ejempl...">idno</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [16.7. Agg...">join</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [17.7. Agg...">join</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.label" title="label (label) contiene un concepto o enunciado asociado con un ítem en una lista en un glosario marca el término que se define....">label</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.langKnowledge" title="langKnowledge (conocimiento del lenguaje) resume los conocimientos lingüísticos de una persona de forma descriptiva o a través ...">langKnowledge</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.lb" title="lb (inicio de línea) marca el comienzo de una nueva línea (topográfica) en alguna edición o versión del texto. [3.11.3. Milesto...">lb</a>
@@ -192,13 +192,13 @@ <h2>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listAnnotation" title="listAnnotation contains a list of annotations typically encoded as &lt;annotation&gt; annotationBlock or &lt;note&gt; possibly organized wi...">listAnnotation</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listBibl" title="listBibl (lista de cita) contiene una lista de citas bibliográficas de cualquier tipo. [3.12.1. Methods of Encoding Bibliograph...">listBibl</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listChange" title="listChange groups a number of change descriptions associated with either the creation of a source text or the revision of an en...">listChange</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [13....">listEvent</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [13.3.7. Names ...">listNym</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [14....">listEvent</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [14.3.7. Names ...">listNym</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listObject" title="listObject (list of objects) contains a list of descriptions each of which provides information about an identifiable physical ...">listObject</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listOrg" title="listOrg (lista de organizaciones) contiene una lista de descripciones que proporciona a la información sobre una organización i...">listOrg</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPerson" title="listPerson (lista de personas) contiene una lista de descripciones y cada una de las cuales proporciona información relativa a ...">listPerson</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPlace" title="listPlace (lista de lugares) contiene una lista de lugares seguida opcionalmente por una lista de interelaciones (a excepción d...">listPlace</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [13.3.2.3. Persona...">listRelation</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [14.3.2.3. Persona...">listRelation</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.location" title="location (location) define la localización de un lugar como conjunto de coordenadas geográficas en términos de alguna entidades...">location</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.measure" title="measure (measure) contiene una palabra o sintagma referido a alguna cantidad de un objeto o producto normalmente incluye un núm...">measure</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.measureGrp" title="measureGrp (grupo de medida) contiene un grupo de especificaciones dimensionales que se relacionan con un mismo objeto por ejem...">measureGrp</a>
@@ -207,55 +207,55 @@ <h2>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.name" title="name (nombre nombre propio) contiene un nombre propio o un sintagma nominal [3.6.1. Referring Strings]">name</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nameLink" title="nameLink (name link) contiene un afijo de conexión al interno del nombre no considerado parte del nombre como p.ej. Van Der o D...">nameLink</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nationality" title="nationality (nationality) contiene una descripción informal de la nacionalidad o ciudadanía presente o pasada de una persona. [...">nationality</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [14.3. Notated Music in Written Text]">notatedMusic</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [15.3. Notated Music in Written Text]">notatedMusic</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.note" title="note (note) contiene una nota o aclaración [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">note</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.noteGrp" title="noteGrp (note group) contains a group of notes [3.9.1.1. Encoding Grouped Notes]">noteGrp</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.num" title="num (número) contiene un número escrito en cualquier forma. [3.6.3. Numbers and Measures]">num</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nym" title="nym (nombre canónico) contiene la definición para un nombre canónico o parte de nombre de cualquier tipo. [13.3.7. Names and Ny...">nym</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.object" title="object contains a description of a single identifiable physical object. [13.3.6. Objects]">object</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]">objectName</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.occupation" title="occupation (occupation) contiene una descripción informal de las actividades la profesión o la ocupación de una persona. [15.2....">occupation</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nym" title="nym (nombre canónico) contiene la definición para un nombre canónico o parte de nombre de cualquier tipo. [14.3.7. Names and Ny...">nym</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.object" title="object contains a description of a single identifiable physical object. [14.3.6. Objects]">object</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]">objectName</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.occupation" title="occupation (occupation) contiene una descripción informal de las actividades la profesión o la ocupación de una persona. [16.2....">occupation</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.offset" title="offset (offset) la parte de una expresión temporal o espacial relativa que indica la dirección del desfase entre dos nombres de...">offset</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.org" title="org (organización) proporciona a la información sobre una organización identificable tal como un negocio una tribu o cualquier ...">org</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [13.2.2. Organizational Names]">orgName</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [14.2.2. Organizational Names]">orgName</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.pb" title="pb (inicio de página) marca el inicio de una nueva página de un texto en un documento paginado. [3.11.3. Milestone Elements]">pb</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persName" title="persName (nombre propio de persona) contiene un nombre propio o un sintagma identificable como un nombre propio que se refiere ...">persName</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persPronouns" title="persPronouns (personal pronouns) indicates the personal pronouns used or assumed to be used by the individual being described. ...">persPronouns</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.place" title="place (place) contiene los datos sobre una localización geográfica [13.3.4. Places]">place</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [13.2.3. Place Names]">placeName</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [13.3.4.3. States Traits and Events]">population</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ptr" title="ptr (puntero) define un señalizador a otra localización. [3.7. Simple Links and CrossReferences 16.1. Links]">ptr</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.place" title="place (place) contiene los datos sobre una localización geográfica [14.3.4. Places]">place</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [14.2.3. Place Names]">placeName</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [14.3.4.3. States Traits and Events]">population</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ptr" title="ptr (puntero) define un señalizador a otra localización. [3.7. Simple Links and CrossReferences 17.1. Links]">ptr</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.quote" title="quote (cita) contiene una frase o pasaje atribuido por el narrador o autor a un agente externo al texto. [3.3.3. Quotation 4.3....">quote</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rb" title="rb (ruby base) contains the base text annotated by a ruby gloss. [3.4.2. Ruby Annotations]">rb</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ref" title="ref (referencia) define una referencia a otra localización posiblemente modificada por un texto o comentario adicional. [3.7. S...">ref</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.reg" title="reg (regularización) contiene una lectura que ha sido regularizada o normalizada en algún sentido. [3.5.2. Regularization and N...">reg</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.region" title="region (region) &gt;contiene el nombre de una unidad administrativa como un estado una región o una província que sea mayor que un...">region</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.relatedItem" title="relatedItem contiene o refiere algún otro elemento bibliográfico que se relaciona con el actual de alguna manera por ejemplo co...">relatedItem</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.relation" title="relation (relación) describe cualquier tipo de relación o vínculo entre un determinato grupo de personas. [13.3.2.3. Personal R...">relation</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.residence" title="residence (residencia) describe el lugar de residencia presente o pasado de una persona. [15.2.2. The Participant Description]">residence</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.relation" title="relation (relación) describe cualquier tipo de relación o vínculo entre un determinato grupo de personas. [14.3.2.3. Personal R...">relation</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.residence" title="residence (residencia) describe el lugar de residencia presente o pasado de una persona. [16.2.2. The Participant Description]">residence</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.roleName" title="roleName (role name) contiene un componente del nombre que indica un rol o una posición específica a nivel social como en el ca...">roleName</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [13.2.1. Personal Names 3.6.1. Referrin...">rs</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [14.2.1. Personal Names 3.6.1. Referrin...">rs</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rt" title="rt (ruby text) contains a ruby text an annotation closely associated with a passage of the main text. [3.4.2. Ruby Annotations]">rt</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ruby" title="ruby (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]">ruby</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.schemaRef" title="schemaRef (schema reference) describes or points to a related customization or schema file [2.3.10. The Schema Specification]">schemaRef</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [16.3...">seg</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [17.3...">seg</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.settlement" title="settlement (settlement) contiene el nombre de un asentamiento del tipo ciudad pueblo villa etc. identificado como una unidad ge...">settlement</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sex" title="sex (sex) especifica el sexo de un organismo. [13.3.2.1. Personal Characteristics]">sex</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.socecStatus" title="socecStatus (estatus socioeconómico) contiene una descripción informal sobre el estatus socioeconómico de una persona. [15.2.2....">socecStatus</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sex" title="sex (sex) especifica el sexo de un organismo. [14.3.2.1. Personal Characteristics]">sex</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.socecStatus" title="socecStatus (estatus socioeconómico) contiene una descripción informal sobre el estatus socioeconómico de una persona. [16.2.2....">socecStatus</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.standOff" title="standOff Functions as a container element for linked data contextual information and standoff annotations embedded in a TEI doc...">standOff</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [13.3.1. Basic Princ...">state</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [14.3.1. Basic Princ...">state</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.surname" title="surname (surname) contiene el apellido o nombre de família (heredado) en oposicion a un nombre asignado un nombre de bautismo o...">surname</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [14.1.1. TEI Tables]">table</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [15.1.1. TEI Tables]">table</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.teiCorpus" title="teiCorpus (TEI corpus) contiene la totalidad de un corpus TEI codificado comprendiendo un único encabezado y uno o más elemento...">teiCorpus</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.term" title="term (term) contiene una palabra simple multipalabra o designación simbólica que se considera como un término técnico. [3.4.1. ...">term</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [13.3.4.3. States Traits and Events]">terrain</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [14.3.4.3. States Traits and Events]">terrain</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.text" title="text (text) contiene un único texto de cualquier tipo sea este unitario o combinado p.ej. un texto en verso o teatral una recop...">text</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.time" title="time (time) contiene un sintagma que define un momento del día en cualquier formato. [3.6.4. Dates and Times]">time</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.title" title="title (title) contiene el título completo de una obra de cualquier tipo. [3.12.2.2. Titles Authors and Editors 2.2.1. The Title...">title</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.titlePage" title="titlePage (frontispicio) contiene el frontispicio de un texto incluido en el paratexto inicial o final [4.6. Title Pages]">titlePage</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.titlePart" title="titlePart (title part) contiene una subsección o división del título de una obra como se indica en el frontispicio. [4.6. Title...">titlePart</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trailer" title="trailer contiene una fórmula de clausura o un elemento a pie de página que aparece al final de una sección de texto [4.2.4. Con...">trailer</a>
-                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [13.3.1. B...">trait</a>
+                    <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [14.3.1. B...">trait</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.unit" title="unit contains a symbol a word or a phrase referring to a unit of measurement in any kind of formal or informal system. [3.6.3. ...">unit</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.unitDef" title="unitDef (unit definition) contains descriptive information related to a specific unit of measurement. [2.3.9. The Unit Declarat...">unitDef</a>
                     <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.xenoData" title="xenoData (nonTEI metadata) provides a container element into which metadata in nonTEI formats may be placed. [2.5. NonTEI Metad...">xenoData</a>
@@ -644,9 +644,9 @@ <h2>
                     <div class="specChild" itemprop="ab">
                       <span class="specChildModule" itemprop="seg">figures:</span>
                       <span class="specChildElements" itemprop="seg">
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [14.4. Specific Elements for Graphic Images]">figure</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [14.3. Notated Music in Written Text]">notatedMusic</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [14.1.1. TEI Tables]">table</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [15.4. Specific Elements for Graphic Images]">figure</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [15.3. Notated Music in Written Text]">notatedMusic</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [15.1.1. TEI Tables]">table</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
@@ -659,26 +659,26 @@ <h2>
                       <span class="specChildModule" itemprop="seg">linking:</span>
                       <span class="specChildElements" itemprop="seg">
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ab" title="ab (bloque anónimo) contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o...">ab</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [16.8. Alter...">alt</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [16.8. Alternation]">altGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [17.8. Alter...">alt</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [17.8. Alternation]">altGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.anchor" title="anchor (punto de anclaje) enlanza un indentificador con una posición al interno del texto independientemente del hecho que esta...">anchor</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [16.7. Agg...">join</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [16.7. Aggregation]">joinGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [17.7. Agg...">join</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [17.7. Aggregation]">joinGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.link" title="link (link) define una asociación o vínculo hipertextual entre elementos o fragmentos de texto que no es especificable por otro...">link</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [16.1. Links]">linkGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [17.1. Links]">linkGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.timeline" title="timeline (escala temporal) indica una serie de puntos ordenados temporalmente los cuales pueden ser enlazados a los elementos d...">timeline</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
                       <span class="specChildModule" itemprop="seg">namesdates:</span>
                       <span class="specChildElements" itemprop="seg">
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [13....">listEvent</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [13.3.7. Names ...">listNym</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [14....">listEvent</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [14.3.7. Names ...">listNym</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listObject" title="listObject (list of objects) contains a list of descriptions each of which provides information about an identifiable physical ...">listObject</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listOrg" title="listOrg (lista de organizaciones) contiene una lista de descripciones que proporciona a la información sobre una organización i...">listOrg</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPerson" title="listPerson (lista de personas) contiene una lista de descripciones y cada una de las cuales proporciona información relativa a ...">listPerson</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPlace" title="listPlace (lista de lugares) contiene una lista de lugares seguida opcionalmente por una lista de interelaciones (a excepción d...">listPlace</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [13.3.2.3. Persona...">listRelation</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [14.3.2.3. Persona...">listRelation</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
@@ -1017,6 +1017,14 @@ <h2>
                         </li>
                       </ul>
                     </li>
+                    <li class="classSpecItem" itemprop="item">
+                      <a class="link_ref" itemprop="ref" href="#TEI.att.cmc" title="att.cmc (computermediated communication) provides attributes categorizing how the element content was created in a CMC environm...">att.cmc</a>
+                      <ul class="classSpecAttDefs" itemprop="list">
+                        <li class="item" itemprop="item">
+                          <span class="attribute" itemprop="hi">@generatedBy</span>
+                        </li>
+                      </ul>
+                    </li>
                   </ul>
                 </td>
               </tr>
@@ -1053,8 +1061,8 @@ <h2>
                       <div class="specChild" itemprop="ab">
                         <span class="specChildModule" itemprop="seg">figures:</span>
                         <span class="specChildElements" itemprop="seg">
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cell" title="cell (cell) contiene una celda de una tabla. [14.1.1. TEI Tables]">cell</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [14.4. Specific Elements for Graphic Images]">figure</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cell" title="cell (cell) contiene una celda de una tabla. [15.1.1. TEI Tables]">cell</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [15.4. Specific Elements for Graphic Images]">figure</a>
                         </span>
                       </div>
                       <div class="specChild" itemprop="ab">
@@ -1073,7 +1081,7 @@ <h2>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.editionStmt" title="editionStmt (declaración de la edición) agrupa la información relativa a la edición de un texto. [2.2.2. The Edition Statement ...">editionStmt</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.editorialDecl" title="editorialDecl (declaración de la edición) proporciona detalles de principios editoriales y prácticas aplicadas en la codificaci...">editorialDecl</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.encodingDesc" title="encodingDesc (Descripción de la codificación) documenta la relación entre un texto electrónico y la fuente o fuentes de las que...">encodingDesc</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.handNote" title="handNote (notas sobre la mano) describe un determinado estilo o una determinada mano al interno de un manuscrito. [10.7.2. Writ...">handNote</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.handNote" title="handNote (notas sobre la mano) describe un determinado estilo o una determinada mano al interno de un manuscrito. [11.7.2. Writ...">handNote</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.hyphenation" title="hyphenation (hyphenation) indica el modo en que han sido tratados el uso del guión presente en el texto fuente en la versión co...">hyphenation</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.interpretation" title="interpretation (interpretation) describe la finalidad de cualquier información analítica o descriptiva añadida al texto en la t...">interpretation</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.langUsage" title="langUsage (lengua empleada) describe las lenguas jergas registros dialectos etc. presentes en el texto. [2.4.2. Language Usage ...">langUsage</a>
@@ -1086,7 +1094,7 @@ <h2>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.quotation" title="quotation (quotation) indica las prácticas editoriales adoptadas respecto al entrecomillado en el original. [2.3.3. The Editori...">quotation</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.refsDecl" title="refsDecl (declaración de referencias) indica cómo se han formado las referencias canónicas para este texto. [2.3.6.3. Milestone...">refsDecl</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.samplingDecl" title="samplingDecl (declaración de muestra) contiene una descripción en prosa sobre los fundamentos y métodos usados en textos de mue...">samplingDecl</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Wri...">scriptNote</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Wri...">scriptNote</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.segmentation" title="segmentation (segmentation) describe los principios aplicados en la fragmentación del texto p.ej. en las oraciones sintagmas mo...">segmentation</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seriesStmt" title="seriesStmt (declaración de serie) agrupa información sobre la serie si la hay a la que pertenece una publicación. [2.2.5. The S...">seriesStmt</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sourceDesc" title="sourceDesc (descripción de la fuente) proporciona una descripción del texto (o textos) fuente del que un texto electrónico deri...">sourceDesc</a>
@@ -1097,22 +1105,22 @@ <h2>
                       <div class="specChild" itemprop="ab">
                         <span class="specChildModule" itemprop="seg">namesdates:</span>
                         <span class="specChildElements" itemprop="seg">
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [13.3.4.3. States Traits and Events]">climate</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [14.3.4.3. States Traits and Events]">climate</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.event" title="event (event) contiene datos relacionados con cualquier tipo de evento significativo asociado con una persona lugar u organizac...">event</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.langKnowledge" title="langKnowledge (conocimiento del lenguaje) resume los conocimientos lingüísticos de una persona de forma descriptiva o a través ...">langKnowledge</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [13.3.2.3. Persona...">listRelation</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nym" title="nym (nombre canónico) contiene la definición para un nombre canónico o parte de nombre de cualquier tipo. [13.3.7. Names and Ny...">nym</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.object" title="object contains a description of a single identifiable physical object. [13.3.6. Objects]">object</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.occupation" title="occupation (occupation) contiene una descripción informal de las actividades la profesión o la ocupación de una persona. [15.2....">occupation</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [14.3.2.3. Persona...">listRelation</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nym" title="nym (nombre canónico) contiene la definición para un nombre canónico o parte de nombre de cualquier tipo. [14.3.7. Names and Ny...">nym</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.object" title="object contains a description of a single identifiable physical object. [14.3.6. Objects]">object</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.occupation" title="occupation (occupation) contiene una descripción informal de las actividades la profesión o la ocupación de una persona. [16.2....">occupation</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.org" title="org (organización) proporciona a la información sobre una organización identificable tal como un negocio una tribu o cualquier ...">org</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.person" title="person (person) proporciona información relativa a un individuo específico p.ej. un participante de una interacción verbal o un...">person</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.personGrp" title="personGrp (grupo de personas) describe a un grupo de individuos considerados como una única persona para fines analíticos. [15....">personGrp</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.personGrp" title="personGrp (grupo de personas) describe a un grupo de individuos considerados como una única persona para fines analíticos. [16....">personGrp</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persona" title="persona provides information about one of the personalities identified for a given individual where an individual has multiple ...">persona</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.place" title="place (place) contiene los datos sobre una localización geográfica [13.3.4. Places]">place</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [13.3.4.3. States Traits and Events]">population</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [13.3.1. Basic Princ...">state</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [13.3.4.3. States Traits and Events]">terrain</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [13.3.1. B...">trait</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.place" title="place (place) contiene los datos sobre una localización geográfica [14.3.4. Places]">place</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [14.3.4.3. States Traits and Events]">population</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [14.3.1. Basic Princ...">state</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [14.3.4.3. States Traits and Events]">terrain</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [14.3.1. B...">trait</a>
                         </span>
                       </div>
                       <div class="specChild" itemprop="ab">
@@ -1169,7 +1177,7 @@ <h2>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gap" title="gap (gap) indicada un punto donde algún material ha sido omitido en una transcripción bien por criterios de edición descritos e...">gap</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gb" title="gb (gathering beginning) marks the beginning of a new gathering or quire in a transcribed codex. [3.11.3. Milestone Elements]">gb</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gloss" title="gloss (gloss) identifica una locución o palabra usada para proporcionar una glosa o definición sobre otra palabra o frase. [3.4...">gloss</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.graphic" title="graphic (graphic) indica la localización de un gráfico ilustración o figura. [3.10. Graphics and Other Nontextual Components 11...">graphic</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.graphic" title="graphic (graphic) indica la localización de un gráfico ilustración o figura. [3.10. Graphics and Other Nontextual Components 12...">graphic</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.hi" title="hi (subrayado) marca una palabra o frase gráficamente diferente del resto del texto que la circunda por causas sobre las que no...">hi</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.index" title="index (entrada de un índice.) marca un punto para ser indexado por cualquier criterio. [3.9.2. Index Entries]">index</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.l" title="l (verso) contiene un único verso posiblemente incompleto. [3.13.1. Core Tags for Verse 3.13. Passages of Verse or Drama 7.2.5....">l</a>
@@ -1187,14 +1195,14 @@ <h2>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.note" title="note (note) contiene una nota o aclaración [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">note</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.noteGrp" title="noteGrp (note group) contains a group of notes [3.9.1.1. Encoding Grouped Notes]">noteGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.num" title="num (número) contiene un número escrito en cualquier forma. [3.6.3. Numbers and Measures]">num</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orig" title="orig (forma original) contiene una lectura que se marca como fiel al original. [3.5.2. Regularization and Normalization 12. Cri...">orig</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orig" title="orig (forma original) contiene una lectura que se marca como fiel al original. [3.5.2. Regularization and Normalization 13. Cri...">orig</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.pb" title="pb (inicio de página) marca el inicio de una nueva página de un texto en un documento paginado. [3.11.3. Milestone Elements]">pb</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ptr" title="ptr (puntero) define un señalizador a otra localización. [3.7. Simple Links and CrossReferences 16.1. Links]">ptr</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ptr" title="ptr (puntero) define un señalizador a otra localización. [3.7. Simple Links and CrossReferences 17.1. Links]">ptr</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.q" title="&lt;q&gt;">q</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.quote" title="quote (cita) contiene una frase o pasaje atribuido por el narrador o autor a un agente externo al texto. [3.3.3. Quotation 4.3....">quote</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ref" title="ref (referencia) define una referencia a otra localización posiblemente modificada por un texto o comentario adicional. [3.7. S...">ref</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.reg" title="reg (regularización) contiene una lectura que ha sido regularizada o normalizada en algún sentido. [3.5.2. Regularization and N...">reg</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [13.2.1. Personal Names 3.6.1. Referrin...">rs</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [14.2.1. Personal Names 3.6.1. Referrin...">rs</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ruby" title="ruby (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]">ruby</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.said" title="said (parlamento discurso o pensamiento) indica los pasajes pensados o hablados en voz alta si está indicado explícitamente en ...">said</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sic" title="sic (Latin for thus or so) contiene texto reproducido aparentemente icorrecto o inexacto. [3.5.1. Apparent Errors]">sic</a>
@@ -1210,10 +1218,10 @@ <h2>
                     <div class="specChild" itemprop="ab">
                       <span class="specChildModule" itemprop="seg">figures:</span>
                       <span class="specChildElements" itemprop="seg">
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [14.4. Specific Elements for Graphic Images]">figure</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.formula" title="formula (formula) contiene una fórmula matemática o de otro tipo. [14.2. Formulæ and Mathematical Expressions]">formula</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [14.3. Notated Music in Written Text]">notatedMusic</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [14.1.1. TEI Tables]">table</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [15.4. Specific Elements for Graphic Images]">figure</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.formula" title="formula (formula) contiene una fórmula matemática o de otro tipo. [15.2. Formulæ and Mathematical Expressions]">formula</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [15.3. Notated Music in Written Text]">notatedMusic</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [15.1.1. TEI Tables]">table</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
@@ -1226,14 +1234,14 @@ <h2>
                     <div class="specChild" itemprop="ab">
                       <span class="specChildModule" itemprop="seg">linking:</span>
                       <span class="specChildElements" itemprop="seg">
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [16.8. Alter...">alt</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [16.8. Alternation]">altGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [17.8. Alter...">alt</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [17.8. Alternation]">altGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.anchor" title="anchor (punto de anclaje) enlanza un indentificador con una posición al interno del texto independientemente del hecho que esta...">anchor</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [16.7. Agg...">join</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [16.7. Aggregation]">joinGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [17.7. Agg...">join</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [17.7. Aggregation]">joinGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.link" title="link (link) define una asociación o vínculo hipertextual entre elementos o fragmentos de texto que no es especificable por otro...">link</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [16.1. Links]">linkGrp</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [16.3...">seg</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [17.1. Links]">linkGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [17.3...">seg</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.timeline" title="timeline (escala temporal) indica una serie de puntos ordenados temporalmente los cuales pueden ser enlazados a los elementos d...">timeline</a>
                       </span>
                     </div>
@@ -1242,39 +1250,39 @@ <h2>
                       <span class="specChildElements" itemprop="seg">
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.addName" title="addName (nombre adicional) contiene un componente añadido al nombre como un sobrenombre un epíteto alias u otras eventuales exp...">addName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.affiliation" title="affiliation (affiliation) contiene una descripción informal de la afiliación presente o pasada de una persona a una determinada...">affiliation</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [13.2.3. Place Na...">bloc</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [13.3.4.3. States Traits and Events]">climate</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [14.2.3. Place Na...">bloc</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [14.3.4.3. States Traits and Events]">climate</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.country" title="country (country) contiene el nombre de una unidad geopolítica como una nación país colonia etc. más grande o administrativamen...">country</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.district" title="district (district) contiene el nombre de cualquier subdivisión al interno de un asentamiento como una circunscripción un barri...">district</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]">eventName</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [13.2.1. Personal Names]">forename</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]">eventName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [14.2.1. Personal Names]">forename</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.genName" title="genName (componente de nombre generacional) contiene un componente del nombre utilizado para distinguir nombre similares entre ...">genName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geo" title="geo (coordenadas geográficas) contiene cualquier expresión de un conjunto de coordenadas geográficas representando un punto lín...">geo</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogFeat" title="geogFeat (nombre de un elemento geográfico.) contiene un nombre común que identifica elementos geográficos incluidos en un nomb...">geogFeat</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [13.2.3. Place N...">geogName</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [13....">listEvent</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [13.3.7. Names ...">listNym</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [14.2.3. Place N...">geogName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [14....">listEvent</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [14.3.7. Names ...">listNym</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listObject" title="listObject (list of objects) contains a list of descriptions each of which provides information about an identifiable physical ...">listObject</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listOrg" title="listOrg (lista de organizaciones) contiene una lista de descripciones que proporciona a la información sobre una organización i...">listOrg</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPerson" title="listPerson (lista de personas) contiene una lista de descripciones y cada una de las cuales proporciona información relativa a ...">listPerson</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPlace" title="listPlace (lista de lugares) contiene una lista de lugares seguida opcionalmente por una lista de interelaciones (a excepción d...">listPlace</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [13.3.2.3. Persona...">listRelation</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [14.3.2.3. Persona...">listRelation</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.location" title="location (location) define la localización de un lugar como conjunto de coordenadas geográficas en términos de alguna entidades...">location</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nameLink" title="nameLink (name link) contiene un afijo de conexión al interno del nombre no considerado parte del nombre como p.ej. Van Der o D...">nameLink</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]">objectName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]">objectName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.offset" title="offset (offset) la parte de una expresión temporal o espacial relativa que indica la dirección del desfase entre dos nombres de...">offset</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [13.2.2. Organizational Names]">orgName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [14.2.2. Organizational Names]">orgName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persName" title="persName (nombre propio de persona) contiene un nombre propio o un sintagma identificable como un nombre propio que se refiere ...">persName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persPronouns" title="persPronouns (personal pronouns) indicates the personal pronouns used or assumed to be used by the individual being described. ...">persPronouns</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [13.2.3. Place Names]">placeName</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [13.3.4.3. States Traits and Events]">population</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [14.2.3. Place Names]">placeName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [14.3.4.3. States Traits and Events]">population</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.region" title="region (region) &gt;contiene el nombre de una unidad administrativa como un estado una región o una província que sea mayor que un...">region</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.roleName" title="roleName (role name) contiene un componente del nombre que indica un rol o una posición específica a nivel social como en el ca...">roleName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.settlement" title="settlement (settlement) contiene el nombre de un asentamiento del tipo ciudad pueblo villa etc. identificado como una unidad ge...">settlement</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [13.3.1. Basic Princ...">state</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [14.3.1. Basic Princ...">state</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.surname" title="surname (surname) contiene el apellido o nombre de família (heredado) en oposicion a un nombre asignado un nombre de bautismo o...">surname</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [13.3.4.3. States Traits and Events]">terrain</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [13.3.1. B...">trait</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [14.3.4.3. States Traits and Events]">terrain</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [14.3.1. B...">trait</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
@@ -1292,7 +1300,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Ejemplo</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div id="index.xml-egXML-d33e2319" class="pre egXML_valid">
+                  <div id="index.xml-egXML-d33e2326" class="pre egXML_valid">
                   <span class="element">&lt;para&gt;</span>Hallgerd was outside. 
                   <span class="element">&lt;q&gt;</span>There is blood on your axe,
                   <span class="element">&lt;/q&gt;</span>she said. 
@@ -1336,12 +1344,12 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Content model</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <pre id="index.xml-eg-d33e2354" class="pre_eg cdata">
+                  <pre id="index.xml-eg-d33e2361" class="pre_eg cdata">
 &lt;content&gt;
  &lt;macroRef key="macro.paraContent"/&gt;
 &lt;/content&gt;
     
-<a href="#index.xml-eg-d33e2354" class="anchorlink">⚓</a>
+<a href="#index.xml-eg-d33e2361" class="anchorlink">⚓</a>
 </pre>
                 </td>
               </tr>
@@ -1350,7 +1358,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Declaración</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <pre id="index.xml-eg-d33e2361" class="pre_eg">
+                  <pre id="index.xml-eg-d33e2368" class="pre_eg">
 element para
 {
    
@@ -1362,9 +1370,11 @@ <h2>
    
 <a class="link_ref" itemprop="ref" href="#TEI.att.written" title="att.written provides attributes to indicate the hand in which the content of an element was written in the source being transcr...">att.written.attributes</a>,
    
+<a class="link_ref" itemprop="ref" href="#TEI.att.cmc" title="att.cmc (computermediated communication) provides attributes categorizing how the element content was created in a CMC environm...">att.cmc.attributes</a>,
+   
 <a class="link_ref" itemprop="ref" href="#TEI.macro.paraContent" title="macro.paraContent (contenido del párrafo) define el contenido de párrafos y elementos similares. [1.3. The TEI Class System]">macro.paraContent</a>
 }
-<a href="#index.xml-eg-d33e2361" class="anchorlink">⚓</a>
+<a href="#index.xml-eg-d33e2368" class="anchorlink">⚓</a>
 </pre>
                 </td>
               </tr>
@@ -1499,6 +1509,14 @@ <h2>
                         </li>
                       </ul>
                     </li>
+                    <li class="classSpecItem" itemprop="item">
+                      <a class="link_ref" itemprop="ref" href="#TEI.att.cmc" title="att.cmc (computermediated communication) provides attributes categorizing how the element content was created in a CMC environm...">att.cmc</a>
+                      <ul class="classSpecAttDefs" itemprop="list">
+                        <li class="item" itemprop="item">
+                          <span class="attribute" itemprop="hi">@generatedBy</span>
+                        </li>
+                      </ul>
+                    </li>
                   </ul>
                   <div class="table">
                     <table class="attList" itemprop="table">
@@ -1648,7 +1666,7 @@ <h2>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.name" title="name (nombre nombre propio) contiene un nombre propio o un sintagma nominal [3.6.1. Referring Strings]">name</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.note" title="note (note) contiene una nota o aclaración [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">note</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.num" title="num (número) contiene un número escrito en cualquier forma. [3.6.3. Numbers and Measures]">num</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orig" title="orig (forma original) contiene una lectura que se marca como fiel al original. [3.5.2. Regularization and Normalization 12. Cri...">orig</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orig" title="orig (forma original) contiene una lectura que se marca como fiel al original. [3.5.2. Regularization and Normalization 13. Cri...">orig</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.para" title="&lt;para&gt;">para</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.pubPlace" title="pubPlace (lugar de la publicación) contiene el nombre del lugar de publicación de un elemento bibliográfico. [3.12.2.4. Imprint...">pubPlace</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.publisher" title="publisher (editorial) proporciona el nombre de la organización responsable de la publicación o la distribución de un elemento b...">publisher</a>
@@ -1658,7 +1676,7 @@ <h2>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ref" title="ref (referencia) define una referencia a otra localización posiblemente modificada por un texto o comentario adicional. [3.7. S...">ref</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.reg" title="reg (regularización) contiene una lectura que ha sido regularizada o normalizada en algún sentido. [3.5.2. Regularization and N...">reg</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.resp" title="resp (responsabilidad) contiene un sintagma que describe la naturaleza de la responsabilidad intelectual de una persona. [3.12....">resp</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [13.2.1. Personal Names 3.6.1. Referrin...">rs</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [14.2.1. Personal Names 3.6.1. Referrin...">rs</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rt" title="rt (ruby text) contains a ruby text an annotation closely associated with a passage of the main text. [3.4.2. Ruby Annotations]">rt</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.said" title="said (parlamento discurso o pensamiento) indica los pasajes pensados o hablados en voz alta si está indicado explícitamente en ...">said</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sic" title="sic (Latin for thus or so) contiene texto reproducido aparentemente icorrecto o inexacto. [3.5.1. Apparent Errors]">sic</a>
@@ -1678,10 +1696,10 @@ <h2>
                       <div class="specChild" itemprop="ab">
                         <span class="specChildModule" itemprop="seg">figures:</span>
                         <span class="specChildElements" itemprop="seg">
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cell" title="cell (cell) contiene una celda de una tabla. [14.1.1. TEI Tables]">cell</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cell" title="cell (cell) contiene una celda de una tabla. [15.1.1. TEI Tables]">cell</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figDesc" title="figDesc (descripción de una figura) contiene una breve descripción de la apariencia o del contenido de una figura gráfica para ...">figDesc</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [14.4. Specific Elements for Graphic Images]">figure</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.formula" title="formula (formula) contiene una fórmula matemática o de otro tipo. [14.2. Formulæ and Mathematical Expressions]">formula</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [15.4. Specific Elements for Graphic Images]">figure</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.formula" title="formula (formula) contiene una fórmula matemática o de otro tipo. [15.2. Formulæ and Mathematical Expressions]">formula</a>
                         </span>
                       </div>
                       <div class="specChild" itemprop="ab">
@@ -1697,12 +1715,12 @@ <h2>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.extent" title="extent (extent) describe el tamaño aproximado de un texto almacenado en algún medio digital o no especificándolo en alguna unid...">extent</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.funder" title="funder (responsable de la financiación) proporciona el nombre del individuo la institución o la organización responsable de la ...">funder</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geoDecl" title="geoDecl (declaración de las coordenadas geográficas) documenta la anotación y los datos usados para los coordenadas geográficas...">geoDecl</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.handNote" title="handNote (notas sobre la mano) describe un determinado estilo o una determinada mano al interno de un manuscrito. [10.7.2. Writ...">handNote</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.handNote" title="handNote (notas sobre la mano) describe un determinado estilo o una determinada mano al interno de un manuscrito. [11.7.2. Writ...">handNote</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.language" title="language (language) caracteriza una lengua o jerga empleada en un texto. [2.4.2. Language Usage]">language</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.licence" title="licence contains information about a licence or other legal agreement applicable to the text. [2.2.4. Publication Distribution ...">licence</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.principal" title="principal (investigador principal) proporciona el nombre del investigador principal de la creación de un texto electrónico. [2....">principal</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rendition" title="rendition (rendition) proporciona información sobre la interpretación ideada para uno o más elementos. [2.3.4. The Tagging Decl...">rendition</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Wri...">scriptNote</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Wri...">scriptNote</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sponsor" title="sponsor (sponsor) especifica el nombre de la organización o institución responsable. [2.2.1. The Title Statement]">sponsor</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.tagUsage" title="tagUsage (element usage) proporciona información sobre el uso de un elemento específico al interno del texto. [2.3.4. The Taggi...">tagUsage</a>
                         </span>
@@ -1711,7 +1729,7 @@ <h2>
                         <span class="specChildModule" itemprop="seg">linking:</span>
                         <span class="specChildElements" itemprop="seg">
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ab" title="ab (bloque anónimo) contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o...">ab</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [16.3...">seg</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [17.3...">seg</a>
                         </span>
                       </div>
                       <div class="specChild" itemprop="ab">
@@ -1719,37 +1737,37 @@ <h2>
                         <span class="specChildElements" itemprop="seg">
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.addName" title="addName (nombre adicional) contiene un componente añadido al nombre como un sobrenombre un epíteto alias u otras eventuales exp...">addName</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.affiliation" title="affiliation (affiliation) contiene una descripción informal de la afiliación presente o pasada de una persona a una determinada...">affiliation</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.age" title="age (age) especifica la edad de una persona. [13.3.2.1. Personal Characteristics]">age</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.birth" title="birth (birth) contiene información relativa al nacimiento de una persona p.ej. fecha y lugar de nacimiento. [15.2.2. The Partic...">birth</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [13.2.3. Place Na...">bloc</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.age" title="age (age) especifica la edad de una persona. [14.3.2.1. Personal Characteristics]">age</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.birth" title="birth (birth) contiene información relativa al nacimiento de una persona p.ej. fecha y lugar de nacimiento. [16.2.2. The Partic...">birth</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [14.2.3. Place Na...">bloc</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.country" title="country (country) contiene el nombre de una unidad geopolítica como una nación país colonia etc. más grande o administrativamen...">country</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.death" title="death (death) contiene informaciones relativas a la defunción de una persona del tipo lugar y fecha. [15.2.2. The Participant D...">death</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.death" title="death (death) contiene informaciones relativas a la defunción de una persona del tipo lugar y fecha. [16.2.2. The Participant D...">death</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.district" title="district (district) contiene el nombre de cualquier subdivisión al interno de un asentamiento como una circunscripción un barri...">district</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.education" title="education (education) contiene una descripción sobre la experiencia formativa de una persona [15.2.2. The Participant Descripti...">education</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]">eventName</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.faith" title="faith (faith) indica la fe religión o creencias de una persona. [13.3.2.1. Personal Characteristics]">faith</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.floruit" title="floruit (floruit) contiene información relativa al periodo de actividad de una persona. [13.3.2.1. Personal Characteristics]">floruit</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [13.2.1. Personal Names]">forename</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.education" title="education (education) contiene una descripción sobre la experiencia formativa de una persona [16.2.2. The Participant Descripti...">education</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]">eventName</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.faith" title="faith (faith) indica la fe religión o creencias de una persona. [14.3.2.1. Personal Characteristics]">faith</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.floruit" title="floruit (floruit) contiene información relativa al periodo de actividad de una persona. [14.3.2.1. Personal Characteristics]">floruit</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [14.2.1. Personal Names]">forename</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.genName" title="genName (componente de nombre generacional) contiene un componente del nombre utilizado para distinguir nombre similares entre ...">genName</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gender" title="gender (gender) especifica la identidad de género de una persona. [13.3.2.1. Personal Characteristics]">gender</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gender" title="gender (gender) especifica la identidad de género de una persona. [14.3.2.1. Personal Characteristics]">gender</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogFeat" title="geogFeat (nombre de un elemento geográfico.) contiene un nombre común que identifica elementos geográficos incluidos en un nomb...">geogFeat</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [13.2.3. Place N...">geogName</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.langKnown" title="langKnown (competencia lingüística) resume la competencia de una persona en la lengua indicada. [15.2.2. The Participant Descri...">langKnown</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [14.2.3. Place N...">geogName</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.langKnown" title="langKnown (competencia lingüística) resume la competencia de una persona en la lengua indicada. [16.2.2. The Participant Descri...">langKnown</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nameLink" title="nameLink (name link) contiene un afijo de conexión al interno del nombre no considerado parte del nombre como p.ej. Van Der o D...">nameLink</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nationality" title="nationality (nationality) contiene una descripción informal de la nacionalidad o ciudadanía presente o pasada de una persona. [...">nationality</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]">objectName</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.occupation" title="occupation (occupation) contiene una descripción informal de las actividades la profesión o la ocupación de una persona. [15.2....">occupation</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]">objectName</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.occupation" title="occupation (occupation) contiene una descripción informal de las actividades la profesión o la ocupación de una persona. [16.2....">occupation</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.offset" title="offset (offset) la parte de una expresión temporal o espacial relativa que indica la dirección del desfase entre dos nombres de...">offset</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [13.2.2. Organizational Names]">orgName</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [14.2.2. Organizational Names]">orgName</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persName" title="persName (nombre propio de persona) contiene un nombre propio o un sintagma identificable como un nombre propio que se refiere ...">persName</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persPronouns" title="persPronouns (personal pronouns) indicates the personal pronouns used or assumed to be used by the individual being described. ...">persPronouns</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [13.2.3. Place Names]">placeName</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [14.2.3. Place Names]">placeName</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.region" title="region (region) &gt;contiene el nombre de una unidad administrativa como un estado una región o una província que sea mayor que un...">region</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.residence" title="residence (residencia) describe el lugar de residencia presente o pasado de una persona. [15.2.2. The Participant Description]">residence</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.residence" title="residence (residencia) describe el lugar de residencia presente o pasado de una persona. [16.2.2. The Participant Description]">residence</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.roleName" title="roleName (role name) contiene un componente del nombre que indica un rol o una posición específica a nivel social como en el ca...">roleName</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.settlement" title="settlement (settlement) contiene el nombre de un asentamiento del tipo ciudad pueblo villa etc. identificado como una unidad ge...">settlement</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sex" title="sex (sex) especifica el sexo de un organismo. [13.3.2.1. Personal Characteristics]">sex</a>
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.socecStatus" title="socecStatus (estatus socioeconómico) contiene una descripción informal sobre el estatus socioeconómico de una persona. [15.2.2....">socecStatus</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sex" title="sex (sex) especifica el sexo de un organismo. [14.3.2.1. Personal Characteristics]">sex</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.socecStatus" title="socecStatus (estatus socioeconómico) contiene una descripción informal sobre el estatus socioeconómico de una persona. [16.2.2....">socecStatus</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.surname" title="surname (surname) contiene el apellido o nombre de família (heredado) en oposicion a un nombre asignado un nombre de bautismo o...">surname</a>
                         </span>
                       </div>
@@ -1818,7 +1836,7 @@ <h2>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gap" title="gap (gap) indicada un punto donde algún material ha sido omitido en una transcripción bien por criterios de edición descritos e...">gap</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gb" title="gb (gathering beginning) marks the beginning of a new gathering or quire in a transcribed codex. [3.11.3. Milestone Elements]">gb</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.gloss" title="gloss (gloss) identifica una locución o palabra usada para proporcionar una glosa o definición sobre otra palabra o frase. [3.4...">gloss</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.graphic" title="graphic (graphic) indica la localización de un gráfico ilustración o figura. [3.10. Graphics and Other Nontextual Components 11...">graphic</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.graphic" title="graphic (graphic) indica la localización de un gráfico ilustración o figura. [3.10. Graphics and Other Nontextual Components 12...">graphic</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.hi" title="hi (subrayado) marca una palabra o frase gráficamente diferente del resto del texto que la circunda por causas sobre las que no...">hi</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.index" title="index (entrada de un índice.) marca un punto para ser indexado por cualquier criterio. [3.9.2. Index Entries]">index</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.l" title="l (verso) contiene un único verso posiblemente incompleto. [3.13.1. Core Tags for Verse 3.13. Passages of Verse or Drama 7.2.5....">l</a>
@@ -1836,15 +1854,15 @@ <h2>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.note" title="note (note) contiene una nota o aclaración [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">note</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.noteGrp" title="noteGrp (note group) contains a group of notes [3.9.1.1. Encoding Grouped Notes]">noteGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.num" title="num (número) contiene un número escrito en cualquier forma. [3.6.3. Numbers and Measures]">num</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orig" title="orig (forma original) contiene una lectura que se marca como fiel al original. [3.5.2. Regularization and Normalization 12. Cri...">orig</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orig" title="orig (forma original) contiene una lectura que se marca como fiel al original. [3.5.2. Regularization and Normalization 13. Cri...">orig</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.para" title="&lt;para&gt;">para</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.pb" title="pb (inicio de página) marca el inicio de una nueva página de un texto en un documento paginado. [3.11.3. Milestone Elements]">pb</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ptr" title="ptr (puntero) define un señalizador a otra localización. [3.7. Simple Links and CrossReferences 16.1. Links]">ptr</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ptr" title="ptr (puntero) define un señalizador a otra localización. [3.7. Simple Links and CrossReferences 17.1. Links]">ptr</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.q" title="&lt;q&gt;">q</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.quote" title="quote (cita) contiene una frase o pasaje atribuido por el narrador o autor a un agente externo al texto. [3.3.3. Quotation 4.3....">quote</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ref" title="ref (referencia) define una referencia a otra localización posiblemente modificada por un texto o comentario adicional. [3.7. S...">ref</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.reg" title="reg (regularización) contiene una lectura que ha sido regularizada o normalizada en algún sentido. [3.5.2. Regularization and N...">reg</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [13.2.1. Personal Names 3.6.1. Referrin...">rs</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.rs" title="rs (serie referencial) contiene un nombre de intención general o una serie referencial. [14.2.1. Personal Names 3.6.1. Referrin...">rs</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ruby" title="ruby (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]">ruby</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.said" title="said (parlamento discurso o pensamiento) indica los pasajes pensados o hablados en voz alta si está indicado explícitamente en ...">said</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.sic" title="sic (Latin for thus or so) contiene texto reproducido aparentemente icorrecto o inexacto. [3.5.1. Apparent Errors]">sic</a>
@@ -1861,10 +1879,10 @@ <h2>
                     <div class="specChild" itemprop="ab">
                       <span class="specChildModule" itemprop="seg">figures:</span>
                       <span class="specChildElements" itemprop="seg">
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [14.4. Specific Elements for Graphic Images]">figure</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.formula" title="formula (formula) contiene una fórmula matemática o de otro tipo. [14.2. Formulæ and Mathematical Expressions]">formula</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [14.3. Notated Music in Written Text]">notatedMusic</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [14.1.1. TEI Tables]">table</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.figure" title="figure (figure) indica un bloque que contiene gráficos ilustraciones o figuras. [15.4. Specific Elements for Graphic Images]">figure</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.formula" title="formula (formula) contiene una fórmula matemática o de otro tipo. [15.2. Formulæ and Mathematical Expressions]">formula</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.notatedMusic" title="notatedMusic encodes the presence of music notation in a text [15.3. Notated Music in Written Text]">notatedMusic</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.table" title="table (table) contiene texto dispuedto en forma de tabla con filas y columnas. [15.1.1. TEI Tables]">table</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
@@ -1878,14 +1896,14 @@ <h2>
                       <span class="specChildModule" itemprop="seg">linking:</span>
                       <span class="specChildElements" itemprop="seg">
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.ab" title="ab (bloque anónimo) contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o...">ab</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [16.8. Alter...">alt</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [16.8. Alternation]">altGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [17.8. Alter...">alt</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.altGrp" title="altGrp (grupo de alternancia) agrupa un conjunto de elementos &lt;alt&gt; y de eventuales indicadores. [17.8. Alternation]">altGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.anchor" title="anchor (punto de anclaje) enlanza un indentificador con una posición al interno del texto independientemente del hecho que esta...">anchor</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [16.7. Agg...">join</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [16.7. Aggregation]">joinGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.join" title="join (join) identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen. [17.7. Agg...">join</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.joinGrp" title="joinGrp (grupo de enlace) agrupa un conjunto de elementos de enlace a eventuales señalizadores. [17.7. Aggregation]">joinGrp</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.link" title="link (link) define una asociación o vínculo hipertextual entre elementos o fragmentos de texto que no es especificable por otro...">link</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [16.1. Links]">linkGrp</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [16.3...">seg</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.linkGrp" title="linkGrp (grupo de enlace) define un conjunto de asociaciones o de vínculos hipertextuales. [17.1. Links]">linkGrp</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.seg" title="seg (segmento arbitrario) contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.) [17.3...">seg</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.timeline" title="timeline (escala temporal) indica una serie de puntos ordenados temporalmente los cuales pueden ser enlazados a los elementos d...">timeline</a>
                       </span>
                     </div>
@@ -1894,39 +1912,39 @@ <h2>
                       <span class="specChildElements" itemprop="seg">
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.addName" title="addName (nombre adicional) contiene un componente añadido al nombre como un sobrenombre un epíteto alias u otras eventuales exp...">addName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.affiliation" title="affiliation (affiliation) contiene una descripción informal de la afiliación presente o pasada de una persona a una determinada...">affiliation</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [13.2.3. Place Na...">bloc</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [13.3.4.3. States Traits and Events]">climate</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.bloc" title="bloc (bloc) contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países. [14.2.3. Place Na...">bloc</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.climate" title="climate (climate) contiene información sobre el clima físico de un lugar. [14.3.4.3. States Traits and Events]">climate</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.country" title="country (country) contiene el nombre de una unidad geopolítica como una nación país colonia etc. más grande o administrativamen...">country</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.district" title="district (district) contiene el nombre de cualquier subdivisión al interno de un asentamiento como una circunscripción un barri...">district</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]">eventName</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [13.2.1. Personal Names]">forename</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.eventName" title="eventName (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]">eventName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.forename" title="forename (forename) contiene el nombre de pila asignado en el bautismo. [14.2.1. Personal Names]">forename</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.genName" title="genName (componente de nombre generacional) contiene un componente del nombre utilizado para distinguir nombre similares entre ...">genName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geo" title="geo (coordenadas geográficas) contiene cualquier expresión de un conjunto de coordenadas geográficas representando un punto lín...">geo</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogFeat" title="geogFeat (nombre de un elemento geográfico.) contiene un nombre común que identifica elementos geográficos incluidos en un nomb...">geogFeat</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [13.2.3. Place N...">geogName</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [13....">listEvent</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [13.3.7. Names ...">listNym</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.geogName" title="geogName (nombre geográfico) un nombre asociado a un un elemento geográfico como valle Windrush o Monte Sinaí. [14.2.3. Place N...">geogName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listEvent" title="listEvent (list of events) contains a list of descriptions each of which provides information about an identifiable event. [14....">listEvent</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listNym" title="listNym (lista de nombres canónicos) contiene una lista de nyms es decir nombres estándard para cualquier cosa. [14.3.7. Names ...">listNym</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listObject" title="listObject (list of objects) contains a list of descriptions each of which provides information about an identifiable physical ...">listObject</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listOrg" title="listOrg (lista de organizaciones) contiene una lista de descripciones que proporciona a la información sobre una organización i...">listOrg</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPerson" title="listPerson (lista de personas) contiene una lista de descripciones y cada una de las cuales proporciona información relativa a ...">listPerson</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listPlace" title="listPlace (lista de lugares) contiene una lista de lugares seguida opcionalmente por una lista de interelaciones (a excepción d...">listPlace</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [13.3.2.3. Persona...">listRelation</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.listRelation" title="listRelation describe las relaciones o los lazos sociales entre los participantes de una interacción verbal. [14.3.2.3. Persona...">listRelation</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.location" title="location (location) define la localización de un lugar como conjunto de coordenadas geográficas en términos de alguna entidades...">location</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.nameLink" title="nameLink (name link) contiene un afijo de conexión al interno del nombre no considerado parte del nombre como p.ej. Van Der o D...">nameLink</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]">objectName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.objectName" title="objectName (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]">objectName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.offset" title="offset (offset) la parte de una expresión temporal o espacial relativa que indica la dirección del desfase entre dos nombres de...">offset</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [13.2.2. Organizational Names]">orgName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.orgName" title="orgName (nombre de una organización) contiene el nombre de una organización. [14.2.2. Organizational Names]">orgName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persName" title="persName (nombre propio de persona) contiene un nombre propio o un sintagma identificable como un nombre propio que se refiere ...">persName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.persPronouns" title="persPronouns (personal pronouns) indicates the personal pronouns used or assumed to be used by the individual being described. ...">persPronouns</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [13.2.3. Place Names]">placeName</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [13.3.4.3. States Traits and Events]">population</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.placeName" title="placeName (place name) contiene la indicación absoluta o relativa de un nombre de lugar. [14.2.3. Place Names]">placeName</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.population" title="population (population) contiene la información sobre la población de un lugar. [14.3.4.3. States Traits and Events]">population</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.region" title="region (region) &gt;contiene el nombre de una unidad administrativa como un estado una región o una província que sea mayor que un...">region</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.roleName" title="roleName (role name) contiene un componente del nombre que indica un rol o una posición específica a nivel social como en el ca...">roleName</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.settlement" title="settlement (settlement) contiene el nombre de un asentamiento del tipo ciudad pueblo villa etc. identificado como una unidad ge...">settlement</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [13.3.1. Basic Princ...">state</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.state" title="state (state) especifica un componente de una referencia canónica definida por el método milestone (hito). [14.3.1. Basic Princ...">state</a>
                         <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.surname" title="surname (surname) contiene el apellido o nombre de família (heredado) en oposicion a un nombre asignado un nombre de bautismo o...">surname</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [13.3.4.3. States Traits and Events]">terrain</a>
-                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [13.3.1. B...">trait</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.terrain" title="terrain (terrain) contiene información sobre el terreno físico de un lugar. [14.3.4.3. States Traits and Events]">terrain</a>
+                        <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.trait" title="trait (trait) contiene la descripción de una característica personal o cultural determinada atribuida a una persona. [14.3.1. B...">trait</a>
                       </span>
                     </div>
                     <div class="specChild" itemprop="ab">
@@ -1955,7 +1973,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Ejemplo</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div id="index.xml-egXML-d33e3743" class="pre egXML_valid">It is spelled 
+                  <div id="index.xml-egXML-d33e3761" class="pre egXML_valid">It is spelled 
                   <span class="element">&lt;q&gt;</span>Tübingen
                   <span class="element">&lt;/q&gt;</span>— to enter the letter 
                   <span class="element">&lt;q&gt;</span>u
@@ -1971,12 +1989,12 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Content model</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <pre id="index.xml-eg-d33e3757" class="pre_eg cdata">
+                  <pre id="index.xml-eg-d33e3775" class="pre_eg cdata">
 &lt;content&gt;
  &lt;macroRef key="macro.specialPara"/&gt;
 &lt;/content&gt;
     
-<a href="#index.xml-eg-d33e3757" class="anchorlink">⚓</a>
+<a href="#index.xml-eg-d33e3775" class="anchorlink">⚓</a>
 </pre>
                 </td>
               </tr>
@@ -1985,13 +2003,15 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Declaración</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <pre id="index.xml-eg-d33e3764" class="pre_eg">
+                  <pre id="index.xml-eg-d33e3782" class="pre_eg">
 element q
 {
    
 <a class="link_ref" itemprop="ref" href="#TEI.att.global" title="att.global proporciona un conjunto de atributos común a todos los elementos del esquema de codificación TEI. [1.3.1.1. Global A...">att.global.attributes</a>,
    
 <a class="link_ref" itemprop="ref" href="#TEI.att.ascribed.directed" title="att.ascribed.directed provides attributes for elements representing speech or action that can be directed at a group or individ...">att.ascribed.directed.attributes</a>,
+   
+<a class="link_ref" itemprop="ref" href="#TEI.att.cmc" title="att.cmc (computermediated communication) provides attributes categorizing how the element content was created in a CMC environm...">att.cmc.attributes</a>,
    attribute typ
    {
       "spoken"
@@ -2007,7 +2027,7 @@ <h2>
    
 <a class="link_ref" itemprop="ref" href="#TEI.macro.specialPara" title="macro.specialPara (contenido de párrafo especial) define el modelo de contenido de elementos tipo notas o entradas de lista que...">macro.specialPara</a>
 }
-<a href="#index.xml-eg-d33e3764" class="anchorlink">⚓</a>
+<a href="#index.xml-eg-d33e3782" class="anchorlink">⚓</a>
 </pre>
                 </td>
               </tr>
@@ -2035,7 +2055,7 @@ <h1>
               <a class="link_ref" itemprop="ref" href="#TEI.TEI" title="TEI (documento TEI) contiene un solo documento conforme a la norma TEI combinando un solo encabezado TEI (teiHeader) con uno o ...">&lt;TEI&gt;</a>o 
               <a class="link_ref" itemprop="ref" href="#TEI.teiCorpus" title="teiCorpus (TEI corpus) contiene la totalidad de un corpus TEI codificado comprendiendo un único encabezado y uno o más elemento...">&lt;teiCorpus&gt;</a>.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.ab">
@@ -2044,7 +2064,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">bloque anónimo</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o de elementos de internivel similares al párrafo pero sin la carga semántica de este último.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.abbr">
@@ -2079,7 +2099,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">nombre adicional</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un componente añadido al nombre, como un sobrenombre, un epíteto, alias u otras eventuales expresiones utilizadas al interno de un nombre propio de persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.addrLine">
@@ -2110,7 +2130,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">affiliation</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una descripción informal de la afiliación presente o pasada de una persona a una determinada organización, p.ej. un empleado o un patrocinador.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.age">
@@ -2119,7 +2139,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">age</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">especifica la edad de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.alt">
@@ -2128,7 +2148,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">alternancia</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.altGrp">
@@ -2137,8 +2157,8 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">grupo de alternancia</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">agrupa un conjunto de elementos 
-              <a class="link_ref" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [16.8. Alter...">&lt;alt&gt;</a>y de eventuales indicadores.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</a>]</td>
+              <a class="link_ref" itemprop="ref" href="#TEI.alt" title="alt (alternancia) identifica una alternancia o una serie de elecciones entre los elementos o los pasajes de texto. [17.8. Alter...">&lt;alt&gt;</a>y de eventuales indicadores.</span>[
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.analytic">
@@ -2157,7 +2177,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">punto de anclaje</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta corresponda o no a un elemento textual.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSSAPA">8.4.2. Synchronization and Overlap</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">16.5. Correspondence and Alignment</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">17.5. Correspondence and Alignment</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.annotation">
@@ -2165,7 +2185,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-annotation.html">annotation</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">represents an annotation following the Web Annotation Data Model.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.appInfo">
@@ -2243,7 +2263,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes for indicating calendar systems to which a date belongs.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.canonical">
@@ -2251,7 +2271,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.canonical.html">att.canonical</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.citeStructurePart">
@@ -2268,6 +2288,14 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes for specifying the specific part of a bibliographic item being cited.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
+            <tr itemprop="row">
+              <td id="TEI.att.cmc">
+              <span class="hi" itemprop="hi">
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.cmc.html">att.cmc</a>
+              </span>: (
+              <span xml:lang="en" lang="en" itemprop="seg">computer-mediated communication</span>) 
+              <span xml:lang="en" lang="en" itemprop="seg">provides attributes categorizing how the element content was created in a CMC environment.</span></td>
+            </tr>
             <tr itemprop="row">
               <td id="TEI.att.datable">
               <span class="hi" itemprop="hi">
@@ -2275,7 +2303,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">atributos para registrar expresiones temporales normalizadas.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.datable.custom">
@@ -2283,7 +2311,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.datable.custom.html">att.datable.custom</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes for normalization of elements that contain datable events to a custom dating system (i.e. other than the Gregorian used by W3 and ISO).</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.datable.iso">
@@ -2292,7 +2320,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos para la normalización de elementos que contienen eventos datables usando el estándard ISO 8601:2004.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.datable.w3c">
@@ -2301,7 +2329,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">proporciona atributos para la normalización de elementos que contienen eventos datables.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.datcat">
@@ -2309,8 +2337,8 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.datcat.html">att.datcat</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by an external taxonomy, in this way establishing the identity of information containers and values, and providing means of interpreting them.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">9.5.2. Lexical View</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">18.3. Other Atomic Feature Values</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">10.5.2. Lexical View</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">19.3. Other Atomic Feature Values</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.declarable">
@@ -2319,7 +2347,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">proporciona atributos para los elementos contenidos en el encabezado que pueden ser seleccionados autónomamente mediante el atributo 
               <span class="att" itemprop="hi">decls</span>adecuado.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual Information with a Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual Information with a Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.declaring">
@@ -2327,7 +2355,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.declaring.html">att.declaring</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos a los elementos que pueden ser asociados autonomamente a un elemento determinado declarado en el encabezado, no teniendo en cuenta el default heredato por aquel elemento.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual Information with a Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual Information with a Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.dimensions">
@@ -2358,9 +2386,9 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">proporciona atributos que describen la naturaleza de una intervención crítica codificada o una interpretación de cualquier tipo.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">10.3.1. Origination</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">11.3.1. Origination</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.edition">
@@ -2398,7 +2426,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.global.linking.html">att.global.linking</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">define un conjunto de atributos para hipertexto u otro vínculo habilitado para todos los elementos cuando se selecciona la etiqueta adicional para los enlaces.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.global.rendition">
@@ -2416,9 +2444,9 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes indicating the agent responsible for some aspect of the text, the markup or something asserted by the markup, and the degree of certainty associated with it.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STGAso">1.3.1.1.4. Sources, certainty, and responsibility</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">11.3.2.2. Hand, Responsibility, and Certainty Attributes</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">17.3. Spans and Interpretations</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">12.3.2.2. Hand, Responsibility, and Certainty Attributes</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">18.3. Spans and Interpretations</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.global.source">
@@ -2436,7 +2464,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.handFeatures.html">att.handFeatures</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.internetMedia">
@@ -2452,7 +2480,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes for referencing locations by pointing to entries in a canonical list of places.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HDUDECL">2.3.9. The Unit Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.measurement">
@@ -2485,7 +2513,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">identifica los atributos comunes a los elementos que se refieren a personas, lugares, organizaciones, etc. indicados por nombre</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">13.3.7. Names and Nyms</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">14.3.7. Names and Nyms</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.notated">
@@ -2500,7 +2528,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.patternReplacement.html">att.patternReplacement</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes for regular-expression matching and replacement.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54M">2.3.6.3. Milestone Method</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54">2.3.6. The Reference System Declaration</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54S">2.3.6.2. Search-and-Replace Method</a>]</td>
@@ -2512,7 +2540,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">atributos para los componentes de nombres propios de persona</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">atributos comunes para los elementos que forman parte de un nombre propio de persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.placement">
@@ -2521,7 +2549,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos para describir en que página u objeto de la fuente aparece el elemento textual.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.pointing">
@@ -2538,7 +2566,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.pointing.group.html">att.pointing.group</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">define un conjunto de atributos comunes a todos los elementos que incluyen grupos de indicadores.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.ranging">
@@ -2560,8 +2588,8 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.segLike.html">att.segLike</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos a los elementos usados para una segmentación arbitraria.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.sortable">
@@ -2569,7 +2597,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.sortable.html">att.sortable</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides attributes for elements in lists or groups that are sortable, but whose sorting key cannot be derived mechanically from the element content.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.spanning">
@@ -2577,7 +2605,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.spanning.html">att.spanning</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos para elementos que delimitan un fragmento de texto utilizando los señalizadores en lugar de cerrando el texto.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
             <tr itemprop="row">
@@ -2593,7 +2621,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.tableDecoration.html">att.tableDecoration</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona atributos usados para decorar filas o celdas de una tabla.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FT">14. Tables, Formulæ, Graphics, and Notated Music</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FT">15. Tables, Formulæ, Graphics, and Notated Music</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.timed">
@@ -2609,7 +2637,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-att.transcriptional.html">att.transcriptional</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona a los atributos específicos a los elementos que codifican la intervención authorial o scribal en un texto al transcribir el manuscrito o las fuentes similares.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.att.written">
@@ -2666,7 +2694,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">contiene una cita bibliográfica estructurada libremente, los componentes de la cual pueden nohaber sido etiquetados explícitamente.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.biblFull">
@@ -2678,7 +2706,7 @@ <h1>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.biblScope">
@@ -2698,7 +2726,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene una cita bibliográfica estructurada, en la cual sólo aparecen los subelementos bibliográficos y en un orden especificado.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.binaryObject">
@@ -2715,7 +2743,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">birth</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene información relativa al nacimiento de una persona, p.ej. fecha y lugar de nacimiento.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.bloc">
@@ -2724,7 +2752,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">bloc</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el nombre de una unidad geopolítica que comprende uno o más estados nacionales o países.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.body">
@@ -2819,7 +2847,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">cell</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una celda de una tabla.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">14.1.1. TEI Tables</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">15.1.1. TEI Tables</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.change">
@@ -2830,7 +2858,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">resume un cambio o corrección determinada llevada a cabo en una versión dada de un texto electrónico en el que trabajan diversos investigadores.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4C">2.4.1. Creation</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.choice">
@@ -2850,7 +2878,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">Una cita de algún otro documento junto a la referencia bibliográfica a la fuente.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHQQ">3.3.3. Quotation</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">9.3.5.1. Examples</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">10.3.5.1. Examples</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.citeData">
@@ -2860,7 +2888,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">citation data</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">specifies how information may be extracted from citation structures.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.citeStructure">
@@ -2870,7 +2898,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">citation structure</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">declares a structure and method for citing the current document.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.citedRange">
@@ -2907,7 +2935,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">climate</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene información sobre el clima físico de un lugar.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.closer">
@@ -2944,7 +2972,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">principios de corrección</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">describe cómo y en qué casos se han hecho correcciones en el texto.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.correspAction">
@@ -2980,7 +3008,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">country</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el nombre de una unidad geopolítica, como una nación, país, colonia, etc. más grande o administrativamente superior que una región y más pequeño que un bloque.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.creation">
@@ -3003,8 +3031,8 @@ <h1>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">15.2.3. The Setting Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">16.2.3. The Setting Description</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.dateline">
@@ -3022,7 +3050,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">death</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene informaciones relativas a la defunción de una persona, del tipo lugar y fecha.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.del">
@@ -3040,7 +3068,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">descripción</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene una breve descripción del objetivo y la aplicación de un elemento, atributo o valor de un atributo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.distinct">
@@ -3066,7 +3094,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">district</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el nombre de cualquier subdivisión al interno de un asentamiento, como una circunscripción, un barrio u otras unidades administrativas o geográficas.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.div1">
@@ -3222,7 +3250,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">proporciona detalles de principios editoriales y prácticas aplicadas en la codificación de un texto.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.education">
@@ -3231,7 +3259,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">education</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una descripción sobre la experiencia formativa de una persona</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.ellipsis">
@@ -3289,7 +3317,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">event</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene datos relacionados con cualquier tipo de evento significativo asociado con una persona, lugar u organización.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.eventName">
@@ -3298,7 +3326,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">name of an event</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">contains a proper noun or noun phrase used to refer to an event.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDEVTN">13.2.4. Event Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDEVTN">14.2.4. Event Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.expan">
@@ -3319,7 +3347,7 @@ <h1>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD23">2.2.3. Type and Extent of File</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">10.7.1. Object Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">11.7.1. Object Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.faith">
@@ -3328,7 +3356,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">faith</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">indica la fe, religión, o creencias de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.figDesc">
@@ -3337,7 +3365,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">descripción de una figura</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una breve descripción de la apariencia o del contenido de una figura gráfica, para utilizarla al documentar una imagen sin mostrarla.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">14.4. Specific Elements for Graphic Images</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">15.4. Specific Elements for Graphic Images</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.figure">
@@ -3346,7 +3374,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">figure</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">indica un bloque que contiene gráficos, ilustraciones o figuras.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">14.4. Specific Elements for Graphic Images</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTGRA">15.4. Specific Elements for Graphic Images</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.fileDesc">
@@ -3374,7 +3402,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">floruit</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene información relativa al periodo de actividad de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.foreign">
@@ -3392,7 +3420,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">forename</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el nombre de pila asignado en el bautismo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.formula">
@@ -3401,7 +3429,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">formula</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una fórmula matemática o de otro tipo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTFOR">14.2. Formulæ and Mathematical Expressions</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTFOR">15.2. Formulæ and Mathematical Expressions</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.front">
@@ -3447,7 +3475,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">componente de nombre generacional</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un componente del nombre utilizado para distinguir nombre similares entre ellos atendiendo a la diferencia de edad o de pertenencia a generaciones distintas que se establece entre las personas nombradas.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.gender">
@@ -3456,7 +3484,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">gender</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">especifica la identidad de género de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.geo">
@@ -3465,7 +3493,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">coordenadas geográficas</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene cualquier expresión de un conjunto de coordenadas geográficas, representando un punto, línea o área en la superficie de la tierra en alguna anotación.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGva">13.3.4.1. Varieties of Location</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGva">14.3.4.1. Varieties of Location</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.geoDecl">
@@ -3484,7 +3512,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">nombre de un elemento geográfico.</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene un nombre común que identifica elementos geográficos incluidos en un nombre propio geográfico, como valle, monte, etc.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.geogName">
@@ -3493,7 +3521,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">nombre geográfico</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">un nombre asociado a un un elemento geográfico, como valle Windrush o Monte Sinaí.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.gloss">
@@ -3503,7 +3531,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">gloss</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">identifica una locución o palabra usada para proporcionar una glosa o definición sobre otra palabra o frase.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHTG">3.4.1. Terms and Glosses</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.graphic">
@@ -3513,7 +3541,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">graphic</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">indica la localización de un gráfico, ilustración o figura.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COGR">3.10. Graphics and Other Non-textual Components</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.group">
@@ -3524,7 +3552,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">contiene el cuerpo de un texto compuesto, es decir, que agrupa un conjunto de textos distintos (o grupos de textos) considerados como una unidad por criterios determinados, por ejemplo la obra completa de un autor, una serie de ensayos, etc.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.handNote">
@@ -3533,7 +3561,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">notas sobre la mano</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">describe un determinado estilo o una determinada mano al interno de un manuscrito.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.head">
@@ -3580,7 +3608,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">hyphenation</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">indica el modo en que han sido tratados el uso del guión presente en el texto fuente en la versión codificada de este.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.idno">
@@ -3589,7 +3617,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">número identificativo</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona un identificador estándar para un objecto; se usa parla la identificación de, por ejemplo, un elemento bibliográfico, una persona, un título o una organización.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD26">2.2.5. The Series Statement</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>]</td>
@@ -3646,7 +3674,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">join</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">identifica un segmento o fragmento de texto señalando eventuales elementos no contiguos que lo componen.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.joinGrp">
@@ -3655,7 +3683,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">grupo de enlace</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa un conjunto de elementos de enlace a eventuales señalizadores.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.keywords">
@@ -3693,8 +3721,8 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">conocimiento del lenguaje</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">resume los conocimientos lingüísticos de una persona de forma descriptiva o a través de una lista de elementos 
-              <a class="link_ref" itemprop="ref" href="#TEI.langKnown" title="langKnown (competencia lingüística) resume la competencia de una persona en la lengua indicada. [15.2.2. The Participant Descri...">&lt;langKnown&gt;</a></span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="#TEI.langKnown" title="langKnown (competencia lingüística) resume la competencia de una persona en la lengua indicada. [16.2.2. The Participant Descri...">&lt;langKnown&gt;</a></span>[
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.langKnown">
@@ -3703,7 +3731,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">competencia lingüística</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">resume la competencia de una persona en la lengua indicada.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.langUsage">
@@ -3714,7 +3742,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">describe las lenguas, jergas, registros, dialectos, etc. presentes en el texto.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD41">2.4.2. Language Usage</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4">2.4. The Profile Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.language">
@@ -3761,7 +3789,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">link</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">define una asociación o vínculo hipertextual entre elementos o fragmentos de texto que no es especificable por otros elementos.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.linkGrp">
@@ -3770,7 +3798,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">grupo de enlace</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">define un conjunto de asociaciones o de vínculos hipertextuales.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.list">
@@ -3787,11 +3815,11 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-listAnnotation.html">listAnnotation</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">contains a list of annotations, typically encoded as 
-              <a class="link_ref" itemprop="ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container]">&lt;annotation&gt;</a>, 
+              <a class="link_ref" itemprop="ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container]">&lt;annotation&gt;</a>, 
               <span class="gi">&lt;annotationBlock&gt;</span>, or 
               <a class="link_ref" itemprop="ref" href="#TEI.note" title="note (note) contiene una nota o aclaración [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">&lt;note&gt;</a>, possibly organized with nested 
               <a class="link_ref" itemprop="ref" href="#TEI.listAnnotation" title="listAnnotation contains a list of annotations typically encoded as &lt;annotation&gt; annotationBlock or &lt;note&gt; possibly organized wi...">&lt;listAnnotation&gt;</a>elements.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listBibl">
@@ -3802,7 +3830,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">contiene una lista de citas bibliográficas de cualquier tipo.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listChange">
@@ -3811,7 +3839,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listEvent">
@@ -3820,7 +3848,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">list of events</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">contains a list of descriptions, each of which provides information about an identifiable event.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listNym">
@@ -3829,7 +3857,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">lista de nombres canónicos</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una lista de nyms, es decir, nombres estándard para cualquier cosa.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">13.3.7. Names and Nyms</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">14.3.7. Names and Nyms</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listObject">
@@ -3838,7 +3866,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">list of objects</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">contains a list of descriptions, each of which provides information about an identifiable physical object.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJ">13.3.6. Objects</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJ">14.3.6. Objects</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listOrg">
@@ -3847,7 +3875,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">lista de organizaciones</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene una lista de descripciones, que proporciona a la información sobre una organización identificable.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDORG">13.2.2. Organizational Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDORG">14.2.2. Organizational Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listPerson">
@@ -3856,10 +3884,10 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">lista de personas</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una lista de descripciones, y cada una de las cuales proporciona información relativa a una persona específica o a un grupo de personas, p.ej, los participantes de una interacción verbal o las personas referidas en una fuente histórica.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAH">15.2. Contextual Information</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAH">16.2. Contextual Information</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4">2.4. The Profile Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listPlace">
@@ -3869,7 +3897,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">lista de lugares</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una lista de lugares, seguida opcionalmente por una lista de interelaciones (a excepción de la inclusión) definidas entre ellos.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOG">13.3.4. Places</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOG">14.3.4. Places</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listPrefixDef">
@@ -3879,7 +3907,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">list of prefix definitions</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">contains a list of definitions of prefixing schemes used in 
               <span class="ident-datatype">teidata.pointer</span>values, showing how abbreviated URIs using each scheme may be expanded into full URIs.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.listRelation">
@@ -3887,7 +3915,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-listRelation.html">listRelation</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">describe las relaciones o los lazos sociales entre los participantes de una interacción verbal.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">13.3.2.3. Personal Relationships</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">14.3.2.3. Personal Relationships</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.location">
@@ -3896,7 +3924,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">location</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">define la localización de un lugar como conjunto de coordenadas geográficas, en términos de alguna entidades geopolítica dada, o como dirección.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOG">13.3.4. Places</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOG">14.3.4. Places</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.macro.abContent">
@@ -3968,7 +3996,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">grupo de medida</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un grupo de especificaciones dimensionales que se relacionan con un mismo objeto, por ejemplo la altura y la anchura de una página de manuscrito.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">10.3.4. Dimensions</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">11.3.4. Dimensions</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.media">
@@ -4025,7 +4053,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.annotationLike.html">model.annotationLike</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">groups elements used to represent annotations.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.annotationPart.body">
@@ -4033,7 +4061,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.annotationPart.body.html">model.annotationPart.body</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">groups elements which may be used as an 
-              <a class="link_ref" itemprop="ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container]">&lt;annotation&gt;</a>body.</span></td>
+              <a class="link_ref" itemprop="ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container]">&lt;annotation&gt;</a>body.</span></td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.applicationLike">
@@ -4095,10 +4123,24 @@ <h1>
               <span class="hi" itemprop="hi">
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.choicePart.html">model.choicePart</a>
               </span>: 
-              <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa los elementos (excluída el propio elemento "choice") que pueden ser usados en alternancia con 
+              <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa los elementos (excluída el propio elemento 
+              <span class="q" itemprop="q">‘choice’</span>) que pueden ser usados en alternancia con 
               <a class="link_ref" itemprop="ref" href="#TEI.choice" title="choice (choice) agrupa un número de codificaciones alternativas para el mismo punto en un texto. [3.5. Simple Editorial Changes...">&lt;choice&gt;</a>.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>]</td>
             </tr>
+            <tr itemprop="row">
+              <td id="TEI.model.cmc">
+              <span class="hi" itemprop="hi">
+                <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.cmc.html">model.cmc</a>
+              </span>: 
+              <span xml:lang="en" lang="en" itemprop="seg">includes the CMC-specific element 
+              <span class="gi">&lt;post&gt;</span>and makes it available on the divPart level. This allows for using (and combining) occurrences of 
+              <span class="gi">&lt;post&gt;</span>, 
+              <span class="gi">&lt;u&gt;</span>, 
+              <span class="gi">&lt;incident&gt;</span>, and 
+              <span class="gi">&lt;kinesic&gt;</span>in one and the same 
+              <a class="link_ref" itemprop="ref" href="#TEI.div" title="&lt;div&gt;">&lt;div&gt;</a>in order to be able to represent the combined use of written and spoken posts, utterances, and nonverbal acts on the GUI of multimodal CMC environments.</span></td>
+            </tr>
             <tr itemprop="row">
               <td id="TEI.model.common">
               <span class="hi" itemprop="hi">
@@ -4135,7 +4177,7 @@ <h1>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">agrupa elementos que contienen expresiones temporales.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.descLike">
@@ -4277,7 +4319,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.egLike.html">model.egLike</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa elementos que contienen ejemplos.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">22.1.1. Phrase Level Terms</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">23.1.1. Phrase Level Terms</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.emphLike">
@@ -4301,7 +4343,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.entryPart.html">model.entryPart</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa todos los elementos definidos específicamente para diccionarios.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.eventLike">
@@ -4502,7 +4544,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.offsetLike.html">model.offsetLike</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">agrupa los elementos que pueden aparecer solamente como parte de un topónimo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.orgPart">
@@ -4556,7 +4598,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.pPart.msdesc.html">model.pPart.msdesc</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa les elementos empleados en la descripción de manuscritos.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">10. Manuscript Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">11. Manuscript Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.pPart.transcriptional">
@@ -4580,7 +4622,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.persNamePart.html">model.persNamePart</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa los elementos que componen un nombre propio de persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.persStateLike">
@@ -4602,7 +4644,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.personPart.html">model.personPart</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa elementos que describen determinadas características de las personas a las cuales se hace referencia en el texto o que participan en una interacción verbal.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.phrase">
@@ -4618,7 +4660,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.phrase.xml.html">model.phrase.xml</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa elementos usados para codificar construcciones en XML en el nivel sintagmático, p.ej. nombre de elemento, nombres de atributo, y valores de atributo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.placeLike">
@@ -4633,7 +4675,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.placeNamePart.html">model.placeNamePart</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa los elementos que forman parte del nombre de un lugar</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.placeStateLike">
@@ -4704,8 +4746,8 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.segLike.html">model.segLike</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">agrupa elementos usados por una segmentación arbitraria.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.sourceDescPart">
@@ -4721,7 +4763,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-model.specDescLike.html">model.specDescLike</a>
               </span>: 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">agrupa elementos para referir elementos de especificación</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.model.stageLike">
@@ -4784,7 +4826,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">name link</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un afijo de conexión al interno del nombre no considerado parte del nombre, como p.ej. Van Der, o De Las.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.namespace">
@@ -4802,7 +4844,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">nationality</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una descripción informal de la nacionalidad o ciudadanía presente o pasada de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.normalization">
@@ -4812,7 +4854,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">normalization</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">indica el grado de normalización o de regularización aplicado a la fuente original en el proceso de conversión a formato electrónico.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.notatedMusic">
@@ -4820,7 +4862,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-notatedMusic.html">notatedMusic</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">encodes the presence of music notation in a text</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTNM">14.3. Notated Music in Written Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTNM">15.3. Notated Music in Written Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.note">
@@ -4832,7 +4874,7 @@ <h1>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONONO">3.9.1. Notes and Simple Annotation</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD27">2.2.6. The Notes Statement</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICON">3.12.2.8. Notes and Statement of Language</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">9.3.5.4. Notes within Entries</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">10.3.5.4. Notes within Entries</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.noteGrp">
@@ -4869,7 +4911,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">nombre canónico</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene la definición para un nombre canónico o parte de nombre de cualquier tipo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">13.3.7. Names and Nyms</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">14.3.7. Names and Nyms</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.object">
@@ -4877,7 +4919,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-object.html">object</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">contains a description of a single identifiable physical object.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJ">13.3.6. Objects</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJ">14.3.6. Objects</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.objectIdentifier">
@@ -4886,7 +4928,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">object identifier</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">groups one or more identifiers or pieces of locating information concerning a single object.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJ">13.3.6. Objects</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJ">14.3.6. Objects</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.objectName">
@@ -4895,7 +4937,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">name of an object</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">contains a proper noun or noun phrase used to refer to an object.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJN">13.2.5. Object Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDOBJN">14.2.5. Object Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.occupation">
@@ -4904,7 +4946,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">occupation</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una descripción informal de las actividades, la profesión o la ocupación de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.offset">
@@ -4913,7 +4955,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">offset</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">la parte de una expresión temporal o espacial relativa que indica la dirección del desfase entre dos nombres de lugar, fecha u horario al interno de la expresión.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.opener">
@@ -4931,7 +4973,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">organización</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona a la información sobre una organización identificable tal como un negocio, una tribu, o cualquier otro grupo de personas.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND-org">13.3.3. Organizational Data</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND-org">14.3.3. Organizational Data</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.orgName">
@@ -4940,7 +4982,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">nombre de una organización</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el nombre de una organización.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDORG">13.2.2. Organizational Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDORG">14.2.2. Organizational Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.orig">
@@ -4950,7 +4992,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">forma original</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una lectura que se marca como fiel al original.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and Normalization</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.pb">
@@ -4968,7 +5010,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">nombre propio de persona</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene un nombre propio o un sintagma identificable como un nombre propio, que se refiere a una persona y puede incluir cualquier o todos los nombres de pila, apellidos, títulos honoríficos, o nombres añadidos de la persona en cuestión.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.persPronouns">
@@ -4977,7 +5019,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">personal pronouns</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">indicates the personal pronouns used, or assumed to be used, by the individual being described.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.person">
@@ -4986,8 +5028,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">person</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona información relativa a un individuo específico, p.ej. un participante de una interacción verbal o una persona identificada por una fuente histórica.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.personGrp">
@@ -4996,7 +5038,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">grupo de personas</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">describe a un grupo de individuos considerados como una única persona para fines analíticos.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.persona">
@@ -5004,7 +5046,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-persona.html">persona</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">provides information about one of the personalities identified for a given individual, where an individual has multiple personalities.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.place">
@@ -5013,7 +5055,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">place</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene los datos sobre una localización geográfica</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOG">13.3.4. Places</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOG">14.3.4. Places</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.placeName">
@@ -5022,7 +5064,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">place name</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene la indicación absoluta o relativa de un nombre de lugar.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.population">
@@ -5031,7 +5073,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">population</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene la información sobre la población de un lugar.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.postBox">
@@ -5067,7 +5109,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">prefix definition</span>) 
               <span xml:lang="en" lang="en" itemprop="seg">defines a prefixing scheme used in 
               <span class="ident-datatype">teidata.pointer</span>values, showing how abbreviated URIs using the scheme may be expanded into full URIs.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.principal">
@@ -5097,7 +5139,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">describe con detalle el objetivo o propósito para el que un archivo electrónico ha sido codificado, junto a cualquier otra información relevante sobre el proceso de codificación.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD51">2.3.1. The Project Description</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.ptr">
@@ -5107,7 +5149,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">puntero</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">define un señalizador a otra localización.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.pubPlace">
@@ -5155,7 +5197,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">quotation</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">indica las prácticas editoriales adoptadas respecto al entrecomillado en el original.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.quote">
@@ -5184,7 +5226,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">referencia</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">define una referencia a otra localización, posiblemente modificada por un texto o comentario adicional.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.refState">
@@ -5215,7 +5257,7 @@ <h1>
               <span xml:lang="es" lang="es" itemprop="seg">regularización</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una lectura que ha sido regularizada o normalizada en algún sentido.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and Normalization</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.region">
@@ -5224,7 +5266,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">region</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">&gt;contiene el nombre de una unidad administrativa, como un estado, una región o una província, que sea mayor que un pequeño asentamiento, pero menor a un país.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.relatedItem">
@@ -5241,7 +5283,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">relación</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">describe cualquier tipo de relación o vínculo entre un determinato grupo de personas.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">13.3.2.3. Personal Relationships</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">14.3.2.3. Personal Relationships</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.rendition">
@@ -5259,7 +5301,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">residencia</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">describe el lugar de residencia presente o pasado de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.resp">
@@ -5302,7 +5344,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">role name</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un componente del nombre que indica un rol o una posición específica a nivel social, como en el caso de títulos oficiales o de grado militar.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.row">
@@ -5311,7 +5353,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">row</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una fila de la tabla.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">14.1.1. TEI Tables</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">15.1.1. TEI Tables</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.rs">
@@ -5320,7 +5362,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">serie referencial</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un nombre de intención general o una serie referencial.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>]</td>
             </tr>
             <tr itemprop="row">
@@ -5368,7 +5410,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene una descripción en prosa sobre los fundamentos y métodos usados en textos de muestra en la creación de un corpus o una selección de textos.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD52">2.3.2. The Sampling Declaration</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.schemaRef">
@@ -5385,7 +5427,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-scriptNote.html">scriptNote</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">describes a particular script distinguished within the description of a manuscript or similar resource.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.seg">
@@ -5394,7 +5436,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">segmento arbitrario</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene cualquier unidad textual a nivel sintagmático (inclusive otros elementos de tipo seg.)</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/VE.html#VESE">6.2. Components of the Verse Line</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DR.html#DRPAL">7.2.5. Speech Contents</a>]</td>
             </tr>
@@ -5406,7 +5448,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">segmentation</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">describe los principios aplicados en la fragmentación del texto, p.ej. en las oraciones, sintagmas, morfemas, etc.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.series">
@@ -5434,7 +5476,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">settlement</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el nombre de un asentamiento, del tipo ciudad, pueblo, villa etc. identificado como una unidad geopolítica o administrativa.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.sex">
@@ -5443,7 +5485,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">sex</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">especifica el sexo de un organismo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.sic">
@@ -5479,7 +5521,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">estatus socio-económico</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una descripción informal sobre el estatus socio-económico de una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">15.2.2. The Participant Description</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHPA">16.2.2. The Participant Description</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.sourceDesc">
@@ -5535,7 +5577,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-standOff.html">standOff</a>
               </span>: 
               <span xml:lang="en" lang="en" itemprop="seg">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.state">
@@ -5544,8 +5586,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">state</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">especifica un componente de una referencia canónica definida por el método milestone (hito).</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.stdVals">
@@ -5555,7 +5597,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">valores estándard</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">indica el formato usado cuando aparecen fechas estandarizadas o valores numéricos.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.street">
@@ -5581,7 +5623,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">surname</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene el apellido o nombre de família (heredado), en oposicion a un nombre asignado, un nombre de bautismo o un sobranombre.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.table">
@@ -5590,7 +5632,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">table</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene texto dispuedto en forma de tabla, con filas y columnas.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">14.1.1. TEI Tables</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FT.html#FTTAB1">15.1.1. TEI Tables</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.tagUsage">
@@ -5628,7 +5670,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">TEI corpus</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene la totalidad de un corpus TEI codificado, comprendiendo un único encabezado y uno o más elementos TEI, cada uno de los cuales tiene a su vez un único encabezado y un texto.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.teiHeader">
@@ -5638,7 +5680,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">Encabezado TEI</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">proporciona información descriptiva y declarativa de una página de título electrónico prefijada como un texto conforme a TEI.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD11">2.1.1. The TEI Header and Its Components</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.teidata.certainty">
@@ -5865,7 +5907,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">terrain</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene información sobre el terreno físico de un lugar.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.text">
@@ -5875,7 +5917,7 @@ <h1>
               <span xml:lang="en" lang="en" itemprop="seg">text</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene un único texto de cualquier tipo, sea este unitario o combinado, p.ej. un texto en verso o teatral, una recopilación de ensayos, una novela, un diccionario, o una fragmento de corpus.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.textClass">
@@ -5895,7 +5937,7 @@ <h1>
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">describe las lenguas y los sistemas de escritura usados en un manuscrito (no se ha de confundir con la descripción contenida en el elemento 
               <a class="link_ref" itemprop="ref" href="#TEI.langUsage" title="langUsage (lengua empleada) describe las lenguas jergas registros dialectos etc. presentes en el texto. [2.4.2. Language Usage ...">&lt;langUsage&gt;</a>. ****</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">10.6.6. Languages and Writing Systems</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">11.6.6. Languages and Writing Systems</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.time">
@@ -5913,7 +5955,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">escala temporal</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">indica una serie de puntos ordenados temporalmente los cuales pueden ser enlazados a los elementos de un texto hablado a fin de obtener un alineamiento temporal del texto mismo.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.title">
@@ -5970,8 +6012,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en" itemprop="seg">trait</span>) 
               <span xml:lang="es" lang="es" class="outOfDateTranslation" itemprop="seg">contiene la descripción de una característica personal o cultural determinada atribuida a una persona.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">13.3.2.1. Personal Characteristics</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSEpc">14.3.2.1. Personal Characteristics</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.unclear">
@@ -5980,7 +6022,7 @@ <h1>
               </span>: (
               <span xml:lang="es" lang="es" itemprop="seg">poco claro</span>) 
               <span xml:lang="es" lang="es" itemprop="seg">contiene una palabra, frase o pasaje que no puede ser transcrito con certeza porque en la fuente es ilegible o inaudible.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</a>]</td>
             </tr>
             <tr itemprop="row">
@@ -6015,7 +6057,7 @@ <h1>
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-when.html">when</a>
               </span>: 
               <span xml:lang="es" lang="es" itemprop="seg">proporciona una indicación temporal en términos relativos respecto a otros elementos determinados sobre la misma escala temporal, o en términos absolutos.</span>[
-              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</a>]</td>
+              <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</a>]</td>
             </tr>
             <tr itemprop="row">
               <td id="TEI.xenoData">
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index cd8a6e716..22e7b6e68 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -211,6 +211,48 @@ att.breaking.attribute.break =
   attribute break {
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
+att.cmc.attributes = att.cmc.attribute.generatedBy
+att.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "test15-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 att.cReferencing.attributes = att.cReferencing.attribute.cRef
 att.cReferencing.attribute.cRef =
   [
@@ -293,7 +335,7 @@ att.datable.w3c.attribute.to =
     | xsd:dateTime
   }?
 sch:pattern [
-  id = "test15-att.datable.w3c-att-datable-w3c-when-constraint-rule-1"
+  id = "test15-att.datable.w3c-att-datable-w3c-when-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -312,7 +354,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "test15-att.datable.w3c-att-datable-w3c-from-constraint-rule-2"
+  id = "test15-att.datable.w3c-att-datable-w3c-from-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -331,7 +373,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "test15-att.datable.w3c-att-datable-w3c-to-constraint-rule-3"
+  id = "test15-att.datable.w3c-att-datable-w3c-to-constraint-rule-4"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -603,7 +645,7 @@ att.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "test15-att.global.source-source-only_1_ODD_source-constraint-rule-4"
+    "test15-att.global.source-source-only_1_ODD_source-constraint-rule-5"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -892,7 +934,7 @@ att.measurement.attribute.commodity =
   }?
 sch:pattern [
   id =
-    "test15-att.measurement-att-measurement-unitRef-constraint-rule-5"
+    "test15-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -998,7 +1040,7 @@ att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "test15-att.typed-subtypeTyped-constraint-rule-6"
+  id = "test15-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1041,7 +1083,7 @@ att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "test15-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "test15-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1162,7 +1204,7 @@ att.spanning.attribute.spanTo =
   }?
 sch:pattern [
   id =
-    "test15-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "test15-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1218,7 +1260,7 @@ att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "test15-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "test15-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1897,6 +1939,7 @@ model.global =
 model.biblPart =
   model.respLike
   | model.imprintPart
+  | quote
   | series
   | citedRange
   | bibl
@@ -1947,7 +1990,8 @@ model.inter =
   | model.listLike
   | model.stageLike
   | model.attributable
-model.common = model.divPart | model.inter | q
+model.cmc = notAllowed
+model.common = model.divPart | model.inter | model.cmc | q
 model.phrase =
   model.segLike
   | model.highlighted
@@ -2023,6 +2067,7 @@ model.standOffPart =
   | model.biblLike
   | model.listLike
   | model.annotationLike
+  | xenoData
   | listChange
   | seg
   | listAnnotation
@@ -2092,7 +2137,7 @@ att.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "test15-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
+    "test15-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2177,7 +2222,7 @@ p =
     macro.paraContent
     >> sch:pattern [
          id =
-           "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
+           "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2199,7 +2244,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
+           "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2223,16 +2268,21 @@ p =
     att.declaring.attributes,
     att.fragmentable.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 foreign =
   
   ## (foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]
-  element foreign { macro.phraseSeq, att.global.attributes, empty }
+  element foreign {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 emph =
   
   ## (emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
-  element emph { macro.paraContent, att.global.attributes, empty }
+  element emph {
+    macro.paraContent, att.global.attributes, att.cmc.attributes, empty
+  }
 hi =
   
   ## (highlighted) marks a word or phrase as graphically distinct from the surrounding text, for reasons concerning which no claim is made. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
@@ -2240,6 +2290,7 @@ hi =
     macro.paraContent,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 distinct =
@@ -2249,6 +2300,7 @@ distinct =
     macro.phraseSeq,
     att.global.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## specifies the sublanguage or register to which the word or phrase is being assigned
     attribute type {
@@ -2272,6 +2324,7 @@ said =
     macro.specialPara,
     att.global.attributes,
     att.ascribed.directed.attributes,
+    att.cmc.attributes,
     
     ## may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.
     attribute aloud {
@@ -2305,6 +2358,7 @@ quote =
     att.global.attributes,
     att.typed.attributes,
     att.notated.attributes,
+    att.cmc.attributes,
     empty
   }
 q =
@@ -2314,6 +2368,7 @@ q =
     macro.specialPara,
     att.global.attributes,
     att.ascribed.directed.attributes,
+    att.cmc.attributes,
     
     ## (type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
     ## Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (written); 4] soCalled (so called); 5] foreign (foreign); 6] distinct (distinct); 7] term; 8] emph (emph); 9] mentioned (mentioned)
@@ -2351,7 +2406,7 @@ q =
   }
 cit =
   
-  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]
+  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]
   element cit {
     (model.biblLike
      | model.egLike
@@ -2363,24 +2418,29 @@ cit =
      | q)+,
     att.global.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 mentioned =
   
   ## marks words or phrases mentioned, not used. [3.3.3. Quotation]
-  element mentioned { macro.phraseSeq, att.global.attributes, empty }
+  element mentioned {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 soCalled =
   
   ## (so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]
-  element soCalled { macro.phraseSeq, att.global.attributes, empty }
+  element soCalled {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 desc =
   
-  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]
+  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]
   element desc {
     macro.limitedContent
     >> sch:pattern [
          id =
-           "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
+           "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2403,21 +2463,17 @@ desc =
        ],
     att.global.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Suggested values include: 1] deprecationInfo (deprecation information)
     attribute type {
-      
-      ## (deprecation
-      ##           information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
-      "deprecationInfo"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
 gloss =
   
-  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]
+  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]
   element gloss {
     macro.phraseSeq,
     att.global.attributes,
@@ -2425,6 +2481,7 @@ gloss =
     att.typed.attributes,
     att.pointing.attributes,
     att.cReferencing.attributes,
+    att.cmc.attributes,
     empty
   }
 term =
@@ -2439,13 +2496,18 @@ term =
     att.canonical.attributes,
     att.sortable.attributes,
     att.cReferencing.attributes,
+    att.cmc.attributes,
     empty
   }
 ruby =
   
   ## (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]
   element ruby {
-    (rb, rt+), att.global.attributes, att.typed.attributes, empty
+    (rb, rt+),
+    att.global.attributes,
+    att.typed.attributes,
+    att.cmc.attributes,
+    empty
   }
 rb =
   
@@ -2468,7 +2530,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test15-rt-target-rt-target-not-span-constraint-rule-14"
+         id = "test15-rt-target-rt-target-not-span-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2491,7 +2553,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test15-rt-from-rt-from-constraint-rule-15"
+         id = "test15-rt-from-rt-from-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2516,7 +2578,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test15-rt-to-rt-to-constraint-rule-16"
+         id = "test15-rt-to-rt-to-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2540,7 +2602,9 @@ rt =
 sic =
   
   ## (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]
-  element sic { macro.paraContent, att.global.attributes, empty }
+  element sic {
+    macro.paraContent, att.global.attributes, att.cmc.attributes, empty
+  }
 corr =
   
   ## (correction) contains the correct form of a passage apparently erroneous in the copy text. [3.5.1. Apparent Errors]
@@ -2549,6 +2613,7 @@ corr =
     att.global.attributes,
     att.editLike.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 choice =
@@ -2559,24 +2624,28 @@ choice =
     (model.choicePart | choice),
     (model.choicePart | choice)*,
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 reg =
   
   ## (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element reg {
     macro.paraContent,
     att.global.attributes,
     att.editLike.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 orig =
   
   ## (original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
-  element orig { macro.paraContent, att.global.attributes, empty }
+  ## Normalization 13. Critical Apparatus]
+  element orig {
+    macro.paraContent, att.global.attributes, att.cmc.attributes, empty
+  }
 gap =
   
   ## (gap) indicates a point where material has been omitted in a transcription, whether for editorial reasons described in the TEI header, as part of sampling practice, or because the material is illegible, invisible, or inaudible. [3.5.3. Additions, Deletions, and Omissions]
@@ -2586,6 +2655,7 @@ gap =
     att.timed.attributes,
     att.editLike.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     
     ## (reason) gives the reason for omission
     ## Suggested values include: 1] cancelled (cancelled); 2] deleted (deleted); 3] editorial (editorial); 4] illegible (illegible); 5] inaudible (inaudible); 6] irrelevant (irrelevant); 7] sampling (sampling)
@@ -2643,6 +2713,7 @@ add =
     att.placement.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     empty
   }
 del =
@@ -2654,16 +2725,18 @@ del =
     att.transcriptional.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     empty
   }
 unclear =
   
-  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
+  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
   element unclear {
     macro.paraContent,
     att.global.attributes,
     att.editLike.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     
     ## indicates why the material is hard to transcribe.
     ## Suggested values include: 1] illegible (illegible); 2] inaudible (inaudible); 3] faded (faded); 4] background_noise (background noise); 5] eccentric_ductus (eccentric ductus)
@@ -2705,6 +2778,7 @@ name =
     att.datable.attributes,
     att.editLike.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -2714,7 +2788,7 @@ name =
      }?)
     >> sch:pattern [
          id =
-           "test15-name-calendar-calendar-check-name-constraint-rule-17"
+           "test15-name-calendar-calendar-check-name-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2739,24 +2813,28 @@ name =
   }
 rs =
   
-  ## (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]
+  ## (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]
   element rs {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 email =
   
   ## (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]
-  element email { macro.phraseSeq, att.global.attributes, empty }
+  element email {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 address =
   
   ## (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]
   element address {
     (model.global*, (model.addrPart, model.global*)+),
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 addrLine =
@@ -2784,23 +2862,11 @@ num =
     att.global.attributes,
     att.typed.attribute.subtype,
     att.ranging.attributes,
+    att.cmc.attributes,
     
     ## indicates the type of numeric value.
-    ## Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage
     attribute type {
-      
-      ## absolute number, e.g. 21, 21.5
-      "cardinal"
-      | 
-        ## ordinal number, e.g. 21st
-        "ordinal"
-      | 
-        ## fraction, e.g. one half or three-quarters
-        "fraction"
-      | 
-        ## a percentage
-        "percentage"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     
     ## supplies the value of the number in standard form.
@@ -2820,6 +2886,7 @@ measure =
     att.global.attributes,
     att.typed.attribute.subtype,
     att.measurement.attributes,
+    att.cmc.attributes,
     att.ranging.attributes,
     
     ## specifies the type of measurement in any convenient typology.
@@ -2830,12 +2897,13 @@ measure =
   }
 measureGrp =
   
-  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]
+  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]
   element measureGrp {
     (text | model.gLike | model.measureLike)*,
     att.global.attributes,
     att.measurement.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 unit =
@@ -2847,11 +2915,12 @@ unit =
     att.global.attributes,
     att.typed.attributes,
     att.measurement.attributes,
+    att.cmc.attributes,
     empty
   }
 date =
   
-  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]
+  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]
   element date {
     (text | model.gLike | model.phrase | model.global)*,
     att.global.attributes,
@@ -2861,6 +2930,7 @@ date =
     att.editLike.attributes,
     att.dimensions.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 time =
@@ -2875,6 +2945,7 @@ time =
     att.editLike.attributes,
     att.dimensions.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 abbr =
@@ -2884,9 +2955,9 @@ abbr =
     macro.phraseSeq,
     att.global.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## (type) allows the encoder to classify the abbreviation according to some convenient typology.
-    ## Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -2899,15 +2970,16 @@ expan =
     macro.phraseSeq,
     att.global.attributes,
     att.editLike.attributes,
+    att.cmc.attributes,
     empty
   }
 ptr =
   
-  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]
   element ptr {
     empty
     >> sch:pattern [
-         id = "test15-ptr-ptrAtts-constraint-rule-18"
+         id = "test15-ptr-ptrAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2932,15 +3004,16 @@ ptr =
     att.internetMedia.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 ref =
   
-  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]
   element ref {
     macro.paraContent
     >> sch:pattern [
-         id = "test15-ref-refAtts-constraint-rule-19"
+         id = "test15-ref-refAtts-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2966,6 +3039,7 @@ ref =
     att.internetMedia.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 \list =
@@ -2980,7 +3054,7 @@ ref =
      (model.divBottom, model.global*)*)
     >> sch:pattern [
          id =
-           "test15-list-gloss-list-must-have-labels-constraint-rule-20"
+           "test15-list-gloss-list-must-have-labels-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3000,31 +3074,11 @@ ref =
     att.global.attributes,
     att.sortable.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## (type) describes the nature of the items in the list.
-    ## Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)
     attribute type {
-      [
-        a:documentation [
-          "(gloss) each list item glosses some term or concept, which is given by a "
-          ns1:code [ "<label>" ]
-          " element preceding the list item."
-        ]
-      ]
-      "gloss"
-      | 
-        ## (index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.
-        "index"
-      | 
-        ## (instructions) each list item is a step in a sequence of instructions, as in a recipe.
-        "instructions"
-      | 
-        ## (litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.
-        "litany"
-      | 
-        ## (syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.
-        "syllogism"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -3046,6 +3100,7 @@ label =
     att.typed.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 head =
@@ -3063,6 +3118,7 @@ head =
     att.typed.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 headLabel =
@@ -3075,7 +3131,7 @@ headItem =
   element headItem { macro.phraseSeq, att.global.attributes, empty }
 note =
   
-  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]
+  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]
   element note {
     macro.specialPara,
     att.global.attributes,
@@ -3084,6 +3140,7 @@ note =
     att.typed.attributes,
     att.written.attributes,
     att.anchoring.attributes,
+    att.cmc.attributes,
     empty
   }
 noteGrp =
@@ -3097,6 +3154,7 @@ noteGrp =
     att.typed.attributes,
     att.written.attributes,
     att.anchoring.attributes,
+    att.cmc.attributes,
     empty
   }
 index =
@@ -3106,6 +3164,7 @@ index =
     (term, index?)*,
     att.global.attributes,
     att.spanning.attributes,
+    att.cmc.attributes,
     
     ## a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.
     attribute indexName { xsd:Name }?,
@@ -3124,6 +3183,7 @@ media =
     att.resourced.attributes,
     att.declaring.attributes,
     att.timed.attributes,
+    att.cmc.attributes,
     
     ## (MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type
     attribute mimeType {
@@ -3135,7 +3195,7 @@ media =
   }
 graphic =
   
-  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]
+  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]
   element graphic {
     model.descLike*,
     att.global.attributes,
@@ -3143,6 +3203,7 @@ graphic =
     att.resourced.attributes,
     att.declaring.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 binaryObject =
@@ -3154,6 +3215,7 @@ binaryObject =
     att.media.attributes,
     att.timed.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     [
       a:documentation [
         "The encoding used to encode the binary data. If not specified, this is assumed to be "
@@ -3180,6 +3242,7 @@ milestone =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 gb =
@@ -3193,6 +3256,7 @@ gb =
     att.spanning.attributes,
     att.breaking.attributes,
     att.edition.attributes,
+    att.cmc.attributes,
     empty
   }
 pb =
@@ -3206,6 +3270,7 @@ pb =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 lb =
@@ -3219,6 +3284,7 @@ lb =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 cb =
@@ -3232,6 +3298,7 @@ cb =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 analytic =
@@ -3305,7 +3372,7 @@ author =
      }?)
     >> sch:pattern [
          id =
-           "test15-author-calendar-calendar-check-author-constraint-rule-21"
+           "test15-author-calendar-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3345,7 +3412,7 @@ editor =
      }?)
     >> sch:pattern [
          id =
-           "test15-editor-calendar-calendar-check-editor-constraint-rule-22"
+           "test15-editor-calendar-calendar-check-editor-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3395,7 +3462,7 @@ resp =
      }?)
     >> sch:pattern [
          id =
-           "test15-resp-calendar-calendar-check-resp-constraint-rule-23"
+           "test15-resp-calendar-calendar-check-resp-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3427,9 +3494,9 @@ title =
     att.typed.attribute.subtype,
     att.canonical.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     
     ## classifies the title according to some convenient typology.
-    ## Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3442,7 +3509,7 @@ title =
      }?)
     >> sch:pattern [
          id =
-           "test15-title-calendar-calendar-check-title-constraint-rule-24"
+           "test15-title-calendar-calendar-check-title-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3492,6 +3559,7 @@ meeting =
     att.global.attributes,
     att.datable.attributes,
     att.canonical.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -3501,7 +3569,7 @@ meeting =
      }?)
     >> sch:pattern [
          id =
-           "test15-meeting-calendar-calendar-check-meeting-constraint-rule-25"
+           "test15-meeting-calendar-calendar-check-meeting-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3566,7 +3634,7 @@ pubPlace =
   }
 bibl =
   
-  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element bibl {
     (text
      | model.gLike
@@ -3582,11 +3650,12 @@ bibl =
     att.typed.attributes,
     att.sortable.attributes,
     att.docStatus.attributes,
+    att.cmc.attributes,
     empty
   }
 biblStruct =
   
-  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblStruct {
     (analytic*,
      (monogr, series*)+,
@@ -3596,11 +3665,12 @@ biblStruct =
     att.typed.attributes,
     att.sortable.attributes,
     att.docStatus.attributes,
+    att.cmc.attributes,
     empty
   }
 listBibl =
   
-  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element listBibl {
     (model.headLike*,
      desc*,
@@ -3611,6 +3681,7 @@ listBibl =
     att.sortable.attributes,
     att.declarable.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 relatedItem =
@@ -3619,7 +3690,7 @@ relatedItem =
   element relatedItem {
     ((model.biblLike | model.ptrLike)?)
     >> sch:pattern [
-         id = "test15-relatedItem-targetorcontent1-constraint-rule-26"
+         id = "test15-relatedItem-targetorcontent1-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3660,7 +3731,7 @@ l =
     ((text | model.gLike | model.phrase | model.inter | model.global)*)
     >> sch:pattern [
          id =
-           "test15-l-abstractModel-structure-l-in-l-constraint-rule-27"
+           "test15-l-abstractModel-structure-l-in-l-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3680,6 +3751,7 @@ l =
        ],
     att.global.attributes,
     att.fragmentable.attributes,
+    att.cmc.attributes,
     empty
   }
 lg =
@@ -3700,7 +3772,7 @@ lg =
       | lg)*,
      (model.divBottom, model.global*)*)
     >> sch:pattern [
-         id = "test15-lg-atleast1oflggapl-constraint-rule-28"
+         id = "test15-lg-atleast1oflggapl-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3720,7 +3792,7 @@ lg =
        ]
     >> sch:pattern [
          id =
-           "test15-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
+           "test15-lg-abstractModel-structure-lg-in-l-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3742,6 +3814,7 @@ lg =
     att.divLike.attributes,
     att.typed.attributes,
     att.declaring.attributes,
+    att.cmc.attributes,
     empty
   }
 sp =
@@ -3774,6 +3847,7 @@ stage =
     att.global.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3816,7 +3890,7 @@ teiCorpus =
     a:documentation [
       "(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more "
       ns1:code [ "<TEI>" ]
-      " elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      " elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element teiCorpus {
@@ -3839,7 +3913,6 @@ divGen =
     att.typed.attribute.subtype,
     
     ## specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-    ## Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3847,7 +3920,7 @@ divGen =
   }
 textLang =
   
-  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]
+  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]
   element textLang {
     macro.specialPara,
     att.global.attributes,
@@ -3899,7 +3972,7 @@ att.patternReplacement.attribute.replacementPattern =
   attribute replacementPattern { text }
 teiHeader =
   
-  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]
+  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]
   element teiHeader {
     (fileDesc, model.teiHeaderPart*, revisionDesc?),
     att.global.attributes,
@@ -3942,7 +4015,7 @@ sponsor =
      }?)
     >> sch:pattern [
          id =
-           "test15-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
+           "test15-sponsor-calendar-calendar-check-sponsor-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3982,7 +4055,7 @@ funder =
      }?)
     >> sch:pattern [
          id =
-           "test15-funder-calendar-calendar-check-funder-constraint-rule-31"
+           "test15-funder-calendar-calendar-check-funder-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4022,7 +4095,7 @@ principal =
      }?)
     >> sch:pattern [
          id =
-           "test15-principal-calendar-calendar-check-principal-constraint-rule-32"
+           "test15-principal-calendar-calendar-check-principal-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4059,7 +4132,7 @@ edition =
   element edition { macro.phraseSeq, att.global.attributes, empty }
 extent =
   
-  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]
+  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]
   element extent { macro.phraseSeq, att.global.attributes, empty }
 publicationStmt =
   
@@ -4091,56 +4164,18 @@ authority =
   }
 idno =
   
-  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
+  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element idno {
     (text | model.gLike | idno)*,
     att.global.attributes,
     att.sortable.attributes,
     att.datable.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## categorizes the identifier, for example as an ISBN, Social Security number, etc.
-    ## Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC
     attribute type {
-      [
-        a:documentation [
-          "International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the "
-          ns1:a [
-            href = "https://www.isbn-international.org"
-            " International ISBN Agency."
-          ]
-          "\x{a}" ~
-          "                  "
-        ]
-      ]
-      "ISBN"
-      | 
-        ## International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.
-        "ISSN"
-      | 
-        ## Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.
-        "DOI"
-      | [
-          a:documentation [
-            "Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of "
-            ns1:a [
-              href = "https://datatracker.ietf.org/doc/html/rfc3986"
-              "RFC 3986"
-            ]
-            "."
-          ]
-        ]
-        "URI"
-      | 
-        ## A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.
-        "VIAF"
-      | 
-        ## English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.
-        "ESTC"
-      | 
-        ## OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.
-        "OCLC"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
@@ -4151,7 +4186,7 @@ idno =
      }?)
     >> sch:pattern [
          id =
-           "test15-idno-calendar-calendar-check-idno-constraint-rule-33"
+           "test15-idno-calendar-calendar-check-idno-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4213,7 +4248,7 @@ licence =
      }?)
     >> sch:pattern [
          id =
-           "test15-licence-calendar-calendar-check-licence-constraint-rule-34"
+           "test15-licence-calendar-calendar-check-licence-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4254,7 +4289,7 @@ notesStmt =
   }
 sourceDesc =
   
-  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]
+  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]
   element sourceDesc {
     (model.pLike+
      | (model.biblLike | model.sourceDescPart | model.listLike)+),
@@ -4264,7 +4299,7 @@ sourceDesc =
   }
 biblFull =
   
-  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblFull {
     (((titleStmt,
        editionStmt?,
@@ -4278,6 +4313,7 @@ biblFull =
     att.declarable.attributes,
     att.sortable.attributes,
     att.docStatus.attributes,
+    att.cmc.attributes,
     empty
   }
 encodingDesc =
@@ -4303,7 +4339,7 @@ schemaRef =
   }
 projectDesc =
   
-  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element projectDesc {
     model.pLike+,
     att.global.attributes,
@@ -4312,7 +4348,7 @@ projectDesc =
   }
 samplingDecl =
   
-  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element samplingDecl {
     model.pLike+,
     att.global.attributes,
@@ -4321,7 +4357,7 @@ samplingDecl =
   }
 editorialDecl =
   
-  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element editorialDecl {
     (model.pLike | model.editorialDeclPart)+,
     att.global.attributes,
@@ -4330,7 +4366,7 @@ editorialDecl =
   }
 correction =
   
-  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element correction {
     model.pLike+,
     att.global.attributes,
@@ -4366,7 +4402,7 @@ correction =
   }
 normalization =
   
-  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element normalization {
     model.pLike+,
     att.global.attributes,
@@ -4386,11 +4422,11 @@ normalization =
   }
 quotation =
   
-  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element quotation {
     (model.pLike*)
     >> sch:pattern [
-         id = "test15-quotation-quotationContents-constraint-rule-35"
+         id = "test15-quotation-quotationContents-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4430,7 +4466,7 @@ quotation =
   }
 hyphenation =
   
-  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element hyphenation {
     model.pLike+,
     att.global.attributes,
@@ -4456,7 +4492,7 @@ hyphenation =
   }
 segmentation =
   
-  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element segmentation {
     model.pLike+,
     att.global.attributes,
@@ -4465,7 +4501,7 @@ segmentation =
   }
 stdVals =
   
-  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element stdVals {
     model.pLike+,
     att.global.attributes,
@@ -4614,7 +4650,7 @@ refsDecl =
   }
 citeStructure =
   
-  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeStructure {
     (citeData*, citeStructure*, model.descLike*),
     att.global.attributes,
@@ -4642,7 +4678,7 @@ citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "test15-citeStructure-match-citestructure-outer-match-constraint-rule-36"
+           "test15-citeStructure-match-citestructure-outer-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4663,7 +4699,7 @@ citeStructure =
        ]
     >> sch:pattern [
          id =
-           "test15-citeStructure-match-citestructure-inner-match-constraint-rule-37"
+           "test15-citeStructure-match-citestructure-inner-match-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4697,7 +4733,7 @@ citeStructure =
   }
 citeData =
   
-  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeData {
     empty,
     att.global.attributes,
@@ -4720,7 +4756,7 @@ cRefPattern =
   }
 prefixDef =
   
-  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element prefixDef {
     model.pLike*,
     att.global.attributes,
@@ -4734,7 +4770,7 @@ prefixDef =
   }
 listPrefixDef =
   
-  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element listPrefixDef {
     (desc*, (prefixDef | listPrefixDef)+),
     att.global.attributes,
@@ -4845,7 +4881,7 @@ unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "test15-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
+           "test15-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4886,7 +4922,7 @@ unitDef =
      }?)
     >> sch:pattern [
          id =
-           "test15-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
+           "test15-unitDef-calendar-calendar-check-unitDef-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4927,7 +4963,7 @@ conversion =
      }?)
     >> sch:pattern [
          id =
-           "test15-conversion-calendar-calendar-check-conversion-constraint-rule-40"
+           "test15-conversion-calendar-calendar-check-conversion-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4993,7 +5029,7 @@ application =
      }?)
     >> sch:pattern [
          id =
-           "test15-application-calendar-calendar-check-application-constraint-rule-41"
+           "test15-application-calendar-calendar-check-application-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5056,7 +5092,7 @@ creation =
      }?)
     >> sch:pattern [
          id =
-           "test15-creation-calendar-calendar-check-creation-constraint-rule-42"
+           "test15-creation-calendar-calendar-check-creation-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5081,7 +5117,7 @@ creation =
   }
 langUsage =
   
-  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]
   element langUsage {
     (model.pLike+ | language+),
     att.global.attributes,
@@ -5213,24 +5249,8 @@ correspAction =
     att.sortable.attributes,
     
     ## describes the nature of the action.
-    ## Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded
     attribute type {
-      
-      ## information concerning the sending or dispatch of a message.
-      "sent"
-      | 
-        ## information concerning the receipt of a message.
-        "received"
-      | 
-        ## information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.
-        "transmitted"
-      | 
-        ## information concerning the redirection of an unread message.
-        "redirected"
-      | 
-        ## information concerning the forwarding of a message.
-        "forwarded"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5261,7 +5281,7 @@ revisionDesc =
   }
 change =
   
-  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]
+  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]
   element change {
     macro.specialPara,
     att.ascribed.attributes,
@@ -5278,7 +5298,7 @@ change =
      }?)
     >> sch:pattern [
          id =
-           "test15-change-calendar-calendar-check-change-constraint-rule-43"
+           "test15-change-calendar-calendar-check-change-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5310,7 +5330,7 @@ change =
   }
 listChange =
   
-  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]
+  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]
   element listChange {
     (desc*, (listChange | change)+),
     att.global.attributes,
@@ -5336,7 +5356,7 @@ TEI =
       ns1:code [ "<TEI>" ]
       " (or "
       ns1:code [ "<teiCorpus>" ]
-      ") element. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      ") element. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element TEI {
@@ -5371,7 +5391,7 @@ TEI =
   }
 \text =
   
-  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element text {
     (model.global*,
      (front, model.global*)?,
@@ -5403,7 +5423,7 @@ body =
   }
 group =
   
-  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]
+  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]
   element group {
     ((model.divTop | model.global)*,
      ((\text | group), (\text | group | model.global)*),
@@ -5425,6 +5445,7 @@ floatingText =
     att.global.attributes,
     att.declaring.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 \div =
@@ -5438,7 +5459,7 @@ floatingText =
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
+           "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5460,7 +5481,7 @@ floatingText =
        ]
     >> sch:pattern [
          id =
-           "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
+           "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5610,6 +5631,7 @@ trailer =
     att.typed.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 byline =
@@ -5618,6 +5640,7 @@ byline =
   element byline {
     (text | model.gLike | model.phrase | docAuthor | model.global)*,
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 dateline =
@@ -5626,6 +5649,7 @@ dateline =
   element dateline {
     (text | model.gLike | model.phrase | model.global | docDate)*,
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 argument =
@@ -5634,13 +5658,17 @@ argument =
   element argument {
     ((model.global | model.headLike)*, (model.common, model.global*)+),
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 epigraph =
   
   ## (epigraph) contains a quotation, anonymous or attributed, appearing at the start or end of a section or on a title page. [4.2.3. Arguments, Epigraphs, and Postscripts 4.2. Elements Common to All Divisions 4.6. Title Pages]
   element epigraph {
-    (model.common | model.global)*, att.global.attributes, empty
+    (model.common | model.global)*,
+    att.global.attributes,
+    att.cmc.attributes,
+    empty
   }
 opener =
   
@@ -5658,6 +5686,7 @@ opener =
      | model.global)*,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 closer =
@@ -5673,6 +5702,7 @@ closer =
      | model.global)*,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 salute =
@@ -5682,6 +5712,7 @@ salute =
     macro.paraContent,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 signed =
@@ -5691,6 +5722,7 @@ signed =
     macro.paraContent,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 postscript =
@@ -5703,6 +5735,7 @@ postscript =
      (model.divBottomPart, model.global*)*),
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 titlePage =
@@ -5739,25 +5772,9 @@ titlePart =
     att.typed.attribute.subtype,
     
     ## (type) specifies the role of this subdivision of the title.
-    ## Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)
     [ a:defaultValue = "main" ]
     attribute type {
-      
-      ## (main) main title of the work
-      "main"
-      | 
-        ## (subordinate) subtitle of the work
-        "sub"
-      | 
-        ## (alternate) alternative title of the work
-        "alt"
-      | 
-        ## (short) abbreviated form of title
-        "short"
-      | 
-        ## (descriptive) descriptive paraphrase of the work
-        "desc"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5768,6 +5785,7 @@ docAuthor =
     macro.phraseSeq,
     att.global.attributes,
     att.canonical.attributes,
+    att.cmc.attributes,
     empty
   }
 imprimatur =
@@ -5798,6 +5816,7 @@ docDate =
   element docDate {
     macro.phraseSeq,
     att.global.attributes,
+    att.cmc.attributes,
     att.datable.attributes,
     att.calendarSystem.attributes,
     empty
@@ -5904,11 +5923,11 @@ att.global.linking.attribute.select =
   }?
 link =
   
-  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]
+  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]
   element link {
     empty
     >> sch:pattern [
-         id = "test15-link-linkTargets3-constraint-rule-46"
+         id = "test15-link-linkTargets3-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5931,25 +5950,27 @@ link =
     att.global.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 linkGrp =
   
-  ## (link group) defines a collection of associations or hypertextual links. [16.1. Links]
+  ## (link group) defines a collection of associations or hypertextual links. [17.1. Links]
   element linkGrp {
     (model.descLike*, (link | ptr)+),
     att.global.attributes,
     att.pointing.group.attributes,
+    att.cmc.attributes,
     empty
   }
 ab =
   
-  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]
+  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]
   element ab {
     macro.abContent
     >> sch:pattern [
          id =
-           "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
+           "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5974,17 +5995,22 @@ ab =
     att.declaring.attributes,
     att.fragmentable.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 anchor =
   
-  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
+  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]
   element anchor {
-    empty, att.global.attributes, att.typed.attributes, empty
+    empty,
+    att.global.attributes,
+    att.typed.attributes,
+    att.cmc.attributes,
+    empty
   }
 seg =
   
-  ## (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
+  ## (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
   element seg {
     macro.paraContent,
     att.global.attributes,
@@ -5992,11 +6018,12 @@ seg =
     att.typed.attributes,
     att.written.attributes,
     att.notated.attributes,
+    att.cmc.attributes,
     empty
   }
 when =
   
-  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]
+  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]
   element when {
     empty,
     att.global.attributes,
@@ -6068,10 +6095,11 @@ when =
   }
 timeline =
   
-  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]
+  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]
   element timeline {
     when+,
     att.global.attributes,
+    att.cmc.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
     attribute origin {
@@ -6121,11 +6149,11 @@ timeline =
   }
 join =
   
-  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation]
+  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation]
   element join {
     ((model.descLike | model.certLike)*)
     >> sch:pattern [
-         id = "test15-join-joinTargets3-constraint-rule-48"
+         id = "test15-join-joinTargets3-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6149,6 +6177,7 @@ join =
     att.global.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## specifies the name of an element which this aggregation may be understood to represent.
     attribute result { xsd:Name }?,
@@ -6180,13 +6209,14 @@ joinGrp =
     a:documentation [
       "(join group) groups a collection of "
       ns1:code [ "<join>" ]
-      " elements and possibly pointers. [16.7. Aggregation]"
+      " elements and possibly pointers. [17.7. Aggregation]"
     ]
   ]
   element joinGrp {
     ((gloss | model.descLike)*, (join | ptr)+),
     att.global.attributes,
     att.pointing.group.attributes,
+    att.cmc.attributes,
     [
       a:documentation [
         "supplies the default value for the "
@@ -6201,13 +6231,14 @@ joinGrp =
   }
 alt =
   
-  ## (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]
+  ## (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]
   element alt {
     empty,
     att.global.attributes,
     att.pointing.attribute.targetLang,
     att.pointing.attribute.evaluate,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
@@ -6250,13 +6281,14 @@ altGrp =
     a:documentation [
       "(alternation group) groups a collection of "
       ns1:code [ "<alt>" ]
-      " elements and possibly pointers. [16.8. Alternation]"
+      " elements and possibly pointers. [17.8. Alternation]"
     ]
   ]
   element altGrp {
     (model.descLike*, (alt | ptr)*),
     att.global.attributes,
     att.pointing.group.attributes,
+    att.cmc.attributes,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
     [ a:defaultValue = "excl" ]
@@ -6272,12 +6304,12 @@ altGrp =
   }
 standOff =
   
-  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]
+  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]
   element standOff {
     (model.standOffPart+)
     >> sch:pattern [
          id =
-           "test15-standOff-nested_standOff_should_be_typed-constraint-rule-49"
+           "test15-standOff-nested_standOff_should_be_typed-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6317,7 +6349,7 @@ listAnnotation =
       ns1:code [ "<note>" ]
       ", possibly organized with nested "
       ns1:code [ "<listAnnotation>" ]
-      " elements. [16.10. The standOff Container]"
+      " elements. [17.10. The standOff Container]"
     ]
   ]
   element listAnnotation {
@@ -6339,7 +6371,7 @@ annotation =
         "Web\x{a}" ~
         "      Annotation Data Model"
       ]
-      ". [16.10. The standOff Container]"
+      ". [17.10. The standOff Container]"
     ]
   ]
   element annotation {
@@ -6449,13 +6481,14 @@ att.tableDecoration.attribute.cols =
   [ a:defaultValue = "1" ] attribute cols { xsd:nonNegativeInteger }?
 table =
   
-  ## (table) contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables]
+  ## (table) contains text displayed in tabular form, in rows and columns. [15.1.1. TEI Tables]
   element table {
     ((model.headLike | model.global)*,
      ((row, model.global*)+ | (model.graphicLike, model.global*)+),
      (model.divBottom, model.global*)*),
     att.global.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## (rows) indicates the number of rows in the table.
     attribute rows { xsd:nonNegativeInteger }?,
@@ -6466,13 +6499,13 @@ table =
   }
 row =
   
-  ## (row) contains one row of a table. [14.1.1. TEI Tables]
+  ## (row) contains one row of a table. [15.1.1. TEI Tables]
   element row {
     cell+, att.global.attributes, att.tableDecoration.attributes, empty
   }
 cell =
   
-  ## (cell) contains one cell of a table. [14.1.1. TEI Tables]
+  ## (cell) contains one cell of a table. [15.1.1. TEI Tables]
   element cell {
     macro.specialPara,
     att.global.attributes,
@@ -6481,26 +6514,28 @@ cell =
   }
 formula =
   
-  ## (formula) contains a mathematical or other formula. [14.2. Formulæ and Mathematical Expressions]
+  ## (formula) contains a mathematical or other formula. [15.2. Formulæ and Mathematical Expressions]
   element formula {
     (text | model.graphicLike | model.hiLike)*,
     att.global.attributes,
     att.notated.attributes,
+    att.cmc.attributes,
     empty
   }
 notatedMusic =
   
-  ## encodes the presence of music notation in a text [14.3. Notated Music in Written Text]
+  ## encodes the presence of music notation in a text [15.3. Notated Music in Written Text]
   element notatedMusic {
     (model.labelLike | model.ptrLike | graphic | binaryObject | seg)*,
     att.global.attributes,
     att.placement.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 figure =
   
-  ## (figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [14.4. Specific Elements for Graphic Images]
+  ## (figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [15.4. Specific Elements for Graphic Images]
   element figure {
     (model.headLike
      | model.common
@@ -6512,11 +6547,12 @@ figure =
     att.placement.attributes,
     att.typed.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 figDesc =
   
-  ## (description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [14.4. Specific Elements for Graphic Images]
+  ## (description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [15.4. Specific Elements for Graphic Images]
   element figDesc { macro.limitedContent, att.global.attributes, empty }
 att.datable.custom.attributes =
   att.datable.custom.attribute.when-custom,
@@ -6703,7 +6739,7 @@ att.datable.iso.attribute.to-iso =
   }?
 orgName =
   
-  ## (organization name) contains an organizational name. [13.2.2. Organizational Names]
+  ## (organization name) contains an organizational name. [14.2.2. Organizational Names]
   element orgName {
     macro.phraseSeq,
     att.global.attributes,
@@ -6711,6 +6747,7 @@ orgName =
     att.editLike.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6720,7 +6757,7 @@ orgName =
      }?)
     >> sch:pattern [
          id =
-           "test15-orgName-calendar-calendar-check-orgName-constraint-rule-50"
+           "test15-orgName-calendar-calendar-check-orgName-constraint-rule-51"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6745,7 +6782,7 @@ orgName =
   }
 persName =
   
-  ## (personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [13.2.1. Personal Names]
+  ## (personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [14.2.1. Personal Names]
   element persName {
     macro.phraseSeq,
     att.global.attributes,
@@ -6753,6 +6790,7 @@ persName =
     att.editLike.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6762,7 +6800,7 @@ persName =
      }?)
     >> sch:pattern [
          id =
-           "test15-persName-calendar-calendar-check-persName-constraint-rule-51"
+           "test15-persName-calendar-calendar-check-persName-constraint-rule-52"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6787,63 +6825,72 @@ persName =
   }
 surname =
   
-  ## (surname) contains a family (inherited) name, as opposed to a given, baptismal, or nick name. [13.2.1. Personal Names]
+  ## (surname) contains a family (inherited) name, as opposed to a given, baptismal, or nick name. [14.2.1. Personal Names]
   element surname {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 forename =
   
-  ## (forename) contains a forename, given or baptismal name. [13.2.1. Personal Names]
+  ## (forename) contains a forename, given or baptismal name. [14.2.1. Personal Names]
   element forename {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 genName =
   
-  ## (generational name component) contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. [13.2.1. Personal Names]
+  ## (generational name component) contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. [14.2.1. Personal Names]
   element genName {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 nameLink =
   
-  ## (name link) contains a connecting phrase or link used within a name but not regarded as part of it, such as van der or of. [13.2.1. Personal Names]
+  ## (name link) contains a connecting phrase or link used within a name but not regarded as part of it, such as van der or of. [14.2.1. Personal Names]
   element nameLink {
-    macro.phraseSeq, att.global.attributes, att.typed.attributes, empty
+    macro.phraseSeq,
+    att.global.attributes,
+    att.typed.attributes,
+    att.cmc.attributes,
+    empty
   }
 addName =
   
-  ## (additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [13.2.1. Personal Names]
+  ## (additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [14.2.1. Personal Names]
   element addName {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 roleName =
   
-  ## (role name) contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. [13.2.1. Personal Names]
+  ## (role name) contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. [14.2.1. Personal Names]
   element roleName {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 placeName =
   
-  ## (place name) contains an absolute or relative place name. [13.2.3. Place Names]
+  ## (place name) contains an absolute or relative place name. [14.2.3. Place Names]
   element placeName {
     macro.phraseSeq,
     att.datable.attributes,
@@ -6851,6 +6898,7 @@ placeName =
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6860,7 +6908,7 @@ placeName =
      }?)
     >> sch:pattern [
          id =
-           "test15-placeName-calendar-calendar-check-placeName-constraint-rule-52"
+           "test15-placeName-calendar-calendar-check-placeName-constraint-rule-53"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6885,13 +6933,14 @@ placeName =
   }
 bloc =
   
-  ## (bloc) contains the name of a geo-political unit consisting of two or more nation states or countries. [13.2.3. Place Names]
+  ## (bloc) contains the name of a geo-political unit consisting of two or more nation states or countries. [14.2.3. Place Names]
   element bloc {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6901,7 +6950,7 @@ bloc =
      }?)
     >> sch:pattern [
          id =
-           "test15-bloc-calendar-calendar-check-bloc-constraint-rule-53"
+           "test15-bloc-calendar-calendar-check-bloc-constraint-rule-54"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6926,13 +6975,14 @@ bloc =
   }
 country =
   
-  ## (country) contains the name of a geo-political unit, such as a nation, country, colony, or commonwealth, larger than or administratively superior to a region and smaller than a bloc. [13.2.3. Place Names]
+  ## (country) contains the name of a geo-political unit, such as a nation, country, colony, or commonwealth, larger than or administratively superior to a region and smaller than a bloc. [14.2.3. Place Names]
   element country {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6942,7 +6992,7 @@ country =
      }?)
     >> sch:pattern [
          id =
-           "test15-country-calendar-calendar-check-country-constraint-rule-54"
+           "test15-country-calendar-calendar-check-country-constraint-rule-55"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6967,13 +7017,14 @@ country =
   }
 region =
   
-  ## (region) contains the name of an administrative unit such as a state, province, or county, larger than a settlement, but smaller than a country. [13.2.3. Place Names]
+  ## (region) contains the name of an administrative unit such as a state, province, or county, larger than a settlement, but smaller than a country. [14.2.3. Place Names]
   element region {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6983,7 +7034,7 @@ region =
      }?)
     >> sch:pattern [
          id =
-           "test15-region-calendar-calendar-check-region-constraint-rule-55"
+           "test15-region-calendar-calendar-check-region-constraint-rule-56"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7008,13 +7059,14 @@ region =
   }
 settlement =
   
-  ## (settlement) contains the name of a settlement such as a city, town, or village identified as a single geo-political or administrative unit. [13.2.3. Place Names]
+  ## (settlement) contains the name of a settlement such as a city, town, or village identified as a single geo-political or administrative unit. [14.2.3. Place Names]
   element settlement {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7024,7 +7076,7 @@ settlement =
      }?)
     >> sch:pattern [
          id =
-           "test15-settlement-calendar-calendar-check-settlement-constraint-rule-56"
+           "test15-settlement-calendar-calendar-check-settlement-constraint-rule-57"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7049,13 +7101,14 @@ settlement =
   }
 district =
   
-  ## (district) contains the name of any kind of subdivision of a settlement, such as a parish, ward, or other administrative or geographic unit. [13.2.3. Place Names]
+  ## (district) contains the name of any kind of subdivision of a settlement, such as a parish, ward, or other administrative or geographic unit. [14.2.3. Place Names]
   element district {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7065,7 +7118,7 @@ district =
      }?)
     >> sch:pattern [
          id =
-           "test15-district-calendar-calendar-check-district-constraint-rule-57"
+           "test15-district-calendar-calendar-check-district-constraint-rule-58"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7090,7 +7143,7 @@ district =
   }
 offset =
   
-  ## (offset) marks that part of a relative temporal or spatial expression which indicates the direction of the offset between the two place names, dates, or times involved in the expression. [13.2.3. Place Names]
+  ## (offset) marks that part of a relative temporal or spatial expression which indicates the direction of the offset between the two place names, dates, or times involved in the expression. [14.2.3. Place Names]
   element offset {
     macro.phraseSeq,
     att.datable.attributes,
@@ -7099,6 +7152,7 @@ offset =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7108,7 +7162,7 @@ offset =
      }?)
     >> sch:pattern [
          id =
-           "test15-offset-calendar-calendar-check-offset-constraint-rule-58"
+           "test15-offset-calendar-calendar-check-offset-constraint-rule-59"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7133,7 +7187,7 @@ offset =
   }
 geogName =
   
-  ## (geographical name) identifies a name associated with some geographical feature such as Windrush Valley or Mount Sinai. [13.2.3. Place Names]
+  ## (geographical name) identifies a name associated with some geographical feature such as Windrush Valley or Mount Sinai. [14.2.3. Place Names]
   element geogName {
     macro.phraseSeq,
     att.datable.attributes,
@@ -7141,6 +7195,7 @@ geogName =
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7150,7 +7205,7 @@ geogName =
      }?)
     >> sch:pattern [
          id =
-           "test15-geogName-calendar-calendar-check-geogName-constraint-rule-59"
+           "test15-geogName-calendar-calendar-check-geogName-constraint-rule-60"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7175,7 +7230,7 @@ geogName =
   }
 geogFeat =
   
-  ## (geographical feature name) contains a common noun identifying some geographical feature contained within a geographic name, such as valley, mount, etc. [13.2.3. Place Names]
+  ## (geographical feature name) contains a common noun identifying some geographical feature contained within a geographic name, such as valley, mount, etc. [14.2.3. Place Names]
   element geogFeat {
     macro.phraseSeq,
     att.datable.attributes,
@@ -7184,6 +7239,7 @@ geogFeat =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7193,7 +7249,7 @@ geogFeat =
      }?)
     >> sch:pattern [
          id =
-           "test15-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-60"
+           "test15-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-61"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7218,7 +7274,7 @@ geogFeat =
   }
 eventName =
   
-  ## (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]
+  ## (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]
   element eventName {
     macro.phraseSeq,
     att.global.attributes,
@@ -7230,7 +7286,7 @@ eventName =
   }
 affiliation =
   
-  ## (affiliation) contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor. [15.2.2. The Participant Description]
+  ## (affiliation) contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor. [16.2.2. The Participant Description]
   element affiliation {
     macro.phraseSeq,
     att.global.attributes,
@@ -7238,9 +7294,9 @@ affiliation =
     att.datable.attributes,
     att.naming.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] sponsor; 2] recommend; 3] discredit; 4] pledged
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7253,7 +7309,7 @@ affiliation =
      }?)
     >> sch:pattern [
          id =
-           "test15-affiliation-calendar-calendar-check-affiliation-constraint-rule-61"
+           "test15-affiliation-calendar-calendar-check-affiliation-constraint-rule-62"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7278,7 +7334,7 @@ affiliation =
   }
 age =
   
-  ## (age) specifies the age of a person. [13.3.2.1. Personal Characteristics]
+  ## (age) specifies the age of a person. [14.3.2.1. Personal Characteristics]
   element age {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -7288,7 +7344,6 @@ age =
     att.dimensions.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] western; 2] sui; 3] subjective; 4] objective; 5] inWorld (in world); 6] chronological; 7] biological; 8] psychological; 9] functional
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7301,7 +7356,7 @@ age =
      }?)
     >> sch:pattern [
          id =
-           "test15-age-calendar-calendar-check-age-constraint-rule-62"
+           "test15-age-calendar-calendar-check-age-constraint-rule-63"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7329,7 +7384,7 @@ age =
   }
 birth =
   
-  ## (birth) contains information about a person's birth, such as its date and place. [15.2.2. The Participant Description]
+  ## (birth) contains information about a person's birth, such as its date and place. [16.2.2. The Participant Description]
   element birth {
     macro.phraseSeq,
     att.global.attributes,
@@ -7340,7 +7395,6 @@ birth =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] caesarean (caesarean section); 2] vaginal (vaginal delivery); 3] exNihilo (ex nihilo); 4] incorporated; 5] founded; 6] established
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7353,7 +7407,7 @@ birth =
      }?)
     >> sch:pattern [
          id =
-           "test15-birth-calendar-calendar-check-birth-constraint-rule-63"
+           "test15-birth-calendar-calendar-check-birth-constraint-rule-64"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7378,7 +7432,7 @@ birth =
   }
 climate =
   
-  ## (climate) contains information about the physical climate of a place. [13.3.4.3. States, Traits, and Events]
+  ## (climate) contains information about the physical climate of a place. [14.3.4.3. States, Traits, and Events]
   element climate {
     (model.headLike*,
      (model.pLike+ | model.labelLike+),
@@ -7389,6 +7443,7 @@ climate =
     att.editLike.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7398,7 +7453,7 @@ climate =
      }?)
     >> sch:pattern [
          id =
-           "test15-climate-calendar-calendar-check-climate-constraint-rule-64"
+           "test15-climate-calendar-calendar-check-climate-constraint-rule-65"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7423,7 +7478,7 @@ climate =
   }
 death =
   
-  ## (death) contains information about a person's death, such as its date and place. [15.2.2. The Participant Description]
+  ## (death) contains information about a person's death, such as its date and place. [16.2.2. The Participant Description]
   element death {
     macro.phraseSeq,
     att.datable.attributes,
@@ -7434,7 +7489,6 @@ death =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] proclaimed; 2] assumed; 3] verified; 4] clinical; 5] brain; 6] natural; 7] unnatural; 8] fragmentation; 9] dissolution
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7447,7 +7501,7 @@ death =
      }?)
     >> sch:pattern [
          id =
-           "test15-death-calendar-calendar-check-death-constraint-rule-65"
+           "test15-death-calendar-calendar-check-death-constraint-rule-66"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7472,7 +7526,7 @@ death =
   }
 education =
   
-  ## (education) contains a description of the educational experience of a person. [15.2.2. The Participant Description]
+  ## (education) contains a description of the educational experience of a person. [16.2.2. The Participant Description]
   element education {
     macro.phraseSeq,
     att.global.attributes,
@@ -7482,7 +7536,6 @@ education =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] primary; 2] secondary; 3] undergraduate; 4] graduate; 5] residency; 6] apprenticeship
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7495,7 +7548,7 @@ education =
      }?)
     >> sch:pattern [
          id =
-           "test15-education-calendar-calendar-check-education-constraint-rule-66"
+           "test15-education-calendar-calendar-check-education-constraint-rule-67"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7520,7 +7573,7 @@ education =
   }
 event =
   
-  ## (event) contains data relating to anything of significance that happens in time. [13.3.1. Basic Principles]
+  ## (event) contains data relating to anything of significance that happens in time. [14.3.1. Basic Principles]
   element event {
     (idno*,
      model.headLike*,
@@ -7547,7 +7600,7 @@ event =
      }?)
     >> sch:pattern [
          id =
-           "test15-event-calendar-calendar-check-event-constraint-rule-67"
+           "test15-event-calendar-calendar-check-event-constraint-rule-68"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7572,7 +7625,7 @@ event =
   }
 faith =
   
-  ## (faith) specifies the faith, religion, or belief set of a person. [13.3.2.1. Personal Characteristics]
+  ## (faith) specifies the faith, religion, or belief set of a person. [14.3.2.1. Personal Characteristics]
   element faith {
     macro.phraseSeq,
     att.global.attributes,
@@ -7582,7 +7635,6 @@ faith =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] practicing; 2] clandestine; 3] patrilineal; 4] matrilineal; 5] convert
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7595,7 +7647,7 @@ faith =
      }?)
     >> sch:pattern [
          id =
-           "test15-faith-calendar-calendar-check-faith-constraint-rule-68"
+           "test15-faith-calendar-calendar-check-faith-constraint-rule-69"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7620,7 +7672,7 @@ faith =
   }
 floruit =
   
-  ## (floruit) contains information about a person's period of activity. [13.3.2.1. Personal Characteristics]
+  ## (floruit) contains information about a person's period of activity. [14.3.2.1. Personal Characteristics]
   element floruit {
     macro.phraseSeq,
     att.global.attributes,
@@ -7636,7 +7688,7 @@ floruit =
      }?)
     >> sch:pattern [
          id =
-           "test15-floruit-calendar-calendar-check-floruit-constraint-rule-69"
+           "test15-floruit-calendar-calendar-check-floruit-constraint-rule-70"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7661,7 +7713,7 @@ floruit =
   }
 gender =
   
-  ## (gender) specifies the gender identity of a person, persona, or character. [13.3.2.1. Personal Characteristics]
+  ## (gender) specifies the gender identity of a person, persona, or character. [14.3.2.1. Personal Characteristics]
   element gender {
     macro.phraseSeq,
     att.global.attributes,
@@ -7677,7 +7729,7 @@ gender =
      }?)
     >> sch:pattern [
          id =
-           "test15-gender-calendar-calendar-check-gender-constraint-rule-70"
+           "test15-gender-calendar-calendar-check-gender-constraint-rule-71"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7709,16 +7761,20 @@ gender =
   }
 geo =
   
-  ## (geographical coordinates) contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation. [13.3.4.1. Varieties of Location]
+  ## (geographical coordinates) contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation. [14.3.4.1. Varieties of Location]
   element geo {
-    text, att.global.attributes, att.declaring.attributes, empty
+    text,
+    att.global.attributes,
+    att.declaring.attributes,
+    att.cmc.attributes,
+    empty
   }
 langKnowledge =
   [
     a:documentation [
       "(language knowledge) summarizes the state of a person's linguistic knowledge, either as prose or by a list of "
       ns1:code [ "<langKnown>" ]
-      " elements. [13.3.2.1. Personal Characteristics]"
+      " elements. [14.3.2.1. Personal Characteristics]"
     ]
   ]
   element langKnowledge {
@@ -7729,7 +7785,6 @@ langKnowledge =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] listening; 2] speaking; 3] reading; 4] writing
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7742,7 +7797,7 @@ langKnowledge =
      }?)
     >> sch:pattern [
          id =
-           "test15-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-71"
+           "test15-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-72"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7777,7 +7832,7 @@ langKnowledge =
   }
 langKnown =
   
-  ## (language known) summarizes the state of a person's linguistic competence, i.e., knowledge of a single language. [15.2.2. The Participant Description]
+  ## (language known) summarizes the state of a person's linguistic competence, i.e., knowledge of a single language. [16.2.2. The Participant Description]
   element langKnown {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -7792,7 +7847,7 @@ langKnown =
      }?)
     >> sch:pattern [
          id =
-           "test15-langKnown-calendar-calendar-check-langKnown-constraint-rule-72"
+           "test15-langKnown-calendar-calendar-check-langKnown-constraint-rule-73"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7830,7 +7885,7 @@ langKnown =
   }
 listOrg =
   
-  ## (list of organizations) contains a list of elements, each of which provides information about an identifiable organization. [13.2.2. Organizational Names]
+  ## (list of organizations) contains a list of elements, each of which provides information about an identifiable organization. [14.2.2. Organizational Names]
   element listOrg {
     (model.headLike*,
      desc*,
@@ -7840,11 +7895,12 @@ listOrg =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listEvent =
   
-  ## (list of events) contains a list of descriptions, each of which provides information about an identifiable event. [13.3.1. Basic Principles]
+  ## (list of events) contains a list of descriptions, each of which provides information about an identifiable event. [14.3.1. Basic Principles]
   element listEvent {
     (model.headLike*,
      desc*,
@@ -7854,11 +7910,12 @@ listEvent =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listPerson =
   
-  ## (list of persons) contains a list of descriptions, each of which provides information about an identifiable person or a group of people, for example the participants in a language interaction, or the people referred to in a historical source. [13.3.2. The Person Element 15.2. Contextual Information 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (list of persons) contains a list of descriptions, each of which provides information about an identifiable person or a group of people, for example the participants in a language interaction, or the people referred to in a historical source. [14.3.2. The Person Element 16.2. Contextual Information 2.4. The Profile Description 16.3.2. Declarable Elements]
   element listPerson {
     (model.headLike*,
      desc*,
@@ -7868,11 +7925,12 @@ listPerson =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listPlace =
   
-  ## (list of places) contains a list of places, optionally followed by a list of relationships (other than containment) defined amongst them. [2.2.7. The Source Description 13.3.4. Places]
+  ## (list of places) contains a list of places, optionally followed by a list of relationships (other than containment) defined amongst them. [2.2.7. The Source Description 14.3.4. Places]
   element listPlace {
     (model.headLike*,
      desc*,
@@ -7882,11 +7940,12 @@ listPlace =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listRelation =
   
-  ## provides information about relationships identified amongst people, places, and organizations, either informally as prose or as formally expressed relation links. [13.3.2.3. Personal Relationships]
+  ## provides information about relationships identified amongst people, places, and organizations, either informally as prose or as formally expressed relation links. [14.3.2.3. Personal Relationships]
   element listRelation {
     (model.headLike*,
      desc*,
@@ -7894,11 +7953,12 @@ listRelation =
     att.global.attributes,
     att.typed.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 location =
   
-  ## (location) defines the location of a place as a set of geographical coordinates, in terms of other named geo-political entities, or as an address. [13.3.4. Places]
+  ## (location) defines the location of a place as a set of geographical coordinates, in terms of other named geo-political entities, or as an address. [14.3.4. Places]
   element location {
     (model.labelLike
      | model.placeNamePart
@@ -7911,6 +7971,7 @@ location =
     att.typed.attributes,
     att.datable.attributes,
     att.editLike.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7920,7 +7981,7 @@ location =
      }?)
     >> sch:pattern [
          id =
-           "test15-location-calendar-calendar-check-location-constraint-rule-73"
+           "test15-location-calendar-calendar-check-location-constraint-rule-74"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7945,7 +8006,7 @@ location =
   }
 nationality =
   
-  ## (nationality) contains an informal description of a person's present or past nationality or citizenship. [15.2.2. The Participant Description]
+  ## (nationality) contains an informal description of a person's present or past nationality or citizenship. [16.2.2. The Participant Description]
   element nationality {
     macro.phraseSeq,
     att.global.attributes,
@@ -7955,7 +8016,6 @@ nationality =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] birth; 2] naturalised; 3] self-assigned
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7968,7 +8028,7 @@ nationality =
      }?)
     >> sch:pattern [
          id =
-           "test15-nationality-calendar-calendar-check-nationality-constraint-rule-74"
+           "test15-nationality-calendar-calendar-check-nationality-constraint-rule-75"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7993,7 +8053,7 @@ nationality =
   }
 occupation =
   
-  ## (occupation) contains an informal description of a person's trade, profession or occupation. [15.2.2. The Participant Description]
+  ## (occupation) contains an informal description of a person's trade, profession or occupation. [16.2.2. The Participant Description]
   element occupation {
     macro.specialPara,
     att.global.attributes,
@@ -8003,7 +8063,6 @@ occupation =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -8016,7 +8075,7 @@ occupation =
      }?)
     >> sch:pattern [
          id =
-           "test15-occupation-calendar-calendar-check-occupation-constraint-rule-75"
+           "test15-occupation-calendar-calendar-check-occupation-constraint-rule-76"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8061,7 +8120,7 @@ occupation =
   }
 org =
   
-  ## (organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [13.3.3. Organizational Data]
+  ## (organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [14.3.3. Organizational Data]
   element org {
     (model.headLike*,
      (model.pLike*
@@ -8087,7 +8146,7 @@ org =
   }
 person =
   
-  ## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [13.3.2. The Person Element 15.2.2. The Participant Description]
+  ## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [14.3.2. The Person Element 16.2.2. The Participant Description]
   element person {
     (model.pLike+ | (model.personPart | model.global | ptr)*),
     att.global.attributes,
@@ -8123,7 +8182,7 @@ person =
   }
 persona =
   
-  ## provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [13.3.2. The Person Element]
+  ## provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [14.3.2. The Person Element]
   element persona {
     (model.pLike+ | (model.personPart | model.global)*),
     att.global.attributes,
@@ -8159,7 +8218,7 @@ persona =
   }
 personGrp =
   
-  ## (personal group) describes a group of individuals treated as a single person for analytic purposes. [15.2.2. The Participant Description]
+  ## (personal group) describes a group of individuals treated as a single person for analytic purposes. [16.2.2. The Participant Description]
   element personGrp {
     (model.pLike+ | (model.personPart | model.global)*),
     att.global.attributes,
@@ -8199,12 +8258,13 @@ personGrp =
   }
 persPronouns =
   
-  ## (personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [13.3.2.1. Personal Characteristics]
+  ## (personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [14.3.2.1. Personal Characteristics]
   element persPronouns {
     macro.phraseSeq,
     att.global.attributes,
     att.datable.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## (evidence) indicates support for the listed personal pronouns.
     ## Suggested values include: 1] conjecture (conjecture); 2] selfIdentification (self identification); 3] trustedThirdParty (trusted third party)
@@ -8229,7 +8289,7 @@ persPronouns =
      }?)
     >> sch:pattern [
          id =
-           "test15-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-76"
+           "test15-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-77"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8262,7 +8322,7 @@ persPronouns =
   }
 place =
   
-  ## (place) contains data about a geographic location [13.3.4. Places]
+  ## (place) contains data about a geographic location [14.3.4. Places]
   element place {
     (model.headLike*,
      (model.pLike*
@@ -8280,7 +8340,7 @@ place =
   }
 population =
   
-  ## (population) contains information about the population of a place. [13.3.4.3. States, Traits, and Events]
+  ## (population) contains information about the population of a place. [14.3.4.3. States, Traits, and Events]
   element population {
     (model.headLike*,
      ((model.pLike+ | model.labelLike+),
@@ -8292,6 +8352,7 @@ population =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -8301,7 +8362,7 @@ population =
      }?)
     >> sch:pattern [
          id =
-           "test15-population-calendar-calendar-check-population-constraint-rule-77"
+           "test15-population-calendar-calendar-check-population-constraint-rule-78"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8326,11 +8387,11 @@ population =
   }
 relation =
   
-  ## (relationship) describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items. [13.3.2.3. Personal Relationships]
+  ## (relationship) describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items. [14.3.2.3. Personal Relationships]
   element relation {
     (desc?)
     >> sch:pattern [
-         id = "test15-relation-ref-or-key-or-name-constraint-rule-78"
+         id = "test15-relation-ref-or-key-or-name-constraint-rule-79"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8348,7 +8409,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test15-relation-active-mutual-constraint-rule-79"
+         id = "test15-relation-active-mutual-constraint-rule-80"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8366,7 +8427,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test15-relation-active-passive-constraint-rule-80"
+         id = "test15-relation-active-passive-constraint-rule-81"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8398,7 +8459,7 @@ relation =
      }?)
     >> sch:pattern [
          id =
-           "test15-relation-calendar-calendar-check-relation-constraint-rule-81"
+           "test15-relation-calendar-calendar-check-relation-constraint-rule-82"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8449,7 +8510,7 @@ relation =
   }
 residence =
   
-  ## (residence) describes a person's present or past places of residence. [15.2.2. The Participant Description]
+  ## (residence) describes a person's present or past places of residence. [16.2.2. The Participant Description]
   element residence {
     macro.phraseSeq,
     att.global.attributes,
@@ -8459,7 +8520,6 @@ residence =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] primary; 2] secondary; 3] temporary; 4] permanent
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -8472,7 +8532,7 @@ residence =
      }?)
     >> sch:pattern [
          id =
-           "test15-residence-calendar-calendar-check-residence-constraint-rule-82"
+           "test15-residence-calendar-calendar-check-residence-constraint-rule-83"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8497,7 +8557,7 @@ residence =
   }
 sex =
   
-  ## (sex) specifies the sex of an organism. [13.3.2.1. Personal Characteristics]
+  ## (sex) specifies the sex of an organism. [14.3.2.1. Personal Characteristics]
   element sex {
     macro.phraseSeq,
     att.global.attributes,
@@ -8513,7 +8573,7 @@ sex =
      }?)
     >> sch:pattern [
          id =
-           "test15-sex-calendar-calendar-check-sex-constraint-rule-83"
+           "test15-sex-calendar-calendar-check-sex-constraint-rule-84"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8545,7 +8605,7 @@ sex =
   }
 socecStatus =
   
-  ## (socio-economic status) contains an informal description of a person's perceived social or economic status. [15.2.2. The Participant Description]
+  ## (socio-economic status) contains an informal description of a person's perceived social or economic status. [16.2.2. The Participant Description]
   element socecStatus {
     macro.phraseSeq,
     att.global.attributes,
@@ -8555,7 +8615,6 @@ socecStatus =
     att.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] atBirth; 2] atDeath; 3] dependent; 4] inherited; 5] independent
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -8568,7 +8627,7 @@ socecStatus =
      }?)
     >> sch:pattern [
          id =
-           "test15-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-84"
+           "test15-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-85"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8613,7 +8672,7 @@ socecStatus =
   }
 state =
   
-  ## (state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics]
+  ## (state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics]
   element state {
     (state+
      | (model.headLike*,
@@ -8626,6 +8685,7 @@ state =
     att.typed.attributes,
     att.naming.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -8635,7 +8695,7 @@ state =
      }?)
     >> sch:pattern [
          id =
-           "test15-state-calendar-calendar-check-state-constraint-rule-85"
+           "test15-state-calendar-calendar-check-state-constraint-rule-86"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8660,7 +8720,7 @@ state =
   }
 terrain =
   
-  ## (terrain) contains information about the physical terrain of a place. [13.3.4.3. States, Traits, and Events]
+  ## (terrain) contains information about the physical terrain of a place. [14.3.4.3. States, Traits, and Events]
   element terrain {
     (model.headLike*,
      (model.pLike+ | model.labelLike+),
@@ -8671,6 +8731,7 @@ terrain =
     att.editLike.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -8680,7 +8741,7 @@ terrain =
      }?)
     >> sch:pattern [
          id =
-           "test15-terrain-calendar-calendar-check-terrain-constraint-rule-86"
+           "test15-terrain-calendar-calendar-check-terrain-constraint-rule-87"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8705,7 +8766,7 @@ terrain =
   }
 trait =
   
-  ## (trait) contains a description of some status or quality attributed to a person, place, or organization typically, but not necessarily, independent of the volition or action of the holder and usually not at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics]
+  ## (trait) contains a description of some status or quality attributed to a person, place, or organization typically, but not necessarily, independent of the volition or action of the holder and usually not at some specific time or for a specific date range. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics]
   element trait {
     (trait+
      | (model.headLike*,
@@ -8718,6 +8779,7 @@ trait =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -8727,7 +8789,7 @@ trait =
      }?)
     >> sch:pattern [
          id =
-           "test15-trait-calendar-calendar-check-trait-constraint-rule-87"
+           "test15-trait-calendar-calendar-check-trait-constraint-rule-88"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8752,7 +8814,7 @@ trait =
   }
 objectName =
   
-  ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]
+  ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]
   element objectName {
     macro.phraseSeq,
     att.datable.attributes,
@@ -8760,6 +8822,7 @@ objectName =
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -8769,7 +8832,7 @@ objectName =
      }?)
     >> sch:pattern [
          id =
-           "test15-objectName-calendar-calendar-check-objectName-constraint-rule-88"
+           "test15-objectName-calendar-calendar-check-objectName-constraint-rule-89"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8794,7 +8857,7 @@ objectName =
   }
 object =
   
-  ## contains a description of a single identifiable physical object. [13.3.6. Objects]
+  ## contains a description of a single identifiable physical object. [14.3.6. Objects]
   element object {
     (objectIdentifier+,
      model.headLike*,
@@ -8811,7 +8874,7 @@ object =
   }
 listObject =
   
-  ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [13.3.6. Objects]
+  ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [14.3.6. Objects]
   element listObject {
     (model.headLike*,
      desc*,
@@ -8821,11 +8884,12 @@ listObject =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 objectIdentifier =
   
-  ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [13.3.6. Objects]
+  ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [14.3.6. Objects]
   element objectIdentifier {
     (model.placeNamePart | idno | objectName | address)+,
     att.global.attributes,
@@ -8833,7 +8897,7 @@ objectIdentifier =
   }
 nym =
   
-  ## (canonical name) contains the definition for a canonical name or name component of any kind. [13.3.7. Names and Nyms]
+  ## (canonical name) contains the definition for a canonical name or name component of any kind. [14.3.7. Names and Nyms]
   element nym {
     (idno*, model.entryPart*, model.pLike*, nym*),
     att.global.attributes,
@@ -8850,7 +8914,7 @@ nym =
   }
 listNym =
   
-  ## (list of canonical names) contains a list of nyms, that is, standardized names for any thing. [13.3.7. Names and Nyms]
+  ## (list of canonical names) contains a list of nyms, that is, standardized names for any thing. [14.3.7. Names and Nyms]
   element listNym {
     (model.headLike*,
      desc*,
@@ -8860,6 +8924,7 @@ listNym =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 start = TEI
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index 72d547e26..e8820f55a 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -249,6 +249,48 @@ att.breaking.attribute.break =
   attribute break {
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
+att.cmc.attributes = att.cmc.attribute.generatedBy
+att.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "test21-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 att.cReferencing.attributes = att.cReferencing.attribute.cRef
 att.cReferencing.attribute.cRef =
   [
@@ -331,7 +373,7 @@ att.datable.w3c.attribute.to =
     | xsd:dateTime
   }?
 sch:pattern [
-  id = "test21-att.datable.w3c-att-datable-w3c-when-constraint-rule-1"
+  id = "test21-att.datable.w3c-att-datable-w3c-when-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -350,7 +392,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "test21-att.datable.w3c-att-datable-w3c-from-constraint-rule-2"
+  id = "test21-att.datable.w3c-att-datable-w3c-from-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -369,7 +411,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "test21-att.datable.w3c-att-datable-w3c-to-constraint-rule-3"
+  id = "test21-att.datable.w3c-att-datable-w3c-to-constraint-rule-4"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -632,7 +674,7 @@ att.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "test21-att.global.source-source-only_1_ODD_source-constraint-rule-4"
+    "test21-att.global.source-source-only_1_ODD_source-constraint-rule-5"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -923,7 +965,7 @@ att.measurement.attribute.commodity =
   }?
 sch:pattern [
   id =
-    "test21-att.measurement-att-measurement-unitRef-constraint-rule-5"
+    "test21-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1039,7 +1081,7 @@ att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "test21-att.typed-subtypeTyped-constraint-rule-6"
+  id = "test21-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1082,7 +1124,7 @@ att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "test21-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "test21-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1203,7 +1245,7 @@ att.spanning.attribute.spanTo =
   }?
 sch:pattern [
   id =
-    "test21-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "test21-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1259,7 +1301,7 @@ att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "test21-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "test21-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2233,6 +2275,7 @@ model.global =
 model.biblPart =
   model.respLike
   | model.imprintPart
+  | quote
   | series
   | citedRange
   | bibl
@@ -2286,7 +2329,8 @@ model.inter =
   | model.listLike
   | model.stageLike
   | model.attributable
-model.common = model.divPart | model.inter | q
+model.cmc = notAllowed
+model.common = model.divPart | model.inter | model.cmc | q
 model.phrase =
   model.segLike
   | model.highlighted
@@ -2364,6 +2408,7 @@ model.standOffPart =
   | model.biblLike
   | model.listLike
   | model.annotationLike
+  | xenoData
   | listChange
   | seg
   | listAnnotation
@@ -2434,7 +2479,7 @@ att.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "test21-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
+    "test21-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2522,7 +2567,7 @@ p =
      }*)
     >> sch:pattern [
          id =
-           "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
+           "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2544,7 +2589,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
+           "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2568,16 +2613,21 @@ p =
     att.declaring.attributes,
     att.fragmentable.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 foreign =
   
   ## (étranger) reconnaît un mot ou une expression comme appartenant à une langue différente de celle du contexte. [3.3.2.1. Foreign Words or Expressions]
-  element foreign { macro.phraseSeq, att.global.attributes, empty }
+  element foreign {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 emph =
   
   ## (mis en valeur) marque des mots ou des expressions qui sont accentués ou mis en valeur pour un motif linguistique ou rhétorique. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
-  element emph { macro.paraContent, att.global.attributes, empty }
+  element emph {
+    macro.paraContent, att.global.attributes, att.cmc.attributes, empty
+  }
 hi =
   
   ## (mis en évidence) distingue un mot ou une expression comme graphiquement distincte du texte environnant, sans en donner la raison. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
@@ -2601,6 +2651,7 @@ hi =
     att.global.responsibility.attribute.resp,
     att.global.source.attribute.source,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 distinct =
@@ -2610,6 +2661,7 @@ distinct =
     macro.phraseSeq,
     att.global.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## précise la variété de langue ou le registre de langue auquels appartiennent le mot ou l'expression.
     attribute type {
@@ -2638,6 +2690,7 @@ said =
     macro.specialPara,
     att.global.attributes,
     att.ascribed.directed.attributes,
+    att.cmc.attributes,
     
     ## peut être utilisé pour indiquer si l'on estime que l'objet cité est dit oralement ou par signes.
     attribute aloud {
@@ -2672,6 +2725,7 @@ quote =
     att.typed.attributes,
     att.msExcerpt.attributes,
     att.notated.attributes,
+    att.cmc.attributes,
     empty
   }
 q =
@@ -2681,6 +2735,7 @@ q =
     macro.specialPara,
     att.global.attributes,
     att.ascribed.directed.attributes,
+    att.cmc.attributes,
     
     ## (type) peut être utilisé pour indiquer si le passage cité correspond à une parole ou à une pensée ou encore pour le caractériser plus finement.
     ## Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (written); 4] soCalled (so called); 5] foreign (foreign); 6] distinct (distinct); 7] term; 8] emph (emph); 9] mentioned (mentioned)
@@ -2718,7 +2773,7 @@ q =
   }
 cit =
   
-  ## (citation) citation provenant d'un autre document comprenant la référence bibliographique de sa source. Dans un dictionnaire il peut contenir un exemple avec au moins une occurrence du mot employé dans l’acception qui est décrite, ou une traduction du mot-clé, ou un exemple. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]
+  ## (citation) citation provenant d'un autre document comprenant la référence bibliographique de sa source. Dans un dictionnaire il peut contenir un exemple avec au moins une occurrence du mot employé dans l’acception qui est décrite, ou une traduction du mot-clé, ou un exemple. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]
   element cit {
     (model.biblLike
      | model.egLike
@@ -2730,24 +2785,29 @@ cit =
      | q)+,
     att.global.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 mentioned =
   
   ## marque des mots ou des expressions employés métalinguistiquement [3.3.3. Quotation]
-  element mentioned { macro.phraseSeq, att.global.attributes, empty }
+  element mentioned {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 soCalled =
   
   ## (so called) contient une expression ou un mot pour lesquels l'auteur ou le narrateur renonce à toute responsabilité, par exemple en utilisant de l'italique ou des guillemets. [3.3.3. Quotation]
-  element soCalled { macro.phraseSeq, att.global.attributes, empty }
+  element soCalled {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 desc =
   
-  ## (description) contient une courte description de l'objet documenté par son élément parent, qui comprend son utilisation prévue, son but, ou son application là où c'est approprié. [22.4.1. Description of Components]
+  ## (description) contient une courte description de l'objet documenté par son élément parent, qui comprend son utilisation prévue, son but, ou son application là où c'est approprié. [23.4.1. Description of Components]
   element desc {
     macro.limitedContent
     >> sch:pattern [
          id =
-           "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
+           "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2770,21 +2830,22 @@ desc =
        ],
     att.global.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Suggested values include: 1] deprecationInfo (deprecation information)
     attribute type {
       
-      ## (deprecation
-      ##           information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
-      "deprecationInfo"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     empty
   }
 gloss =
   
-  ## (glose) identifie une expression ou un mot utilisé pour fournir une glose ou une définition à quelque autre mot ou expression. [3.4.1. Terms and Glosses 22.4.1. Description of Components]
+  ## (glose) identifie une expression ou un mot utilisé pour fournir une glose ou une définition à quelque autre mot ou expression. [3.4.1. Terms and Glosses 23.4.1. Description of Components]
   element gloss {
     macro.phraseSeq,
     att.global.attributes,
@@ -2792,6 +2853,7 @@ gloss =
     att.typed.attributes,
     att.pointing.attributes,
     att.cReferencing.attributes,
+    att.cmc.attributes,
     empty
   }
 term =
@@ -2806,13 +2868,18 @@ term =
     att.canonical.attributes,
     att.sortable.attributes,
     att.cReferencing.attributes,
+    att.cmc.attributes,
     empty
   }
 ruby =
   
   ## (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]
   element ruby {
-    (rb, rt+), att.global.attributes, att.typed.attributes, empty
+    (rb, rt+),
+    att.global.attributes,
+    att.typed.attributes,
+    att.cmc.attributes,
+    empty
   }
 rb =
   
@@ -2835,7 +2902,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test21-rt-target-rt-target-not-span-constraint-rule-14"
+         id = "test21-rt-target-rt-target-not-span-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2858,7 +2925,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test21-rt-from-rt-from-constraint-rule-15"
+         id = "test21-rt-from-rt-from-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2883,7 +2950,7 @@ rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "test21-rt-to-rt-to-constraint-rule-16"
+         id = "test21-rt-to-rt-to-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2907,7 +2974,9 @@ rt =
 sic =
   
   ## (du latin, ainsi) contient du texte reproduit quoiqu'il est apparemment incorrect ou inexact [3.5.1. Apparent Errors]
-  element sic { macro.paraContent, att.global.attributes, empty }
+  element sic {
+    macro.paraContent, att.global.attributes, att.cmc.attributes, empty
+  }
 corr =
   
   ## (correction) contient la forme correcte d'un passage qui est considéré erroné dans la copie du texte. [3.5.1. Apparent Errors]
@@ -2916,6 +2985,7 @@ corr =
     att.global.attributes,
     att.editLike.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 choice =
@@ -2926,24 +2996,28 @@ choice =
     (model.choicePart | choice),
     (model.choicePart | choice)*,
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 reg =
   
   ## (régularisation) contient une partie qui a été régularisée ou normalisée de façon quelconque [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element reg {
     macro.paraContent,
     att.global.attributes,
     att.editLike.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 orig =
   
   ## (forme originale) contient une partie notée comme étant fidèle à l'original et non pas normalisée ou corrigée. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
-  element orig { macro.paraContent, att.global.attributes, empty }
+  ## Normalization 13. Critical Apparatus]
+  element orig {
+    macro.paraContent, att.global.attributes, att.cmc.attributes, empty
+  }
 gap =
   
   ## (omission) indique une omission dans une transcription, soit pour des raisons éditoriales décrites dans l'en-tête TEI au cours d’un échantillonnage, soit parce que le matériau est illisible ou inaudible. [3.5.3. Additions, Deletions, and Omissions]
@@ -2953,6 +3027,7 @@ gap =
     att.timed.attributes,
     att.editLike.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     
     ## (reason) donne la raison de l'omission
     ## Suggested values include: 1] cancelled (cancelled); 2] deleted (deleted); 3] editorial (editorial); 4] illegible (illegible); 5] inaudible (inaudible); 6] irrelevant (irrelevant); 7] sampling (sampling)
@@ -3010,6 +3085,7 @@ add =
     att.placement.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     empty
   }
 del =
@@ -3021,16 +3097,18 @@ del =
     att.transcriptional.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     empty
   }
 unclear =
   
-  ## (incertain) contient un mot, une expression ou bien un passage qui ne peut être transcrit avec certitude parce qu'il est illisible ou inaudible dans la source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
+  ## (incertain) contient un mot, une expression ou bien un passage qui ne peut être transcrit avec certitude parce qu'il est illisible ou inaudible dans la source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
   element unclear {
     macro.paraContent,
     att.global.attributes,
     att.editLike.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     
     ## indique pourquoi il est difficile de transcrire le document
     ## Suggested values include: 1] illegible (illegible); 2] inaudible (inaudible); 3] faded (faded); 4] background_noise (background noise); 5] eccentric_ductus (eccentric ductus)
@@ -3072,6 +3150,7 @@ name =
     att.datable.attributes,
     att.editLike.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -3081,7 +3160,7 @@ name =
      }?)
     >> sch:pattern [
          id =
-           "test21-name-calendar-calendar-check-name-constraint-rule-17"
+           "test21-name-calendar-calendar-check-name-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3106,24 +3185,28 @@ name =
   }
 rs =
   
-  ## (chaîne de référence) contient un nom générique ou une chaîne permettant de s'y référer. [13.2.1. Personal Names 3.6.1. Referring Strings]
+  ## (chaîne de référence) contient un nom générique ou une chaîne permettant de s'y référer. [14.2.1. Personal Names 3.6.1. Referring Strings]
   element rs {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 email =
   
   ## (adresse de courrier électronique) contient l'adresse de courriel identifiant un emplacement où un courriel peut être envoyé. [3.6.2. Addresses]
-  element email { macro.phraseSeq, att.global.attributes, empty }
+  element email {
+    macro.phraseSeq, att.global.attributes, att.cmc.attributes, empty
+  }
 address =
   
   ## (address) contient une adresse postale ou d'un autre type, par exemple l'adresse d'un éditeur, d'un organisme ou d'une personne. [3.6.2. Addresses 2.2.4. Publication, Distribution, Licensing, etc. 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element address {
     (model.global*, (model.addrPart, model.global*)+),
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 addrLine =
@@ -3151,23 +3234,16 @@ num =
     att.global.attributes,
     att.typed.attribute.subtype,
     att.ranging.attributes,
+    att.cmc.attributes,
     
     ## indique le type de valeur numérique
-    ## Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage
     attribute type {
       
-      ## nombre entier ou décimal, par exemple 21, 21.5
-      "cardinal"
-      | 
-        ## nombre ordinal, par exemple 21ème
-        "ordinal"
-      | 
-        ## fraction, par exemple une moitié ou trois-quarts
-        "fraction"
+      ## first type
+      "A"
       | 
-        ## un pourcentage
-        "percentage"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+        ## second type
+        "B"
     }?,
     
     ## fournit la valeur d'un nombre sous une forme normalisée.
@@ -3187,6 +3263,7 @@ measure =
     att.global.attributes,
     att.typed.attribute.subtype,
     att.measurement.attributes,
+    att.cmc.attributes,
     att.ranging.attributes,
     
     ## précise le type de mesure exprimée dans la typologie adaptée.
@@ -3202,12 +3279,13 @@ measure =
   }
 measureGrp =
   
-  ## (groupe de mesures) contient un groupe de spécifications des dimensions qui concernent un même objet, par exemple la hauteur et la largeur d'une page d'un manuscrit. [10.3.4. Dimensions]
+  ## (groupe de mesures) contient un groupe de spécifications des dimensions qui concernent un même objet, par exemple la hauteur et la largeur d'une page d'un manuscrit. [11.3.4. Dimensions]
   element measureGrp {
     (text | model.gLike | model.measureLike)*,
     att.global.attributes,
     att.measurement.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 unit =
@@ -3219,11 +3297,12 @@ unit =
     att.global.attributes,
     att.typed.attributes,
     att.measurement.attributes,
+    att.cmc.attributes,
     empty
   }
 date =
   
-  ## (date) contient une date exprimée dans n'importe quel format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]
+  ## (date) contient une date exprimée dans n'importe quel format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]
   element date {
     (text | model.gLike | model.phrase | model.global)*,
     att.global.attributes,
@@ -3233,6 +3312,7 @@ date =
     att.editLike.attributes,
     att.dimensions.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 time =
@@ -3247,6 +3327,7 @@ time =
     att.editLike.attributes,
     att.dimensions.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 abbr =
@@ -3256,6 +3337,7 @@ abbr =
     macro.phraseSeq,
     att.global.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ##
     attribute type {
@@ -3275,15 +3357,16 @@ expan =
     macro.phraseSeq,
     att.global.attributes,
     att.editLike.attributes,
+    att.cmc.attributes,
     empty
   }
 ptr =
   
-  ## (pointeur) définit un pointeur vers un autre emplacement. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (pointeur) définit un pointeur vers un autre emplacement. [3.7. Simple Links and Cross-References 17.1. Links]
   element ptr {
     empty
     >> sch:pattern [
-         id = "test21-ptr-ptrAtts-constraint-rule-18"
+         id = "test21-ptr-ptrAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3308,6 +3391,7 @@ ptr =
     att.internetMedia.attributes,
     att.pointing.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
     attribute type {
@@ -3322,11 +3406,11 @@ ptr =
   }
 ref =
   
-  ## (référence) définit une référence vers un autre emplacement, la référence étant éventuellement modifiée ou complétée par un texte ou un commentaire. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (référence) définit une référence vers un autre emplacement, la référence étant éventuellement modifiée ou complétée par un texte ou un commentaire. [3.7. Simple Links and Cross-References 17.1. Links]
   element ref {
     macro.paraContent
     >> sch:pattern [
-         id = "test21-ref-refAtts-constraint-rule-19"
+         id = "test21-ref-refAtts-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3352,6 +3436,7 @@ ref =
     att.internetMedia.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 \list =
@@ -3366,7 +3451,7 @@ ref =
      (model.divBottom, model.global*)*)
     >> sch:pattern [
          id =
-           "test21-list-gloss-list-must-have-labels-constraint-rule-20"
+           "test21-list-gloss-list-must-have-labels-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3386,31 +3471,16 @@ ref =
     att.global.attributes,
     att.sortable.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## (type) describes the nature of the items in the list.
-    ## Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)
     attribute type {
-      [
-        a:documentation [
-          "(gloss) chaque item de la liste commente un terme ou un concept qui est donné par un élément "
-          ns1:code [ "<label>" ]
-          " précédant l'item de la liste."
-        ]
-      ]
-      "gloss"
-      | 
-        ## (index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.
-        "index"
-      | 
-        ## (instructions) each list item is a step in a sequence of instructions, as in a recipe.
-        "instructions"
-      | 
-        ## (litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.
-        "litany"
+      
+      ## first type
+      "A"
       | 
-        ## (syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.
-        "syllogism"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+        ## second type
+        "B"
     }?,
     empty
   }
@@ -3432,6 +3502,7 @@ label =
     att.typed.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 head =
@@ -3449,6 +3520,7 @@ head =
     att.typed.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 headLabel =
@@ -3461,7 +3533,7 @@ headItem =
   element headItem { macro.phraseSeq, att.global.attributes, empty }
 note =
   
-  ## (note) contient une note ou une annotation [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]
+  ## (note) contient une note ou une annotation [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]
   element note {
     macro.specialPara,
     att.global.attributes,
@@ -3470,6 +3542,7 @@ note =
     att.typed.attributes,
     att.written.attributes,
     att.anchoring.attributes,
+    att.cmc.attributes,
     empty
   }
 noteGrp =
@@ -3483,6 +3556,7 @@ noteGrp =
     att.typed.attributes,
     att.written.attributes,
     att.anchoring.attributes,
+    att.cmc.attributes,
     empty
   }
 index =
@@ -3492,6 +3566,7 @@ index =
     (term, index?)*,
     att.global.attributes,
     att.spanning.attributes,
+    att.cmc.attributes,
     
     ## donne un nom pour préciser à quel index (parmi plusieurs) appartient l'entrée d'index.
     attribute indexName { xsd:Name }?,
@@ -3510,6 +3585,7 @@ media =
     att.resourced.attributes,
     att.declaring.attributes,
     att.timed.attributes,
+    att.cmc.attributes,
     
     ## (type de média MIME) spécifie le type MIME (multipurpose internet mail extension) applicable.
     attribute mimeType {
@@ -3521,7 +3597,7 @@ media =
   }
 graphic =
   
-  ## (graphic) indique l'emplacement d'une image, d'une illustration ou d'un schéma intégrés. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]
+  ## (graphic) indique l'emplacement d'une image, d'une illustration ou d'un schéma intégrés. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]
   element graphic {
     model.descLike*,
     att.global.attributes,
@@ -3529,6 +3605,7 @@ graphic =
     att.resourced.attributes,
     att.declaring.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 binaryObject =
@@ -3540,6 +3617,7 @@ binaryObject =
     att.media.attributes,
     att.timed.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     [
       a:documentation [
         "l'encodage utilisé pour encoder les données binaires. Sans autre spécification il est supposé s'agir de "
@@ -3566,6 +3644,7 @@ milestone =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 gb =
@@ -3579,6 +3658,7 @@ gb =
     att.spanning.attributes,
     att.breaking.attributes,
     att.edition.attributes,
+    att.cmc.attributes,
     empty
   }
 pb =
@@ -3592,6 +3672,7 @@ pb =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 lb =
@@ -3605,6 +3686,7 @@ lb =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 cb =
@@ -3618,6 +3700,7 @@ cb =
     att.edition.attributes,
     att.spanning.attributes,
     att.breaking.attributes,
+    att.cmc.attributes,
     empty
   }
 analytic =
@@ -3680,7 +3763,7 @@ author =
   element author {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-author-calendar-check-author-constraint-rule-21"
+         id = "test21-author-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3716,7 +3799,7 @@ author =
      }?)
     >> sch:pattern [
          id =
-           "test21-author-calendar-calendar-check-author-constraint-rule-22"
+           "test21-author-calendar-calendar-check-author-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3745,7 +3828,7 @@ editor =
   element editor {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-editor-calendar-check-editor-constraint-rule-23"
+         id = "test21-editor-calendar-check-editor-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3793,7 +3876,7 @@ editor =
      }?)
     >> sch:pattern [
          id =
-           "test21-editor-calendar-calendar-check-editor-constraint-rule-24"
+           "test21-editor-calendar-calendar-check-editor-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3843,7 +3926,7 @@ resp =
      }?)
     >> sch:pattern [
          id =
-           "test21-resp-calendar-calendar-check-resp-constraint-rule-25"
+           "test21-resp-calendar-calendar-check-resp-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3872,7 +3955,7 @@ title =
   element title {
     ((text | hi)*)
     >> sch:pattern [
-         id = "test21-title-calendar-check-title-constraint-rule-26"
+         id = "test21-title-calendar-check-title-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3897,6 +3980,7 @@ title =
     att.global.attribute.xmllang,
     att.canonical.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -3906,7 +3990,7 @@ title =
      }?)
     >> sch:pattern [
          id =
-           "test21-title-calendar-calendar-check-title-constraint-rule-27"
+           "test21-title-calendar-calendar-check-title-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3956,6 +4040,7 @@ meeting =
     att.global.attributes,
     att.datable.attributes,
     att.canonical.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -3965,7 +4050,7 @@ meeting =
      }?)
     >> sch:pattern [
          id =
-           "test21-meeting-calendar-calendar-check-meeting-constraint-rule-28"
+           "test21-meeting-calendar-calendar-check-meeting-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4030,7 +4115,7 @@ pubPlace =
   }
 bibl =
   
-  ## (référence bibliographique.) contient une référence bibliographique faiblement structurée dans laquelle les sous-composants peuvent ou non être explicitement balisés. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (référence bibliographique.) contient une référence bibliographique faiblement structurée dans laquelle les sous-composants peuvent ou non être explicitement balisés. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element bibl {
     (text
      | model.gLike
@@ -4046,11 +4131,12 @@ bibl =
     att.typed.attributes,
     att.sortable.attributes,
     att.docStatus.attributes,
+    att.cmc.attributes,
     empty
   }
 biblStruct =
   
-  ## (référence bibliographique structurée) contient une référence bibliographique dans laquelle seuls des sous-éléments bibliographiques apparaissent et cela, selon un ordre déterminé. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (référence bibliographique structurée) contient une référence bibliographique dans laquelle seuls des sous-éléments bibliographiques apparaissent et cela, selon un ordre déterminé. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblStruct {
     (analytic*,
      (monogr, series*)+,
@@ -4060,11 +4146,12 @@ biblStruct =
     att.typed.attributes,
     att.sortable.attributes,
     att.docStatus.attributes,
+    att.cmc.attributes,
     empty
   }
 listBibl =
   
-  ## (liste de références bibliographiques) contient une liste de références bibliographiques de toute nature. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (liste de références bibliographiques) contient une liste de références bibliographiques de toute nature. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element listBibl {
     (model.headLike*,
      desc*,
@@ -4075,6 +4162,7 @@ listBibl =
     att.sortable.attributes,
     att.declarable.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 relatedItem =
@@ -4083,7 +4171,7 @@ relatedItem =
   element relatedItem {
     ((model.biblLike | model.ptrLike)?)
     >> sch:pattern [
-         id = "test21-relatedItem-targetorcontent1-constraint-rule-29"
+         id = "test21-relatedItem-targetorcontent1-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4124,7 +4212,7 @@ l =
     ((text | model.gLike | model.phrase | model.inter | model.global)*)
     >> sch:pattern [
          id =
-           "test21-l-abstractModel-structure-l-in-l-constraint-rule-30"
+           "test21-l-abstractModel-structure-l-in-l-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4144,6 +4232,7 @@ l =
        ],
     att.global.attributes,
     att.fragmentable.attributes,
+    att.cmc.attributes,
     empty
   }
 lg =
@@ -4164,7 +4253,7 @@ lg =
       | lg)*,
      (model.divBottom, model.global*)*)
     >> sch:pattern [
-         id = "test21-lg-atleast1oflggapl-constraint-rule-31"
+         id = "test21-lg-atleast1oflggapl-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4184,7 +4273,7 @@ lg =
        ]
     >> sch:pattern [
          id =
-           "test21-lg-abstractModel-structure-lg-in-l-constraint-rule-32"
+           "test21-lg-abstractModel-structure-lg-in-l-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4206,6 +4295,7 @@ lg =
     att.divLike.attributes,
     att.typed.attribute.subtype,
     att.declaring.attributes,
+    att.cmc.attributes,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
     [ a:defaultValue = "A" ]
@@ -4249,6 +4339,7 @@ stage =
     att.global.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     
     ## indique le type d'indication scénique
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -4288,7 +4379,7 @@ stage =
   }
 teiCorpus =
   
-  ## (TEI corpus) contient la totalité d'un corpus encodé selon la TEI, comprenant un seul en-tête de corpus et un ou plusieurs éléments TEI dont chacun contient un seul en-tête textuel et un texte. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (TEI corpus) contient la totalité d'un corpus encodé selon la TEI, comprenant un seul en-tête de corpus et un ou plusieurs éléments TEI dont chacun contient un seul en-tête textuel et un texte. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element teiCorpus {
     (teiHeader, model.resource*, model.describedResource+),
     att.global.attributes,
@@ -4336,7 +4427,7 @@ textLang =
     a:documentation [
       "(langues du texte) décrit les langues et systèmes d'écriture utilisés dans un manuscrit (et non dans la description du manuscrit, dont les langues et systèmes d'écriture sont décrits dans l'élément "
       ns1:code [ "<langUsage>" ]
-      "). [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]"
+      "). [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]"
     ]
   ]
   element textLang {
@@ -4547,7 +4638,7 @@ att.datable.iso.attribute.to-iso =
   }?
 orgName =
   
-  ## (nom d'organisation) contient le nom d'une organisation. [13.2.2. Organizational Names]
+  ## (nom d'organisation) contient le nom d'une organisation. [14.2.2. Organizational Names]
   element orgName {
     macro.phraseSeq,
     att.global.attributes,
@@ -4555,6 +4646,7 @@ orgName =
     att.editLike.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4564,7 +4656,7 @@ orgName =
      }?)
     >> sch:pattern [
          id =
-           "test21-orgName-calendar-calendar-check-orgName-constraint-rule-33"
+           "test21-orgName-calendar-calendar-check-orgName-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4589,7 +4681,7 @@ orgName =
   }
 persName =
   
-  ## (nom de personne) contient un nom propre ou une expression nominale se référant à une personne, pouvant inclure tout ou partie de ses prénoms, noms de famille, titres honorifiques, noms ajoutés, etc. [13.2.1. Personal Names]
+  ## (nom de personne) contient un nom propre ou une expression nominale se référant à une personne, pouvant inclure tout ou partie de ses prénoms, noms de famille, titres honorifiques, noms ajoutés, etc. [14.2.1. Personal Names]
   element persName {
     macro.phraseSeq,
     att.global.attributes,
@@ -4597,6 +4689,7 @@ persName =
     att.editLike.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4606,7 +4699,7 @@ persName =
      }?)
     >> sch:pattern [
          id =
-           "test21-persName-calendar-calendar-check-persName-constraint-rule-34"
+           "test21-persName-calendar-calendar-check-persName-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4631,68 +4724,77 @@ persName =
   }
 surname =
   
-  ## (nom de famille) contient un nom de famille (hérité) par opposition à un nom donné, nom de baptême ou surnom. [13.2.1. Personal Names]
+  ## (nom de famille) contient un nom de famille (hérité) par opposition à un nom donné, nom de baptême ou surnom. [14.2.1. Personal Names]
   element surname {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 forename =
   
-  ## (prénom) contient un prénom, qu'il soit donné ou un nom de baptême. [13.2.1. Personal Names]
+  ## (prénom) contient un prénom, qu'il soit donné ou un nom de baptême. [14.2.1. Personal Names]
   element forename {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 genName =
   
-  ## (qualificatif générationnel de nom) contient une composante de nom utilisée pour distinguer des noms, par ailleurs similaires, sur la base de l'âge ou de la génération des personnes concernées. [13.2.1. Personal Names]
+  ## (qualificatif générationnel de nom) contient une composante de nom utilisée pour distinguer des noms, par ailleurs similaires, sur la base de l'âge ou de la génération des personnes concernées. [14.2.1. Personal Names]
   element genName {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 nameLink =
   
-  ## (lien entre les composants d'un nom) contient une particule ou une expression exprimant un lien, utilisés dans un nom mais considérés comme n'en faisant pas partie, comme "van der" ou "de". [13.2.1. Personal Names]
+  ## (lien entre les composants d'un nom) contient une particule ou une expression exprimant un lien, utilisés dans un nom mais considérés comme n'en faisant pas partie, comme van der ou de. [14.2.1. Personal Names]
   element nameLink {
-    macro.phraseSeq, att.global.attributes, att.typed.attributes, empty
+    macro.phraseSeq,
+    att.global.attributes,
+    att.typed.attributes,
+    att.cmc.attributes,
+    empty
   }
 addName =
   
-  ## (nom additionnel) contient une composante de nom additionnelle, comme un surnom, une épithète, un alias ou toute autre expression descriptive utilisée dans un nom de personne. [13.2.1. Personal Names]
+  ## (nom additionnel) contient une composante de nom additionnelle, comme un surnom, une épithète, un alias ou toute autre expression descriptive utilisée dans un nom de personne. [14.2.1. Personal Names]
   element addName {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 roleName =
   
-  ## (rôle) contient un composant du nom d'une personne, indiquant que celle-ci a un rôle ou une position particulière dans la société, comme un titre ou un rang officiel. [13.2.1. Personal Names]
+  ## (rôle) contient un composant du nom d'une personne, indiquant que celle-ci a un rôle ou une position particulière dans la société, comme un titre ou un rang officiel. [14.2.1. Personal Names]
   element roleName {
     macro.phraseSeq,
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 placeName =
   
-  ## (nom de lieu) contient un nom de lieu absolu ou relatif. [13.2.3. Place Names]
+  ## (nom de lieu) contient un nom de lieu absolu ou relatif. [14.2.3. Place Names]
   element placeName {
     macro.phraseSeq
     >> sch:pattern [
          id =
-           "test21-placeName-calendar-check-placeName-constraint-rule-35"
+           "test21-placeName-calendar-check-placeName-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4718,6 +4820,7 @@ placeName =
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## alternative
     attribute alt { text }?,
@@ -4730,7 +4833,7 @@ placeName =
      }?)
     >> sch:pattern [
          id =
-           "test21-placeName-calendar-calendar-check-placeName-constraint-rule-36"
+           "test21-placeName-calendar-calendar-check-placeName-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4755,13 +4858,14 @@ placeName =
   }
 bloc =
   
-  ## (bloc) contient le nom d'une unité géo-politique composée d'au moins deux états ou pays [13.2.3. Place Names]
+  ## (bloc) contient le nom d'une unité géo-politique composée d'au moins deux états ou pays [14.2.3. Place Names]
   element bloc {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4771,7 +4875,7 @@ bloc =
      }?)
     >> sch:pattern [
          id =
-           "test21-bloc-calendar-calendar-check-bloc-constraint-rule-37"
+           "test21-bloc-calendar-calendar-check-bloc-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4796,13 +4900,14 @@ bloc =
   }
 country =
   
-  ## (pays) contient le nom d'une unité géo-politique, comme une nation, un pays, une colonie ou une communauté, plus grande ou administrativement supérieure à une région et plus petite qu'un bloc. [13.2.3. Place Names]
+  ## (pays) contient le nom d'une unité géo-politique, comme une nation, un pays, une colonie ou une communauté, plus grande ou administrativement supérieure à une région et plus petite qu'un bloc. [14.2.3. Place Names]
   element country {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4812,7 +4917,7 @@ country =
      }?)
     >> sch:pattern [
          id =
-           "test21-country-calendar-calendar-check-country-constraint-rule-38"
+           "test21-country-calendar-calendar-check-country-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4837,13 +4942,14 @@ country =
   }
 region =
   
-  ## (région) contient le nom d'une unité administrative comme un état, une province ou un comté, plus grande qu'un lieu de peuplement, mais plus petite qu'un pays. [13.2.3. Place Names]
+  ## (région) contient le nom d'une unité administrative comme un état, une province ou un comté, plus grande qu'un lieu de peuplement, mais plus petite qu'un pays. [14.2.3. Place Names]
   element region {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4853,7 +4959,7 @@ region =
      }?)
     >> sch:pattern [
          id =
-           "test21-region-calendar-calendar-check-region-constraint-rule-39"
+           "test21-region-calendar-calendar-check-region-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4878,13 +4984,14 @@ region =
   }
 settlement =
   
-  ## (lieu de peuplement) contient le nom d'un lieu de peuplement comme une cité, une ville ou un village, identifié comme une unité géo-politique ou administrative unique. [13.2.3. Place Names]
+  ## (lieu de peuplement) contient le nom d'un lieu de peuplement comme une cité, une ville ou un village, identifié comme une unité géo-politique ou administrative unique. [14.2.3. Place Names]
   element settlement {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4894,7 +5001,7 @@ settlement =
      }?)
     >> sch:pattern [
          id =
-           "test21-settlement-calendar-calendar-check-settlement-constraint-rule-40"
+           "test21-settlement-calendar-calendar-check-settlement-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4919,13 +5026,14 @@ settlement =
   }
 district =
   
-  ## (district) contient le nom d'une subdivision quelconque d'une ville, comme une paroisse, une circonscription électorale ou toute autre unité administrative ou géographique. [13.2.3. Place Names]
+  ## (district) contient le nom d'une subdivision quelconque d'une ville, comme une paroisse, une circonscription électorale ou toute autre unité administrative ou géographique. [14.2.3. Place Names]
   element district {
     macro.phraseSeq,
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
     att.datable.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4935,7 +5043,7 @@ district =
      }?)
     >> sch:pattern [
          id =
-           "test21-district-calendar-calendar-check-district-constraint-rule-41"
+           "test21-district-calendar-calendar-check-district-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4960,7 +5068,7 @@ district =
   }
 offset =
   
-  ## (distance relative) la partie d'une expression temporelle ou spatiale qui indique la distance et/ou la direction entre les deux lieux, dates ou heures sur lesquels porte l'expression. [13.2.3. Place Names]
+  ## (distance relative) la partie d'une expression temporelle ou spatiale qui indique la distance et/ou la direction entre les deux lieux, dates ou heures sur lesquels porte l'expression. [14.2.3. Place Names]
   element offset {
     macro.phraseSeq,
     att.datable.attributes,
@@ -4969,6 +5077,7 @@ offset =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -4978,7 +5087,7 @@ offset =
      }?)
     >> sch:pattern [
          id =
-           "test21-offset-calendar-calendar-check-offset-constraint-rule-42"
+           "test21-offset-calendar-calendar-check-offset-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5003,7 +5112,7 @@ offset =
   }
 geogName =
   
-  ## (nom de lieu géographique) un nom associé à une caractéristique géographique comme Windrush Valley ou le Mont Sinaï. [13.2.3. Place Names]
+  ## (nom de lieu géographique) un nom associé à une caractéristique géographique comme Windrush Valley ou le Mont Sinaï. [14.2.3. Place Names]
   element geogName {
     macro.phraseSeq,
     att.datable.attributes,
@@ -5011,6 +5120,7 @@ geogName =
     att.global.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -5020,7 +5130,7 @@ geogName =
      }?)
     >> sch:pattern [
          id =
-           "test21-geogName-calendar-calendar-check-geogName-constraint-rule-43"
+           "test21-geogName-calendar-calendar-check-geogName-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5045,7 +5155,7 @@ geogName =
   }
 geogFeat =
   
-  ## (nom de caractéristique géographique) contient un nom commun identifiant une caractéristique géographique contenue dans un nom de lieu, comme vallée, mont, etc. [13.2.3. Place Names]
+  ## (nom de caractéristique géographique) contient un nom commun identifiant une caractéristique géographique contenue dans un nom de lieu, comme vallée, mont, etc. [14.2.3. Place Names]
   element geogFeat {
     macro.phraseSeq,
     att.datable.attributes,
@@ -5054,6 +5164,7 @@ geogFeat =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -5063,7 +5174,7 @@ geogFeat =
      }?)
     >> sch:pattern [
          id =
-           "test21-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-44"
+           "test21-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5088,7 +5199,7 @@ geogFeat =
   }
 eventName =
   
-  ## (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]
+  ## (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]
   element eventName {
     macro.phraseSeq,
     att.global.attributes,
@@ -5100,7 +5211,7 @@ eventName =
   }
 affiliation =
   
-  ## (affiliation) contient une description non formalisée portant sur l'affiliation présente ou passée d'une personne à une organisation, par exemple un employeur ou un sponsor. [15.2.2. The Participant Description]
+  ## (affiliation) contient une description non formalisée portant sur l'affiliation présente ou passée d'une personne à une organisation, par exemple un employeur ou un sponsor. [16.2.2. The Participant Description]
   element affiliation {
     macro.phraseSeq,
     att.global.attributes,
@@ -5108,11 +5219,16 @@ affiliation =
     att.datable.attributes,
     att.naming.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] sponsor; 2] recommend; 3] discredit; 4] pledged
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5123,7 +5239,7 @@ affiliation =
      }?)
     >> sch:pattern [
          id =
-           "test21-affiliation-calendar-calendar-check-affiliation-constraint-rule-45"
+           "test21-affiliation-calendar-calendar-check-affiliation-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5148,7 +5264,7 @@ affiliation =
   }
 age =
   
-  ## (âge) précise l'âge d'une personne [13.3.2.1. Personal Characteristics]
+  ## (âge) précise l'âge d'une personne [14.3.2.1. Personal Characteristics]
   element age {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -5158,9 +5274,13 @@ age =
     att.dimensions.attributes,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] western; 2] sui; 3] subjective; 4] objective; 5] inWorld (in world); 6] chronological; 7] biological; 8] psychological; 9] functional
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5171,7 +5291,7 @@ age =
      }?)
     >> sch:pattern [
          id =
-           "test21-age-calendar-calendar-check-age-constraint-rule-46"
+           "test21-age-calendar-calendar-check-age-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5199,7 +5319,7 @@ age =
   }
 birth =
   
-  ## (naissance) contient des informations sur la naissance d'une personne, comme la date et le lieu [15.2.2. The Participant Description]
+  ## (naissance) contient des informations sur la naissance d'une personne, comme la date et le lieu [16.2.2. The Participant Description]
   element birth {
     macro.phraseSeq,
     att.global.attributes,
@@ -5210,9 +5330,13 @@ birth =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] caesarean (caesarean section); 2] vaginal (vaginal delivery); 3] exNihilo (ex nihilo); 4] incorporated; 5] founded; 6] established
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5223,7 +5347,7 @@ birth =
      }?)
     >> sch:pattern [
          id =
-           "test21-birth-calendar-calendar-check-birth-constraint-rule-47"
+           "test21-birth-calendar-calendar-check-birth-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5248,7 +5372,7 @@ birth =
   }
 climate =
   
-  ## (climat) contient des informations sur le climat physique d'un lieu. [13.3.4.3. States, Traits, and Events]
+  ## (climat) contient des informations sur le climat physique d'un lieu. [14.3.4.3. States, Traits, and Events]
   element climate {
     (model.headLike*,
      (model.pLike+ | model.labelLike+),
@@ -5259,6 +5383,7 @@ climate =
     att.editLike.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -5268,7 +5393,7 @@ climate =
      }?)
     >> sch:pattern [
          id =
-           "test21-climate-calendar-calendar-check-climate-constraint-rule-48"
+           "test21-climate-calendar-calendar-check-climate-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5293,7 +5418,7 @@ climate =
   }
 death =
   
-  ## (décès) contient des informations sur le décès d'une personne, comme la date et le lieu. [15.2.2. The Participant Description]
+  ## (décès) contient des informations sur le décès d'une personne, comme la date et le lieu. [16.2.2. The Participant Description]
   element death {
     macro.phraseSeq,
     att.datable.attributes,
@@ -5304,9 +5429,13 @@ death =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] proclaimed; 2] assumed; 3] verified; 4] clinical; 5] brain; 6] natural; 7] unnatural; 8] fragmentation; 9] dissolution
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5317,7 +5446,7 @@ death =
      }?)
     >> sch:pattern [
          id =
-           "test21-death-calendar-calendar-check-death-constraint-rule-49"
+           "test21-death-calendar-calendar-check-death-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5342,7 +5471,7 @@ death =
   }
 education =
   
-  ## (éducation) contient la description du parcours scolaire d'une personne. [15.2.2. The Participant Description]
+  ## (éducation) contient la description du parcours scolaire d'une personne. [16.2.2. The Participant Description]
   element education {
     macro.phraseSeq,
     att.global.attributes,
@@ -5352,9 +5481,13 @@ education =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] primary; 2] secondary; 3] undergraduate; 4] graduate; 5] residency; 6] apprenticeship
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5365,7 +5498,7 @@ education =
      }?)
     >> sch:pattern [
          id =
-           "test21-education-calendar-calendar-check-education-constraint-rule-50"
+           "test21-education-calendar-calendar-check-education-constraint-rule-51"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5390,7 +5523,7 @@ education =
   }
 event =
   
-  ## (évènement) contient des données liées à tout type d'évènement significatif dans l'existence d'une personne, d'un lieu, d'un objet ou d'une organisation. [13.3.1. Basic Principles]
+  ## (évènement) contient des données liées à tout type d'évènement significatif dans l'existence d'une personne, d'un lieu, d'un objet ou d'une organisation. [14.3.1. Basic Principles]
   element event {
     (idno*,
      model.headLike*,
@@ -5417,7 +5550,7 @@ event =
      }?)
     >> sch:pattern [
          id =
-           "test21-event-calendar-calendar-check-event-constraint-rule-51"
+           "test21-event-calendar-calendar-check-event-constraint-rule-52"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5442,7 +5575,7 @@ event =
   }
 faith =
   
-  ## (religion) précise la foi, la religion ou les croyances d'une personne. [13.3.2.1. Personal Characteristics]
+  ## (religion) précise la foi, la religion ou les croyances d'une personne. [14.3.2.1. Personal Characteristics]
   element faith {
     macro.phraseSeq,
     att.global.attributes,
@@ -5452,9 +5585,13 @@ faith =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] practicing; 2] clandestine; 3] patrilineal; 4] matrilineal; 5] convert
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5465,7 +5602,7 @@ faith =
      }?)
     >> sch:pattern [
          id =
-           "test21-faith-calendar-calendar-check-faith-constraint-rule-52"
+           "test21-faith-calendar-calendar-check-faith-constraint-rule-53"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5490,7 +5627,7 @@ faith =
   }
 floruit =
   
-  ## (période d'activité) contient des informations sur la période d'activité d'une personne. [13.3.2.1. Personal Characteristics]
+  ## (période d'activité) contient des informations sur la période d'activité d'une personne. [14.3.2.1. Personal Characteristics]
   element floruit {
     macro.phraseSeq,
     att.global.attributes,
@@ -5506,7 +5643,7 @@ floruit =
      }?)
     >> sch:pattern [
          id =
-           "test21-floruit-calendar-calendar-check-floruit-constraint-rule-53"
+           "test21-floruit-calendar-calendar-check-floruit-constraint-rule-54"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5531,7 +5668,7 @@ floruit =
   }
 gender =
   
-  ## (gender) specifies the gender identity of a person, persona, or character. [13.3.2.1. Personal Characteristics]
+  ## (gender) specifies the gender identity of a person, persona, or character. [14.3.2.1. Personal Characteristics]
   element gender {
     macro.phraseSeq,
     att.global.attributes,
@@ -5547,7 +5684,7 @@ gender =
      }?)
     >> sch:pattern [
          id =
-           "test21-gender-calendar-calendar-check-gender-constraint-rule-54"
+           "test21-gender-calendar-calendar-check-gender-constraint-rule-55"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5579,16 +5716,20 @@ gender =
   }
 geo =
   
-  ## (coordonnées géographiques) contient toute expression, dans un système de notation, d'un ensemble de coordonnées géographiques représentant un point, une ligne ou une zone sur la surface de la Terre. [13.3.4.1. Varieties of Location]
+  ## (coordonnées géographiques) contient toute expression, dans un système de notation, d'un ensemble de coordonnées géographiques représentant un point, une ligne ou une zone sur la surface de la Terre. [14.3.4.1. Varieties of Location]
   element geo {
-    text, att.global.attributes, att.declaring.attributes, empty
+    text,
+    att.global.attributes,
+    att.declaring.attributes,
+    att.cmc.attributes,
+    empty
   }
 langKnowledge =
   [
     a:documentation [
       "(connaissances linguistiques) synthétise l'état des connaissances linguistiques d'une personne, soit en texte libre soit par une liste d'éléments "
       ns1:code [ "<langKnown>" ]
-      ". [13.3.2.1. Personal Characteristics]"
+      ". [14.3.2.1. Personal Characteristics]"
     ]
   ]
   element langKnowledge {
@@ -5599,9 +5740,13 @@ langKnowledge =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] listening; 2] speaking; 3] reading; 4] writing
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5612,7 +5757,7 @@ langKnowledge =
      }?)
     >> sch:pattern [
          id =
-           "test21-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-55"
+           "test21-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-56"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5647,7 +5792,7 @@ langKnowledge =
   }
 langKnown =
   
-  ## (compétence linguistique) synthétise l'état des connaissances d'une personne relativement à une langue particulière. [15.2.2. The Participant Description]
+  ## (compétence linguistique) synthétise l'état des connaissances d'une personne relativement à une langue particulière. [16.2.2. The Participant Description]
   element langKnown {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -5662,7 +5807,7 @@ langKnown =
      }?)
     >> sch:pattern [
          id =
-           "test21-langKnown-calendar-calendar-check-langKnown-constraint-rule-56"
+           "test21-langKnown-calendar-calendar-check-langKnown-constraint-rule-57"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5700,7 +5845,7 @@ langKnown =
   }
 listOrg =
   
-  ## (liste d'organisations) contient une liste d'éléments, chacun d'eux fournissant des informations sur une organisation identifiable. [13.2.2. Organizational Names]
+  ## (liste d'organisations) contient une liste d'éléments, chacun d'eux fournissant des informations sur une organisation identifiable. [14.2.2. Organizational Names]
   element listOrg {
     (model.headLike*,
      desc*,
@@ -5710,11 +5855,12 @@ listOrg =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listEvent =
   
-  ## (liste d'événements) contient une liste de descriptions, chacune d'entre elles fournissant des informations sur un événement connu. [13.3.1. Basic Principles]
+  ## (liste d'événements) contient une liste de descriptions, chacune d'entre elles fournissant des informations sur un événement connu. [14.3.1. Basic Principles]
   element listEvent {
     (model.headLike*,
      desc*,
@@ -5724,11 +5870,12 @@ listEvent =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listPerson =
   
-  ## (liste de personnes) contient une liste d'éléments, chacun d'entre eux apportant des informations sur une personne précise ou sur un groupe de personnes, par exemple les participants à une interaction linguistique, ou les personnes citées dans une source historique. [13.3.2. The Person Element 15.2. Contextual Information 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (liste de personnes) contient une liste d'éléments, chacun d'entre eux apportant des informations sur une personne précise ou sur un groupe de personnes, par exemple les participants à une interaction linguistique, ou les personnes citées dans une source historique. [14.3.2. The Person Element 16.2. Contextual Information 2.4. The Profile Description 16.3.2. Declarable Elements]
   element listPerson {
     (model.headLike*,
      desc*,
@@ -5738,11 +5885,12 @@ listPerson =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listPlace =
   
-  ## (liste de lieux) contient une liste de lieux, qui peut être suivie d'une liste de relations définies entre les lieux (autres que la relation d'inclusion). [2.2.7. The Source Description 13.3.4. Places]
+  ## (liste de lieux) contient une liste de lieux, qui peut être suivie d'une liste de relations définies entre les lieux (autres que la relation d'inclusion). [2.2.7. The Source Description 14.3.4. Places]
   element listPlace {
     (model.headLike*,
      desc*,
@@ -5752,11 +5900,12 @@ listPlace =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 listRelation =
   
-  ## donne des informations sur les relations qui existent entre des personnes, des lieux, ou des organisations, soit de manière informelle en prose, soit de manière formelle. [13.3.2.3. Personal Relationships]
+  ## donne des informations sur les relations qui existent entre des personnes, des lieux, ou des organisations, soit de manière informelle en prose, soit de manière formelle. [14.3.2.3. Personal Relationships]
   element listRelation {
     (model.headLike*,
      desc*,
@@ -5764,11 +5913,12 @@ listRelation =
     att.global.attributes,
     att.typed.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 location =
   
-  ## (localisation) définit l'emplacement d'un lieu par des coordonnées géographiques, en termes d'entités nommées dites géopolitiques, ou par une adresse. [13.3.4. Places]
+  ## (localisation) définit l'emplacement d'un lieu par des coordonnées géographiques, en termes d'entités nommées dites géopolitiques, ou par une adresse. [14.3.4. Places]
   element location {
     (model.labelLike
      | model.placeNamePart
@@ -5781,6 +5931,7 @@ location =
     att.typed.attributes,
     att.datable.attributes,
     att.editLike.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -5790,7 +5941,7 @@ location =
      }?)
     >> sch:pattern [
          id =
-           "test21-location-calendar-calendar-check-location-constraint-rule-57"
+           "test21-location-calendar-calendar-check-location-constraint-rule-58"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5815,7 +5966,7 @@ location =
   }
 nationality =
   
-  ## (nationalité) contient une description non formalisée de la nationalité ou citoyenneté présente ou passée d'une personne. [15.2.2. The Participant Description]
+  ## (nationalité) contient une description non formalisée de la nationalité ou citoyenneté présente ou passée d'une personne. [16.2.2. The Participant Description]
   element nationality {
     macro.phraseSeq,
     att.global.attributes,
@@ -5825,9 +5976,13 @@ nationality =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] birth; 2] naturalised; 3] self-assigned
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5838,7 +5993,7 @@ nationality =
      }?)
     >> sch:pattern [
          id =
-           "test21-nationality-calendar-calendar-check-nationality-constraint-rule-58"
+           "test21-nationality-calendar-calendar-check-nationality-constraint-rule-59"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5863,7 +6018,7 @@ nationality =
   }
 occupation =
   
-  ## (activité) contient une description non formalisée de l'activité, de la profession ou de l'occupation d'une personne. [15.2.2. The Participant Description]
+  ## (activité) contient une description non formalisée de l'activité, de la profession ou de l'occupation d'une personne. [16.2.2. The Participant Description]
   element occupation {
     macro.specialPara,
     att.global.attributes,
@@ -5873,9 +6028,13 @@ occupation =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -5886,7 +6045,7 @@ occupation =
      }?)
     >> sch:pattern [
          id =
-           "test21-occupation-calendar-calendar-check-occupation-constraint-rule-59"
+           "test21-occupation-calendar-calendar-check-occupation-constraint-rule-60"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5931,7 +6090,7 @@ occupation =
   }
 org =
   
-  ## (organisation) fournit des informations sur une organisation identifiable, telle qu'une entreprise, une tribu ou tout autre groupement de personnes. [13.3.3. Organizational Data]
+  ## (organisation) fournit des informations sur une organisation identifiable, telle qu'une entreprise, une tribu ou tout autre groupement de personnes. [14.3.3. Organizational Data]
   element org {
     (model.headLike*,
      (model.pLike*
@@ -5957,7 +6116,7 @@ org =
   }
 person =
   
-  ## (personne) fournit des informations sur un individu identifiable, par exemple un participant à une interaction linguistique, ou une personne citée dans une source historique. [13.3.2. The Person Element 15.2.2. The Participant Description]
+  ## (personne) fournit des informations sur un individu identifiable, par exemple un participant à une interaction linguistique, ou une personne citée dans une source historique. [14.3.2. The Person Element 16.2.2. The Participant Description]
   element person {
     (model.pLike+ | (model.personPart | model.global | ptr)*),
     att.global.attributes,
@@ -5998,7 +6157,7 @@ person =
   }
 persona =
   
-  ## provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [13.3.2. The Person Element]
+  ## provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [14.3.2. The Person Element]
   element persona {
     (model.pLike+ | (model.personPart | model.global)*),
     att.global.attributes,
@@ -6034,7 +6193,7 @@ persona =
   }
 personGrp =
   
-  ## (groupe de personnes) décrit un groupe d'individus traité comme une personne unique à des fins d'analyse. [15.2.2. The Participant Description]
+  ## (groupe de personnes) décrit un groupe d'individus traité comme une personne unique à des fins d'analyse. [16.2.2. The Participant Description]
   element personGrp {
     (model.pLike+ | (model.personPart | model.global)*),
     att.global.attributes,
@@ -6074,12 +6233,13 @@ personGrp =
   }
 persPronouns =
   
-  ## (personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [13.3.2.1. Personal Characteristics]
+  ## (personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [14.3.2.1. Personal Characteristics]
   element persPronouns {
     macro.phraseSeq,
     att.global.attributes,
     att.datable.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## (evidence) indicates support for the listed personal pronouns.
     ## Suggested values include: 1] conjecture (conjecture); 2] selfIdentification (self identification); 3] trustedThirdParty (trusted third party)
@@ -6104,7 +6264,7 @@ persPronouns =
      }?)
     >> sch:pattern [
          id =
-           "test21-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-60"
+           "test21-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-61"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6137,7 +6297,7 @@ persPronouns =
   }
 place =
   
-  ## (lieu) contient des informations sur un lieu géographique. [13.3.4. Places]
+  ## (lieu) contient des informations sur un lieu géographique. [14.3.4. Places]
   element place {
     (model.headLike*,
      (model.pLike*
@@ -6155,7 +6315,7 @@ place =
   }
 population =
   
-  ## (population) contient des informations sur la population d'un lieu. [13.3.4.3. States, Traits, and Events]
+  ## (population) contient des informations sur la population d'un lieu. [14.3.4.3. States, Traits, and Events]
   element population {
     (model.headLike*,
      ((model.pLike+ | model.labelLike+),
@@ -6167,6 +6327,7 @@ population =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -6176,7 +6337,7 @@ population =
      }?)
     >> sch:pattern [
          id =
-           "test21-population-calendar-calendar-check-population-constraint-rule-61"
+           "test21-population-calendar-calendar-check-population-constraint-rule-62"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6201,11 +6362,11 @@ population =
   }
 relation =
   
-  ## (relation) décrit tout type de relation ou de lien à l'intérieur d'un groupe donné de participants. [13.3.2.3. Personal Relationships]
+  ## (relation) décrit tout type de relation ou de lien à l'intérieur d'un groupe donné de participants. [14.3.2.3. Personal Relationships]
   element relation {
     (desc?)
     >> sch:pattern [
-         id = "test21-relation-ref-or-key-or-name-constraint-rule-62"
+         id = "test21-relation-ref-or-key-or-name-constraint-rule-63"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6223,7 +6384,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test21-relation-active-mutual-constraint-rule-63"
+         id = "test21-relation-active-mutual-constraint-rule-64"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6241,7 +6402,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test21-relation-active-passive-constraint-rule-64"
+         id = "test21-relation-active-passive-constraint-rule-65"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6273,7 +6434,7 @@ relation =
      }?)
     >> sch:pattern [
          id =
-           "test21-relation-calendar-calendar-check-relation-constraint-rule-65"
+           "test21-relation-calendar-calendar-check-relation-constraint-rule-66"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6324,7 +6485,7 @@ relation =
   }
 residence =
   
-  ## (résidence) décrit les lieux de résidence présents ou passés d'une personne. [15.2.2. The Participant Description]
+  ## (résidence) décrit les lieux de résidence présents ou passés d'une personne. [16.2.2. The Participant Description]
   element residence {
     macro.phraseSeq,
     att.global.attributes,
@@ -6334,9 +6495,13 @@ residence =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] primary; 2] secondary; 3] temporary; 4] permanent
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -6347,7 +6512,7 @@ residence =
      }?)
     >> sch:pattern [
          id =
-           "test21-residence-calendar-calendar-check-residence-constraint-rule-66"
+           "test21-residence-calendar-calendar-check-residence-constraint-rule-67"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6372,7 +6537,7 @@ residence =
   }
 sex =
   
-  ## (sexe) précise le sexe d'un organisme. [13.3.2.1. Personal Characteristics]
+  ## (sexe) précise le sexe d'un organisme. [14.3.2.1. Personal Characteristics]
   element sex {
     macro.phraseSeq,
     att.global.attributes,
@@ -6388,7 +6553,7 @@ sex =
      }?)
     >> sch:pattern [
          id =
-           "test21-sex-calendar-calendar-check-sex-constraint-rule-67"
+           "test21-sex-calendar-calendar-check-sex-constraint-rule-68"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6420,7 +6585,7 @@ sex =
   }
 socecStatus =
   
-  ## (statut socio-économique) contient une description non formalisée du statut social ou économique d'une personne. [15.2.2. The Participant Description]
+  ## (statut socio-économique) contient une description non formalisée du statut social ou économique d'une personne. [16.2.2. The Participant Description]
   element socecStatus {
     macro.phraseSeq,
     att.global.attributes,
@@ -6430,9 +6595,13 @@ socecStatus =
     att.typed.attribute.subtype,
     
     ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié.
-    ## Sample values include: 1] atBirth; 2] atDeath; 3] dependent; 4] inherited; 5] independent
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -6443,7 +6612,7 @@ socecStatus =
      }?)
     >> sch:pattern [
          id =
-           "test21-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-68"
+           "test21-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-69"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6483,7 +6652,7 @@ socecStatus =
   }
 state =
   
-  ## (statut) contient la description d'un statut ou d'une qualité actuels attribués à une personne, un lieu ou une organisation. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics]
+  ## (statut) contient la description d'un statut ou d'une qualité actuels attribués à une personne, un lieu ou une organisation. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics]
   element state {
     (state+
      | (model.headLike*,
@@ -6496,6 +6665,7 @@ state =
     att.typed.attributes,
     att.naming.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -6505,7 +6675,7 @@ state =
      }?)
     >> sch:pattern [
          id =
-           "test21-state-calendar-calendar-check-state-constraint-rule-69"
+           "test21-state-calendar-calendar-check-state-constraint-rule-70"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6530,7 +6700,7 @@ state =
   }
 terrain =
   
-  ## (terrain) contient des informations sur le terrain physique d'un lieu. [13.3.4.3. States, Traits, and Events]
+  ## (terrain) contient des informations sur le terrain physique d'un lieu. [14.3.4.3. States, Traits, and Events]
   element terrain {
     (model.headLike*,
      (model.pLike+ | model.labelLike+),
@@ -6541,6 +6711,7 @@ terrain =
     att.editLike.attributes,
     att.naming.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -6550,7 +6721,7 @@ terrain =
      }?)
     >> sch:pattern [
          id =
-           "test21-terrain-calendar-calendar-check-terrain-constraint-rule-70"
+           "test21-terrain-calendar-calendar-check-terrain-constraint-rule-71"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6575,7 +6746,7 @@ terrain =
   }
 trait =
   
-  ## (trait distinctif) contient la description d'une caractéristique culturelle et en principe permanente, attribuée à une personne ou à un lieu. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics]
+  ## (trait distinctif) contient la description d'une caractéristique culturelle et en principe permanente, attribuée à une personne ou à un lieu. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics]
   element trait {
     (trait+
      | (model.headLike*,
@@ -6588,6 +6759,7 @@ trait =
     att.naming.attributes,
     att.typed.attributes,
     att.dimensions.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -6597,7 +6769,7 @@ trait =
      }?)
     >> sch:pattern [
          id =
-           "test21-trait-calendar-calendar-check-trait-constraint-rule-71"
+           "test21-trait-calendar-calendar-check-trait-constraint-rule-72"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6622,7 +6794,7 @@ trait =
   }
 objectName =
   
-  ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]
+  ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]
   element objectName {
     macro.phraseSeq,
     att.datable.attributes,
@@ -6630,6 +6802,7 @@ objectName =
     att.global.attributes,
     att.personal.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
      attribute calendar {
@@ -6639,7 +6812,7 @@ objectName =
      }?)
     >> sch:pattern [
          id =
-           "test21-objectName-calendar-calendar-check-objectName-constraint-rule-72"
+           "test21-objectName-calendar-calendar-check-objectName-constraint-rule-73"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6664,7 +6837,7 @@ objectName =
   }
 object =
   
-  ## contains a description of a single identifiable physical object. [13.3.6. Objects]
+  ## contains a description of a single identifiable physical object. [14.3.6. Objects]
   element object {
     (objectIdentifier+,
      model.headLike*,
@@ -6681,7 +6854,7 @@ object =
   }
 listObject =
   
-  ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [13.3.6. Objects]
+  ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [14.3.6. Objects]
   element listObject {
     (model.headLike*,
      desc*,
@@ -6691,11 +6864,12 @@ listObject =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 objectIdentifier =
   
-  ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [13.3.6. Objects]
+  ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [14.3.6. Objects]
   element objectIdentifier {
     (model.placeNamePart
      | institution
@@ -6711,7 +6885,7 @@ objectIdentifier =
   }
 nym =
   
-  ## (nom canonique) contient la définition de tout nom ou partie de nom dans leur forme canonique. [13.3.7. Names and Nyms]
+  ## (nom canonique) contient la définition de tout nom ou partie de nom dans leur forme canonique. [14.3.7. Names and Nyms]
   element nym {
     (idno*, model.entryPart*, model.pLike*, nym*),
     att.global.attributes,
@@ -6728,7 +6902,7 @@ nym =
   }
 listNym =
   
-  ## (liste de noms canoniques) contient une liste de noms normalisés pour tous types d'objets. [13.3.7. Names and Nyms]
+  ## (liste de noms canoniques) contient une liste de noms normalisés pour tous types d'objets. [14.3.7. Names and Nyms]
   element listNym {
     (model.headLike*,
      desc*,
@@ -6738,6 +6912,7 @@ listNym =
     att.typed.attributes,
     att.declarable.attributes,
     att.sortable.attributes,
+    att.cmc.attributes,
     empty
   }
 att.citeStructurePart.attributes = att.citeStructurePart.attribute.use
@@ -6763,7 +6938,7 @@ att.patternReplacement.attribute.replacementPattern =
   attribute replacementPattern { text }
 teiHeader =
   
-  ## (en-tête TEI) fournit des informations descriptives et déclaratives qui constituent une page de titre électronique au début de tout texte conforme à la TEI. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]
+  ## (en-tête TEI) fournit des informations descriptives et déclaratives qui constituent une page de titre électronique au début de tout texte conforme à la TEI. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]
   element teiHeader {
     (fileDesc, model.teiHeaderPart*, revisionDesc?),
     att.global.attributes,
@@ -6806,7 +6981,7 @@ sponsor =
      }?)
     >> sch:pattern [
          id =
-           "test21-sponsor-calendar-calendar-check-sponsor-constraint-rule-73"
+           "test21-sponsor-calendar-calendar-check-sponsor-constraint-rule-74"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6846,7 +7021,7 @@ funder =
      }?)
     >> sch:pattern [
          id =
-           "test21-funder-calendar-calendar-check-funder-constraint-rule-74"
+           "test21-funder-calendar-calendar-check-funder-constraint-rule-75"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6886,7 +7061,7 @@ principal =
      }?)
     >> sch:pattern [
          id =
-           "test21-principal-calendar-calendar-check-principal-constraint-rule-75"
+           "test21-principal-calendar-calendar-check-principal-constraint-rule-76"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6923,7 +7098,7 @@ edition =
   element edition { macro.phraseSeq, att.global.attributes, empty }
 extent =
   
-  ## (étendue) décrit la taille approximative d’un texte stocké sur son support, numérique ou non numérique, exprimé dans une unité quelconque appropriée. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]
+  ## (étendue) décrit la taille approximative d’un texte stocké sur son support, numérique ou non numérique, exprimé dans une unité quelconque appropriée. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]
   element extent { macro.phraseSeq, att.global.attributes, empty }
 publicationStmt =
   
@@ -6955,56 +7130,23 @@ authority =
   }
 idno =
   
-  ## (identifiant) donne un identifiant standardisé qui peut être utilisé pour identifier une référence bibliographique, une personne, un titre d'ouvrage ou une organisation. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
+  ## (identifiant) donne un identifiant standardisé qui peut être utilisé pour identifier une référence bibliographique, une personne, un titre d'ouvrage ou une organisation. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element idno {
     (text | model.gLike | idno)*,
     att.global.attributes,
     att.sortable.attributes,
     att.datable.attributes,
     att.typed.attribute.subtype,
+    att.cmc.attributes,
     
     ## classe un numéro dans une catégorie, par exemple comme étant un numéro ISBN ou comme appartenant une autre série normalisée.
-    ## Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC
     attribute type {
-      [
-        a:documentation [
-          "International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the "
-          ns1:a [
-            href = "https://www.isbn-international.org"
-            " International ISBN Agency."
-          ]
-          "\x{a}" ~
-          "                  "
-        ]
-      ]
-      "ISBN"
-      | 
-        ## International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.
-        "ISSN"
-      | 
-        ## Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.
-        "DOI"
-      | [
-          a:documentation [
-            "Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of "
-            ns1:a [
-              href = "https://datatracker.ietf.org/doc/html/rfc3986"
-              "RFC 3986"
-            ]
-            "."
-          ]
-        ]
-        "URI"
-      | 
-        ## A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.
-        "VIAF"
-      | 
-        ## English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.
-        "ESTC"
+      
+      ## first type
+      "A"
       | 
-        ## OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.
-        "OCLC"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+        ## second type
+        "B"
     }?,
     (
      ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
@@ -7015,7 +7157,7 @@ idno =
      }?)
     >> sch:pattern [
          id =
-           "test21-idno-calendar-calendar-check-idno-constraint-rule-76"
+           "test21-idno-calendar-calendar-check-idno-constraint-rule-77"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7077,7 +7219,7 @@ licence =
      }?)
     >> sch:pattern [
          id =
-           "test21-licence-calendar-calendar-check-licence-constraint-rule-77"
+           "test21-licence-calendar-calendar-check-licence-constraint-rule-78"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7118,7 +7260,7 @@ notesStmt =
   }
 sourceDesc =
   
-  ## (description de la source) décrit la source à partir de laquelle un texte électronique a été dérivé ou produit, habituellement une description bibliographique pour un texte numérisé, ou une expression comme "document numérique natif " pour un texte qui n'a aucune existence précédente. [2.2.7. The Source Description]
+  ## (description de la source) décrit la source à partir de laquelle un texte électronique a été dérivé ou produit, habituellement une description bibliographique pour un texte numérisé, ou une expression comme document numérique natif pour un texte qui n'a aucune existence précédente. [2.2.7. The Source Description]
   element sourceDesc {
     (model.pLike+
      | (model.biblLike | model.sourceDescPart | model.listLike)+),
@@ -7128,7 +7270,7 @@ sourceDesc =
   }
 biblFull =
   
-  ## (référence bibliographique totalement structurée) contient une référence bibliographique totalement structurée : tous les composants de la description du fichier TEI y sont présents. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (référence bibliographique totalement structurée) contient une référence bibliographique totalement structurée : tous les composants de la description du fichier TEI y sont présents. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblFull {
     (((titleStmt,
        editionStmt?,
@@ -7142,6 +7284,7 @@ biblFull =
     att.declarable.attributes,
     att.sortable.attributes,
     att.docStatus.attributes,
+    att.cmc.attributes,
     empty
   }
 encodingDesc =
@@ -7167,7 +7310,7 @@ schemaRef =
   }
 projectDesc =
   
-  ## (description du projet) décrit en détail le but ou l’objectif visé dans l’encodage d’un fichier électronique, ainsi que toute autre information pertinente sur la manière dont il a été construit ou recueilli. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (description du projet) décrit en détail le but ou l’objectif visé dans l’encodage d’un fichier électronique, ainsi que toute autre information pertinente sur la manière dont il a été construit ou recueilli. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element projectDesc {
     model.pLike+,
     att.global.attributes,
@@ -7176,7 +7319,7 @@ projectDesc =
   }
 samplingDecl =
   
-  ## (déclaration d'échantillonnage) contient une description en texte libre du raisonnement et des méthodes utilisés pour l'échantillonnage des textes dans la création d’un corpus ou d’une collection. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (déclaration d'échantillonnage) contient une description en texte libre du raisonnement et des méthodes utilisés pour l'échantillonnage des textes dans la création d’un corpus ou d’une collection. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element samplingDecl {
     model.pLike+,
     att.global.attributes,
@@ -7185,7 +7328,7 @@ samplingDecl =
   }
 editorialDecl =
   
-  ## (déclaration des pratiques éditoriales) donne des précisions sur les pratiques et les principes éditoriaux appliqués au cours de l’encodage du texte. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (déclaration des pratiques éditoriales) donne des précisions sur les pratiques et les principes éditoriaux appliqués au cours de l’encodage du texte. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element editorialDecl {
     (model.pLike | model.editorialDeclPart)+,
     att.global.attributes,
@@ -7194,7 +7337,7 @@ editorialDecl =
   }
 correction =
   
-  ## (règles de correction) établit comment et dans quelles circonstances des corrections ont été apportées au texte. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (règles de correction) établit comment et dans quelles circonstances des corrections ont été apportées au texte. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element correction {
     model.pLike+,
     att.global.attributes,
@@ -7230,7 +7373,7 @@ correction =
   }
 normalization =
   
-  ## (normalisation) indique l'extension de la normalisation ou de la régularisation effectuée sur le texte source dans sa conversion vers sa forme électronique. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (normalisation) indique l'extension de la normalisation ou de la régularisation effectuée sur le texte source dans sa conversion vers sa forme électronique. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element normalization {
     model.pLike+,
     att.global.attributes,
@@ -7250,11 +7393,11 @@ normalization =
   }
 quotation =
   
-  ## (citation) décrit la pratique éditoriale adoptée par rapport aux guillements dans l’original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (citation) décrit la pratique éditoriale adoptée par rapport aux guillements dans l’original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element quotation {
     (model.pLike*)
     >> sch:pattern [
-         id = "test21-quotation-quotationContents-constraint-rule-78"
+         id = "test21-quotation-quotationContents-constraint-rule-79"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7294,7 +7437,7 @@ quotation =
   }
 hyphenation =
   
-  ## (césurage) résume la façon dont les traits d'union sécants de fin de ligne d’un texte source ont été traités dans sa version encodée. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (césurage) résume la façon dont les traits d'union sécants de fin de ligne d’un texte source ont été traités dans sa version encodée. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element hyphenation {
     model.pLike+,
     att.global.attributes,
@@ -7320,7 +7463,7 @@ hyphenation =
   }
 segmentation =
   
-  ## (segmentation) décrit les principes selon lesquels le texte a été segmenté, par exemple en phrases, en intonèmes (unités tonales), en strates graphématiques (niveaux superposés de signes graphiques), etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (segmentation) décrit les principes selon lesquels le texte a été segmenté, par exemple en phrases, en intonèmes (unités tonales), en strates graphématiques (niveaux superposés de signes graphiques), etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element segmentation {
     model.pLike+,
     att.global.attributes,
@@ -7329,7 +7472,7 @@ segmentation =
   }
 stdVals =
   
-  ## (valeurs normalisées) précise le format utilisé pour exprimer une date ou une valeur numérique de manière normalisée . [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (valeurs normalisées) précise le format utilisé pour exprimer une date ou une valeur numérique de manière normalisée . [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element stdVals {
     model.pLike+,
     att.global.attributes,
@@ -7473,7 +7616,7 @@ refsDecl =
   }
 citeStructure =
   
-  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeStructure {
     (citeData*, citeStructure*, model.descLike*),
     att.global.attributes,
@@ -7501,7 +7644,7 @@ citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "test21-citeStructure-match-citestructure-outer-match-constraint-rule-79"
+           "test21-citeStructure-match-citestructure-outer-match-constraint-rule-80"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7522,7 +7665,7 @@ citeStructure =
        ]
     >> sch:pattern [
          id =
-           "test21-citeStructure-match-citestructure-inner-match-constraint-rule-80"
+           "test21-citeStructure-match-citestructure-inner-match-constraint-rule-81"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7556,7 +7699,7 @@ citeStructure =
   }
 citeData =
   
-  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeData {
     empty,
     att.global.attributes,
@@ -7579,7 +7722,7 @@ cRefPattern =
   }
 prefixDef =
   
-  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element prefixDef {
     model.pLike*,
     att.global.attributes,
@@ -7593,7 +7736,7 @@ prefixDef =
   }
 listPrefixDef =
   
-  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element listPrefixDef {
     (desc*, (prefixDef | listPrefixDef)+),
     att.global.attributes,
@@ -7705,7 +7848,7 @@ unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "test21-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-81"
+           "test21-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-82"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7746,7 +7889,7 @@ unitDef =
      }?)
     >> sch:pattern [
          id =
-           "test21-unitDef-calendar-calendar-check-unitDef-constraint-rule-82"
+           "test21-unitDef-calendar-calendar-check-unitDef-constraint-rule-83"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7787,7 +7930,7 @@ conversion =
      }?)
     >> sch:pattern [
          id =
-           "test21-conversion-calendar-calendar-check-conversion-constraint-rule-83"
+           "test21-conversion-calendar-calendar-check-conversion-constraint-rule-84"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7853,7 +7996,7 @@ application =
      }?)
     >> sch:pattern [
          id =
-           "test21-application-calendar-calendar-check-application-constraint-rule-84"
+           "test21-application-calendar-calendar-check-application-constraint-rule-85"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7894,7 +8037,7 @@ profileDesc =
   }
 handNote =
   
-  ## (note sur une main) décrit un style d'écriture ou une main qui sont reconnus dans un manuscrit. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (note sur une main) décrit un style d'écriture ou une main qui sont reconnus dans un manuscrit. [11.7.2. Writing, Decoration, and Other Notations]
   element handNote {
     macro.specialPara,
     att.global.attributes,
@@ -7925,7 +8068,7 @@ creation =
      }?)
     >> sch:pattern [
          id =
-           "test21-creation-calendar-calendar-check-creation-constraint-rule-85"
+           "test21-creation-calendar-calendar-check-creation-constraint-rule-86"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7950,7 +8093,7 @@ creation =
   }
 langUsage =
   
-  ## (langue utilisée) décrit les langues, variétés de langues, registres, dialectes, etc. présents à l’intérieur d’un texte. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (langue utilisée) décrit les langues, variétés de langues, registres, dialectes, etc. présents à l’intérieur d’un texte. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]
   element langUsage {
     (model.pLike+ | language+),
     att.global.attributes,
@@ -8067,24 +8210,13 @@ correspAction =
     att.sortable.attributes,
     
     ## describes the nature of the action.
-    ## Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded
     attribute type {
       
-      ## information concerning the sending or dispatch of a message.
-      "sent"
-      | 
-        ## information concerning the receipt of a message.
-        "received"
-      | 
-        ## information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.
-        "transmitted"
-      | 
-        ## information concerning the redirection of an unread message.
-        "redirected"
+      ## first type
+      "A"
       | 
-        ## information concerning the forwarding of a message.
-        "forwarded"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+        ## second type
+        "B"
     }?,
     empty
   }
@@ -8115,7 +8247,7 @@ revisionDesc =
   }
 change =
   
-  ## (change) résume une modification ou une correction apportée à une version particulière d’un texte électronique partagé entre plusieurs chercheurs. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]
+  ## (change) résume une modification ou une correction apportée à une version particulière d’un texte électronique partagé entre plusieurs chercheurs. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]
   element change {
     macro.specialPara,
     att.ascribed.attributes,
@@ -8132,7 +8264,7 @@ change =
      }?)
     >> sch:pattern [
          id =
-           "test21-change-calendar-calendar-check-change-constraint-rule-86"
+           "test21-change-calendar-calendar-check-change-constraint-rule-87"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8164,7 +8296,7 @@ change =
   }
 scriptNote =
   
-  ## describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Writing, Decoration, and Other Notations]
+  ## describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Writing, Decoration, and Other Notations]
   element scriptNote {
     macro.specialPara,
     att.global.attributes,
@@ -8173,7 +8305,7 @@ scriptNote =
   }
 listChange =
   
-  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]
+  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]
   element listChange {
     (desc*, (listChange | change)+),
     att.global.attributes,
@@ -8257,11 +8389,11 @@ att.global.linking.attribute.select =
   }?
 link =
   
-  ## ( lien) définit une association ou un lien hypertextuel entre des éléments ou des passages, lien dont le type ne peut être spécifié précisément par d'autres éléments. [16.1. Links]
+  ## ( lien) définit une association ou un lien hypertextuel entre des éléments ou des passages, lien dont le type ne peut être spécifié précisément par d'autres éléments. [17.1. Links]
   element link {
     empty
     >> sch:pattern [
-         id = "test21-link-linkTargets3-constraint-rule-87"
+         id = "test21-link-linkTargets3-constraint-rule-88"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8284,25 +8416,27 @@ link =
     att.global.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     empty
   }
 linkGrp =
   
-  ## (groupe de liens) définit un ensemble d'associations ou de liens hypertextuels. [16.1. Links]
+  ## (groupe de liens) définit un ensemble d'associations ou de liens hypertextuels. [17.1. Links]
   element linkGrp {
     (model.descLike*, (link | ptr)+),
     att.global.attributes,
     att.pointing.group.attributes,
+    att.cmc.attributes,
     empty
   }
 ab =
   
-  ## (bloc anonyme) contient une unité de texte quelconque, de niveau "composant", faisant office de contenant anonyme pour une expression ou des éléments de niveau intermédiaire, analogue à un paragraphe mais sans sa portée sémantique. [16.3. Blocks, Segments, and Anchors]
+  ## (bloc anonyme) contient une unité de texte quelconque, de niveau composant, faisant office de contenant anonyme pour une expression ou des éléments de niveau intermédiaire, analogue à un paragraphe mais sans sa portée sémantique. [17.3. Blocks, Segments, and Anchors]
   element ab {
     macro.abContent
     >> sch:pattern [
          id =
-           "test21-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-88"
+           "test21-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-89"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8345,6 +8479,7 @@ ab =
     att.declaring.attributes,
     att.fragmentable.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     
     ## (correspond) pointe vers des éléments qui ont une correspondance avec l'élément en question.
     attribute corresp { xsd:nonNegativeInteger }?,
@@ -8352,13 +8487,17 @@ ab =
   }
 anchor =
   
-  ## (point d'ancrage) attache un identifiant à un point du texte, que ce point corresponde ou non à un élément textuel. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
+  ## (point d'ancrage) attache un identifiant à un point du texte, que ce point corresponde ou non à un élément textuel. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]
   element anchor {
-    empty, att.global.attributes, att.typed.attributes, empty
+    empty,
+    att.global.attributes,
+    att.typed.attributes,
+    att.cmc.attributes,
+    empty
   }
 seg =
   
-  ## (segment quelconque) contient une unité de texte quelconque de niveau segment. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
+  ## (segment quelconque) contient une unité de texte quelconque de niveau segment. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
   element seg {
     macro.paraContent,
     att.global.attributes,
@@ -8366,6 +8505,7 @@ seg =
     att.typed.attributes,
     att.written.attributes,
     att.notated.attributes,
+    att.cmc.attributes,
     empty
   }
 when =
@@ -8373,7 +8513,7 @@ when =
     a:documentation [
       "indique un point dans le temps, soit relatif à d'autres éléments de l'élément "
       ns1:code [ "<timeline>" ]
-      " dans lequel il est contenu, soit dans l'absolu. [16.4.2. Placing Synchronous Events in Time]"
+      " dans lequel il est contenu, soit dans l'absolu. [17.4.2. Placing Synchronous Events in Time]"
     ]
   ]
   element when {
@@ -8447,10 +8587,11 @@ when =
   }
 timeline =
   
-  ## (frise chronologique) fournit un ensemble de points ordonnés dans le temps qui peuvent être liés à des éléments de la parole transcrite pour créer un alignement temporel de ce texte. [16.4.2. Placing Synchronous Events in Time]
+  ## (frise chronologique) fournit un ensemble de points ordonnés dans le temps qui peuvent être liés à des éléments de la parole transcrite pour créer un alignement temporel de ce texte. [17.4.2. Placing Synchronous Events in Time]
   element timeline {
     when+,
     att.global.attributes,
+    att.cmc.attributes,
     
     ## désigne le début de la frise chronologique, c'est-à-dire le moment où elle commence.
     attribute origin {
@@ -8500,11 +8641,11 @@ timeline =
   }
 join =
   
-  ## (jointure) identifie un segment de texte, qui peut être fragmenté, en pointant vers les éléments éventuellement dispersés qui le composent. [16.7. Aggregation]
+  ## (jointure) identifie un segment de texte, qui peut être fragmenté, en pointant vers les éléments éventuellement dispersés qui le composent. [17.7. Aggregation]
   element join {
     ((model.descLike | model.certLike)*)
     >> sch:pattern [
-         id = "test21-join-joinTargets3-constraint-rule-89"
+         id = "test21-join-joinTargets3-constraint-rule-90"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8528,6 +8669,7 @@ join =
     att.global.attributes,
     att.pointing.attributes,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## spécifie le nom de l'élément que cette agrégation est censée former.
     attribute result { xsd:Name }?,
@@ -8559,13 +8701,14 @@ joinGrp =
     a:documentation [
       "(groupe de jointures) regroupe une collection d'éléments "
       ns1:code [ "<join>" ]
-      " ainsi que, éventuellement, des pointeurs. [16.7. Aggregation]"
+      " ainsi que, éventuellement, des pointeurs. [17.7. Aggregation]"
     ]
   ]
   element joinGrp {
     ((gloss | model.descLike)*, (join | ptr)+),
     att.global.attributes,
     att.pointing.group.attributes,
+    att.cmc.attributes,
     [
       a:documentation [
         "décrit le résultat produit par le rassemblement dans cette collection des éléments "
@@ -8578,13 +8721,14 @@ joinGrp =
   }
 alt =
   
-  ## (alternative) identifie une alternative ou un ensemble d'options entre des éléments ou des passages. [16.8. Alternation]
+  ## (alternative) identifie une alternative ou un ensemble d'options entre des éléments ou des passages. [17.8. Alternation]
   element alt {
     empty,
     att.global.attributes,
     att.pointing.attribute.targetLang,
     att.pointing.attribute.evaluate,
     att.typed.attributes,
+    att.cmc.attributes,
     
     ## précise la cible de la référence en donnant une ou plusieurs références URI
     attribute target {
@@ -8631,13 +8775,14 @@ altGrp =
     a:documentation [
       "(groupe d'alternatives) regroupe une collection d'éléments "
       ns1:code [ "<alt>" ]
-      " et, éventuellement, de pointeurs. [16.8. Alternation]"
+      " et, éventuellement, de pointeurs. [17.8. Alternation]"
     ]
   ]
   element altGrp {
     (model.descLike*, (alt | ptr)*),
     att.global.attributes,
     att.pointing.group.attributes,
+    att.cmc.attributes,
     
     ## établit si les alternatives rassemblées dans cette collection sont exclusives ou non.
     [ a:defaultValue = "excl" ]
@@ -8653,12 +8798,12 @@ altGrp =
   }
 standOff =
   
-  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]
+  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]
   element standOff {
     (model.standOffPart+)
     >> sch:pattern [
          id =
-           "test21-standOff-nested_standOff_should_be_typed-constraint-rule-90"
+           "test21-standOff-nested_standOff_should_be_typed-constraint-rule-91"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8698,7 +8843,7 @@ listAnnotation =
       ns1:code [ "<note>" ]
       ", possibly organized with nested "
       ns1:code [ "<listAnnotation>" ]
-      " elements. [16.10. The standOff Container]"
+      " elements. [17.10. The standOff Container]"
     ]
   ]
   element listAnnotation {
@@ -8720,7 +8865,7 @@ annotation =
         "Web\x{a}" ~
         "      Annotation Data Model"
       ]
-      ". [16.10. The standOff Container]"
+      ". [17.10. The standOff Container]"
     ]
   ]
   element annotation {
@@ -8827,7 +8972,7 @@ att.msClass.attribute.class =
   }?
 msDesc =
   
-  ## (description d'un manuscrit) contient la description d'un manuscrit individuel [10.1. Overview]
+  ## (description d'un manuscrit) contient la description d'un manuscrit individuel [11.1. Overview]
   element msDesc {
     (msIdentifier,
      model.headLike*,
@@ -8839,7 +8984,7 @@ msDesc =
          | msPart
          | msFrag)*))
     >> sch:pattern [
-         id = "test21-msDesc-one_ms_singleton_max-constraint-rule-91"
+         id = "test21-msDesc-one_ms_singleton_max-constraint-rule-92"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8876,11 +9021,11 @@ msDesc =
   }
 catchwords =
   
-  ## (réclames) décrit le système utilisé pour s'assurer que les cahiers formant un manuscrit ou un incunable sont dans le bon ordre, typiquement au moyen d'annotations en bas de page. [10.3.7. Catchwords, Signatures, Secundo Folio]
+  ## (réclames) décrit le système utilisé pour s'assurer que les cahiers formant un manuscrit ou un incunable sont dans le bon ordre, typiquement au moyen d'annotations en bas de page. [11.3.7. Catchwords, Signatures, Secundo Folio]
   element catchwords {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-catchwords-catchword_in_msDesc-constraint-rule-92"
+         id = "test21-catchwords-catchword_in_msDesc-constraint-rule-93"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8904,11 +9049,11 @@ catchwords =
   }
 dimensions =
   
-  ## (dimensions) contient une spécification des dimensions. [10.3.4. Dimensions]
+  ## (dimensions) contient une spécification des dimensions. [11.3.4. Dimensions]
   element dimensions {
     ((dim | model.dimLike)*)
     >> sch:pattern [
-         id = "test21-dimensions-duplicateDim-constraint-rule-93"
+         id = "test21-dimensions-duplicateDim-constraint-rule-94"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8954,15 +9099,19 @@ dimensions =
     att.typed.attribute.subtype,
     
     ## indique quel aspect de l'objet est mesuré.
-    ## Sample values include: 1] leaves; 2] ruled; 3] pricked; 4] written; 5] miniatures; 6] binding; 7] box
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     empty
   }
 dim =
   
-  ## contains any single measurement forming part of a dimensional specification of some sort. [10.3.4. Dimensions]
+  ## contains any single measurement forming part of a dimensional specification of some sort. [11.3.4. Dimensions]
   element dim {
     macro.xtext,
     att.global.attributes,
@@ -8972,29 +9121,29 @@ dim =
   }
 height =
   
-  ## (hauteur) contient une dimension prise sur l'axe parallèle au dos du manuscrit. [10.3.4. Dimensions]
+  ## (hauteur) contient une dimension prise sur l'axe parallèle au dos du manuscrit. [11.3.4. Dimensions]
   element height {
     macro.xtext, att.global.attributes, att.dimensions.attributes, empty
   }
 depth =
   
-  ## (épaisseur) contient une dimension mesurée sur le dos du manuscrit. [10.3.4. Dimensions]
+  ## (épaisseur) contient une dimension mesurée sur le dos du manuscrit. [11.3.4. Dimensions]
   element depth {
     macro.xtext, att.global.attributes, att.dimensions.attributes, empty
   }
 width =
   
-  ## (largeur) contient une dimension mesurée sur l'axe perpendiculaire au dos du manuscrit. [10.3.4. Dimensions]
+  ## (largeur) contient une dimension mesurée sur l'axe perpendiculaire au dos du manuscrit. [11.3.4. Dimensions]
   element width {
     macro.xtext, att.global.attributes, att.dimensions.attributes, empty
   }
 heraldry =
   
-  ## (héraldique) contient une devise ou une formule d'héraldique, comme celles qu'on trouve sur un blason, des armoiries, etc. [10.3.8. Heraldry]
+  ## (héraldique) contient une devise ou une formule d'héraldique, comme celles qu'on trouve sur un blason, des armoiries, etc. [11.3.8. Heraldry]
   element heraldry { macro.phraseSeq, att.global.attributes, empty }
 locus =
   
-  ## (locus) définit un emplacement au sein d'un manuscrit ou d'une partie de manuscrit, souvent une séquence, éventuellement discontinue, de références de feuillets. [10.3.5. References to Locations within a Manuscript]
+  ## (locus) définit un emplacement au sein d'un manuscrit ou d'une partie de manuscrit, souvent une séquence, éventuellement discontinue, de références de feuillets. [11.3.5. References to Locations within a Manuscript]
   element locus {
     (text | model.gLike | hi | locus)*,
     att.global.attributes,
@@ -9019,7 +9168,7 @@ locus =
   }
 locusGrp =
   
-  ## (groupe d'emplacements) regroupe un certain nombre d'emplacements qui forment ensemble un item identifiable bien que discontinu dans un manuscrit ou une partie de manuscrit selon une foliotation spécifique. [10.3.5. References to Locations within a Manuscript]
+  ## (groupe d'emplacements) regroupe un certain nombre d'emplacements qui forment ensemble un item identifiable bien que discontinu dans un manuscrit ou une partie de manuscrit selon une foliotation spécifique. [11.3.5. References to Locations within a Manuscript]
   element locusGrp {
     locus+,
     att.global.attributes,
@@ -9032,7 +9181,7 @@ locusGrp =
   }
 material =
   
-  ## (matériau) contient un mot ou une expression décrivant le ou les matériau(x) utilisé(s) pour fabriquer un manuscrit (ou une partie d'un manuscrit). [10.3.2. Material and Object Type]
+  ## (matériau) contient un mot ou une expression décrivant le ou les matériau(x) utilisé(s) pour fabriquer un manuscrit (ou une partie d'un manuscrit). [11.3.2. Material and Object Type]
   element material {
     macro.phraseSeq,
     att.global.attributes,
@@ -9055,7 +9204,7 @@ material =
   }
 objectType =
   
-  ## (type d'objet) contient un mot ou une expression qui décrit le type de l'objet consideré. [10.3.2. Material and Object Type]
+  ## (type d'objet) contient un mot ou une expression qui décrit le type de l'objet consideré. [11.3.2. Material and Object Type]
   element objectType {
     macro.phraseSeq,
     att.global.attributes,
@@ -9064,7 +9213,7 @@ objectType =
   }
 origDate =
   
-  ## (date de la création) contient une date, dans une forme libre, utilisée pour dater la création d'un manuscrit ou d'une partie d'un manuscrit. [10.3.1. Origination]
+  ## (date de la création) contient une date, dans une forme libre, utilisée pour dater la création d'un manuscrit ou d'une partie d'un manuscrit. [11.3.1. Origination]
   element origDate {
     (text | model.gLike | model.phrase | model.global)*,
     att.global.attributes,
@@ -9077,7 +9226,7 @@ origDate =
   }
 origPlace =
   
-  ## (lieu de création) contient un nom de lieu, dans une forme libre, utilisé pour désigner l'endroit où a été produit un manuscrit ou une partie d'un manuscrit. [10.3.1. Origination]
+  ## (lieu de création) contient un nom de lieu, dans une forme libre, utilisé pour désigner l'endroit où a été produit un manuscrit ou une partie d'un manuscrit. [11.3.1. Origination]
   element origPlace {
     macro.phraseSeq,
     att.global.attributes,
@@ -9094,7 +9243,7 @@ origPlace =
      }?)
     >> sch:pattern [
          id =
-           "test21-origPlace-calendar-calendar-check-origPlace-constraint-rule-94"
+           "test21-origPlace-calendar-calendar-check-origPlace-constraint-rule-95"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9119,11 +9268,11 @@ origPlace =
   }
 secFol =
   
-  ## (deuxième folio) le mot ou les mots repris d'un point précisément connu d'un codex (comme le début du second feuillet) pour identifier celui-ci de façon univoque. [10.3.7. Catchwords, Signatures, Secundo Folio]
+  ## (deuxième folio) le mot ou les mots repris d'un point précisément connu d'un codex (comme le début du second feuillet) pour identifier celui-ci de façon univoque. [11.3.7. Catchwords, Signatures, Secundo Folio]
   element secFol {
     macro.phraseSeq
     >> sch:pattern [
-         id = "test21-secFol-secFol_in_msDesc-constraint-rule-95"
+         id = "test21-secFol-secFol_in_msDesc-constraint-rule-96"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9147,12 +9296,12 @@ secFol =
   }
 signatures =
   
-  ## (signatures) contient une étude des signatures trouvées sur un feuillet ou sur un cahier dans un manuscrit. [10.3.7. Catchwords, Signatures, Secundo Folio]
+  ## (signatures) contient une étude des signatures trouvées sur un feuillet ou sur un cahier dans un manuscrit. [11.3.7. Catchwords, Signatures, Secundo Folio]
   element signatures {
     macro.specialPara
     >> sch:pattern [
          id =
-           "test21-signatures-signatures_in_msDesc-constraint-rule-96"
+           "test21-signatures-signatures_in_msDesc-constraint-rule-97"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9176,7 +9325,7 @@ signatures =
   }
 stamp =
   
-  ## (cachet) contient un mot ou une expression décrivant un cachet ou une marque du même genre. [10.3.3. Watermarks and Stamps]
+  ## (cachet) contient un mot ou une expression décrivant un cachet ou une marque du même genre. [11.3.3. Watermarks and Stamps]
   element stamp {
     macro.phraseSeq,
     att.global.attributes,
@@ -9191,7 +9340,7 @@ stamp =
      }?)
     >> sch:pattern [
          id =
-           "test21-stamp-calendar-calendar-check-stamp-constraint-rule-97"
+           "test21-stamp-calendar-calendar-check-stamp-constraint-rule-98"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9216,11 +9365,11 @@ stamp =
   }
 watermark =
   
-  ## (filigrane) contient un mot ou une expression décrivant un filigrane ou une marque du même genre. [10.3.3. Watermarks and Stamps]
+  ## (filigrane) contient un mot ou une expression décrivant un filigrane ou une marque du même genre. [11.3.3. Watermarks and Stamps]
   element watermark { macro.phraseSeq, att.global.attributes, empty }
 msIdentifier =
   
-  ## (identifiant du manuscrit) contient les informations requises pour identifier le manuscrit en cours de description. [10.4. The Manuscript Identifier]
+  ## (identifiant du manuscrit) contient les informations requises pour identifier le manuscrit en cours de description. [11.4. The Manuscript Identifier]
   element msIdentifier {
     ((placeName?,
       bloc?,
@@ -9235,7 +9384,7 @@ msIdentifier =
       idno*),
      (msName | objectName | altIdentifier)*)
     >> sch:pattern [
-         id = "test21-msIdentifier-msId_minimal-constraint-rule-98"
+         id = "test21-msIdentifier-msId_minimal-constraint-rule-99"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9258,7 +9407,7 @@ msIdentifier =
   }
 institution =
   
-  ## (institution) contient le nom d'un organisme (comme une université ou une bibliothèque), avec lequel un manuscrit est identifié ; en général c'est le nom de l'institution qui conserve ce manuscrit. [10.4. The Manuscript Identifier]
+  ## (institution) contient le nom d'un organisme (comme une université ou une bibliothèque), avec lequel un manuscrit est identifié ; en général c'est le nom de l'institution qui conserve ce manuscrit. [11.4. The Manuscript Identifier]
   element institution {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -9267,7 +9416,7 @@ institution =
   }
 repository =
   
-  ## (lieu de conservation) contient le nom d'un dépôt dans lequel des manuscrits sont entreposés, et qui peut faire partie d'une institution. [10.4. The Manuscript Identifier]
+  ## (lieu de conservation) contient le nom d'un dépôt dans lequel des manuscrits sont entreposés, et qui peut faire partie d'une institution. [11.4. The Manuscript Identifier]
   element repository {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -9276,7 +9425,7 @@ repository =
   }
 collection =
   
-  ## (collection) contient le nom d'une collection de manuscrits, ceux-ci ne se trouvant pas nécessairement dans le même lieu de conservation. [10.4. The Manuscript Identifier]
+  ## (collection) contient le nom d'une collection de manuscrits, ceux-ci ne se trouvant pas nécessairement dans le même lieu de conservation. [11.4. The Manuscript Identifier]
   element collection {
     macro.phraseSeq.limited,
     att.global.attributes,
@@ -9286,7 +9435,7 @@ collection =
   }
 altIdentifier =
   
-  ## (autre identifiant) contient un autre ou un ancien identifiant pour un manuscrit, par exemple un numéro anciennement utilisé dans un catalogue. [10.4. The Manuscript Identifier]
+  ## (autre identifiant) contient un autre ou un ancien identifiant pour un manuscrit, par exemple un numéro anciennement utilisé dans un catalogue. [11.4. The Manuscript Identifier]
   element altIdentifier {
     (placeName?,
      bloc?,
@@ -9312,7 +9461,7 @@ altIdentifier =
      }?)
     >> sch:pattern [
          id =
-           "test21-altIdentifier-calendar-calendar-check-altIdentifier-constraint-rule-99"
+           "test21-altIdentifier-calendar-calendar-check-altIdentifier-constraint-rule-100"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9337,7 +9486,7 @@ altIdentifier =
   }
 msName =
   
-  ## (autre nom) contient un autre nom, dans une forme libre, utilisé pour désigner le manuscrit, tel qu'un surnom ou un ocellus nominum. [10.4. The Manuscript Identifier]
+  ## (autre nom) contient un autre nom, dans une forme libre, utilisé pour désigner le manuscrit, tel qu'un surnom ou un ocellus nominum. [11.4. The Manuscript Identifier]
   element msName {
     (text | model.gLike | rs | name)*,
     att.global.attributes,
@@ -9346,7 +9495,7 @@ msName =
   }
 colophon =
   
-  ## (colophon) contient le colophon d'une section d'un manuscrit, c'est-à-dire la transcription des informations relatives à la date, au lieu, à l'organisme commanditaire ou aux raisons de la production du manuscrit. [10.6.1. The msItem and msItemStruct Elements]
+  ## (colophon) contient le colophon d'une section d'un manuscrit, c'est-à-dire la transcription des informations relatives à la date, au lieu, à l'organisme commanditaire ou aux raisons de la production du manuscrit. [11.6.1. The msItem and msItemStruct Elements]
   element colophon {
     macro.phraseSeq,
     att.global.attributes,
@@ -9355,7 +9504,7 @@ colophon =
   }
 explicit =
   
-  ## (explicit) contient l'explicit d'une section d'un manuscrit, c'est-à-dire les mots terminant le texte proprement dit, à l'exclusion de toute rubrique ou colophon qui pourraient le suivre. [10.6.1. The msItem and msItemStruct Elements]
+  ## (explicit) contient l'explicit d'une section d'un manuscrit, c'est-à-dire les mots terminant le texte proprement dit, à l'exclusion de toute rubrique ou colophon qui pourraient le suivre. [11.6.1. The msItem and msItemStruct Elements]
   element explicit {
     macro.phraseSeq,
     att.global.attributes,
@@ -9365,7 +9514,7 @@ explicit =
   }
 filiation =
   
-  ## (filiation) contient les informations sur la filiation du manuscrit, c'est-à-dire sur ses relations avec d'autres manuscrits connus du même texte, ses protographes, antigraphes et apographes. [10.6.1. The msItem and msItemStruct Elements]
+  ## (filiation) contient les informations sur la filiation du manuscrit, c'est-à-dire sur ses relations avec d'autres manuscrits connus du même texte, ses protographes, antigraphes et apographes. [11.6.1. The msItem and msItemStruct Elements]
   element filiation {
     macro.specialPara,
     att.global.attributes,
@@ -9374,7 +9523,7 @@ filiation =
   }
 finalRubric =
   
-  ## (rubrique de fin) contient les derniers mots d'une section de texte, qui incluent souvent la mention de son auteur et de son titre, et sont généralement différenciés du texte lui-même par l'utilisation d'une encre rouge, par une taille ou un style d'écriture particuliers, ou par tout autre moyen visuel. [10.6.1. The msItem and msItemStruct Elements]
+  ## (rubrique de fin) contient les derniers mots d'une section de texte, qui incluent souvent la mention de son auteur et de son titre, et sont généralement différenciés du texte lui-même par l'utilisation d'une encre rouge, par une taille ou un style d'écriture particuliers, ou par tout autre moyen visuel. [11.6.1. The msItem and msItemStruct Elements]
   element finalRubric {
     macro.phraseSeq,
     att.global.attributes,
@@ -9384,7 +9533,7 @@ finalRubric =
   }
 msContents =
   
-  ## (contenu du manuscrit) décrit le contenu intellectuel d'un manuscrit ou d'une partie d'un manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments structurés msItem concernant les items du manuscrit. [10.6. Intellectual Content]
+  ## (contenu du manuscrit) décrit le contenu intellectuel d'un manuscrit ou d'une partie d'un manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments structurés msItem concernant les items du manuscrit. [11.6. Intellectual Content]
   element msContents {
     (model.pLike+
      | (summary?, textLang?, titlePage?, (msItem | msItemStruct)*)),
@@ -9395,7 +9544,7 @@ msContents =
   }
 msItem =
   
-  ## (item de manuscrit) décrit une œuvre ou un item individualisés dans le contenu intellectuel d'un manuscrit ou d'une partie de manuscrit. [10.6.1. The msItem and msItemStruct Elements]
+  ## (item de manuscrit) décrit une œuvre ou un item individualisés dans le contenu intellectuel d'un manuscrit ou d'une partie de manuscrit. [11.6.1. The msItem and msItemStruct Elements]
   element msItem {
     ((locus | locusGrp)*,
      (model.pLike+
@@ -9407,7 +9556,7 @@ msItem =
   }
 msItemStruct =
   
-  ## (description structurée d'un item de manuscrit) contient la description structurée d'un item ou d'une œuvre, dans le contenu intellectuel d'un manuscrit ou d'une partie d'un manuscrit. [10.6.1. The msItem and msItemStruct Elements]
+  ## (description structurée d'un item de manuscrit) contient la description structurée d'un item ou d'une œuvre, dans le contenu intellectuel d'un manuscrit ou d'une partie d'un manuscrit. [11.6.1. The msItem and msItemStruct Elements]
   element msItemStruct {
     ((locus | locusGrp)?,
      (model.pLike+
@@ -9432,7 +9581,7 @@ msItemStruct =
   }
 rubric =
   
-  ## (rubrique) contient le texte d'une rubrique ou d'un intitulé propres à un item, c'est-à-dire des mots qui signalent le début du texte, qui incluent souvent la mention de son auteur et de son titre, et qui sont différenciés du texte lui-même, généralement à l'encre rouge, par une taille ou un style d'écriture particuliers, ou par tout autre procédé de ce genre. [10.6.1. The msItem and msItemStruct Elements]
+  ## (rubrique) contient le texte d'une rubrique ou d'un intitulé propres à un item, c'est-à-dire des mots qui signalent le début du texte, qui incluent souvent la mention de son auteur et de son titre, et qui sont différenciés du texte lui-même, généralement à l'encre rouge, par une taille ou un style d'écriture particuliers, ou par tout autre procédé de ce genre. [11.6.1. The msItem and msItemStruct Elements]
   element rubric {
     macro.phraseSeq,
     att.global.attributes,
@@ -9442,11 +9591,11 @@ rubric =
   }
 summary =
   
-  ## contains an overview of the available information concerning some aspect of an item or object (for example, its intellectual content, history, layout, typography etc.) as a complement or alternative to the more detailed information carried by more specific elements. [10.6. Intellectual Content]
+  ## contains an overview of the available information concerning some aspect of an item or object (for example, its intellectual content, history, layout, typography etc.) as a complement or alternative to the more detailed information carried by more specific elements. [11.6. Intellectual Content]
   element summary { macro.specialPara, att.global.attributes, empty }
 physDesc =
   
-  ## (description physique) contient la description physique complète d'un manuscrit ou d'une partie d'un manuscrit, éventuellement structurée en utilisant les éléments plus spécialisés appartenant à la classe model.physDescPart. [10.7. Physical Description]
+  ## (description physique) contient la description physique complète d'un manuscrit ou d'une partie d'un manuscrit, éventuellement structurée en utilisant les éléments plus spécialisés appartenant à la classe model.physDescPart. [11.7. Physical Description]
   element physDesc {
     (model.pLike*,
      objectDesc?,
@@ -9464,7 +9613,7 @@ physDesc =
   }
 objectDesc =
   
-  ## (description d'objet) contient la description des composants matériels de l'objet en cours de traitement [10.7.1. Object Description]
+  ## (description d'objet) contient la description des composants matériels de l'objet en cours de traitement [11.7.1. Object Description]
   element objectDesc {
     (model.pLike+ | (supportDesc?, layoutDesc?)),
     att.global.attributes,
@@ -9477,7 +9626,7 @@ objectDesc =
   }
 supportDesc =
   
-  ## (description du support) regroupe les éléments décrivant le support physique du texte du manuscrit. [10.7.1. Object Description]
+  ## (description du support) regroupe les éléments décrivant le support physique du texte du manuscrit. [11.7.1. Object Description]
   element supportDesc {
     (model.pLike+
      | (support?, extent?, foliation*, collation?, condition?)),
@@ -9501,23 +9650,23 @@ supportDesc =
   }
 support =
   
-  ## (support) contient la description des matériaux, techniques, etc., qui ont servi à fabriquer le support physique du texte du manuscrit. [10.7.1. Object Description]
+  ## (support) contient la description des matériaux, techniques, etc., qui ont servi à fabriquer le support physique du texte du manuscrit. [11.7.1. Object Description]
   element support { macro.specialPara, att.global.attributes, empty }
 collation =
   
-  ## (collation) contient la description de l'organisation des feuillets ou bifeuillets d'un manuscrit [10.7.1. Object Description]
+  ## (collation) contient la description de l'organisation des feuillets ou bifeuillets d'un manuscrit [11.7.1. Object Description]
   element collation { macro.specialPara, att.global.attributes, empty }
 foliation =
   
-  ## (foliotation) décrit le ou les systèmes de numérotation des feuillets ou pages d'un codex [10.7.1.4. Foliation]
+  ## (foliotation) décrit le ou les systèmes de numérotation des feuillets ou pages d'un codex [11.7.1.4. Foliation]
   element foliation { macro.specialPara, att.global.attributes, empty }
 condition =
   
-  ## (état matériel) contient la description de l'état matériel du manuscrit. [10.7.1.5. Condition]
+  ## (état matériel) contient la description de l'état matériel du manuscrit. [11.7.1.5. Condition]
   element condition { macro.specialPara, att.global.attributes, empty }
 layoutDesc =
   
-  ## (description de la mise en page) rassemble les descriptions des mises en page d' un manuscrit. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (description de la mise en page) rassemble les descriptions des mises en page d' un manuscrit. [11.7.2. Writing, Decoration, and Other Notations]
   element layoutDesc {
     (model.pLike+ | (summary?, layout+)),
     att.global.attributes,
@@ -9525,7 +9674,7 @@ layoutDesc =
   }
 layout =
   
-  ## (mise en page) décrit comment le texte est disposé sur la page, ce qui inclut les informations sur d'éventuels systèmes de réglure, de piqûre ou d'autres techniques de préparation de la page. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (mise en page) décrit comment le texte est disposé sur la page, ce qui inclut les informations sur d'éventuels systèmes de réglure, de piqûre ou d'autres techniques de préparation de la page. [11.7.2. Writing, Decoration, and Other Notations]
   element layout {
     macro.specialPara,
     att.global.attributes,
@@ -9553,7 +9702,7 @@ layout =
   }
 handDesc =
   
-  ## (description des écritures) contient la description des différents types d'écriture utilisés dans un manuscrit. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (description des écritures) contient la description des différents types d'écriture utilisés dans un manuscrit. [11.7.2. Writing, Decoration, and Other Notations]
   element handDesc {
     (model.pLike+ | (summary?, handNote+)),
     att.global.attributes,
@@ -9564,7 +9713,7 @@ handDesc =
   }
 typeDesc =
   
-  ## (description des styles de caractère) contient la description des styles de caractères ou d'autres aspects de l'impression d'un incunable ou d'une autre source imprimée. [10.7.2.1. Writing]
+  ## (description des styles de caractère) contient la description des styles de caractères ou d'autres aspects de l'impression d'un incunable ou d'une autre source imprimée. [11.7.2.1. Writing]
   element typeDesc {
     (model.pLike+ | (summary?, typeNote+)),
     att.global.attributes,
@@ -9572,7 +9721,7 @@ typeDesc =
   }
 typeNote =
   
-  ## (note sur les caractères typographiques.) décrit une police particulière ou un autre trait typographique significatif que l’on note dans la description d'une ressource imprimée. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (note sur les caractères typographiques.) décrit une police particulière ou un autre trait typographique significatif que l’on note dans la description d'une ressource imprimée. [11.7.2. Writing, Decoration, and Other Notations]
   element typeNote {
     macro.specialPara,
     att.global.attributes,
@@ -9581,7 +9730,7 @@ typeNote =
   }
 scriptDesc =
   
-  ## (script description) contains a description of the scripts used in a manuscript or other object. [10.7.2.1. Writing]
+  ## (script description) contains a description of the scripts used in a manuscript or other object. [11.7.2.1. Writing]
   element scriptDesc {
     (model.pLike+ | (summary?, scriptNote+)),
     att.global.attributes,
@@ -9589,7 +9738,7 @@ scriptDesc =
   }
 musicNotation =
   
-  ## (notation musicale) contient la description d'un type de notation musicale. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (notation musicale) contient la description d'un type de notation musicale. [11.7.2. Writing, Decoration, and Other Notations]
   element musicNotation {
     macro.specialPara, att.global.attributes, empty
   }
@@ -9598,7 +9747,7 @@ decoDesc =
     a:documentation [
       "(description de la décoration) contient la description de la décoration du manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments thématiques "
       ns1:code [ "<decoNote>" ]
-      " [10.7.3. Bindings, Seals, and Additional Material]"
+      " [11.7.3. Bindings, Seals, and Additional Material]"
     ]
   ]
   element decoDesc {
@@ -9608,7 +9757,7 @@ decoDesc =
   }
 decoNote =
   
-  ## (note sur un élément de décoration) contient une note décrivant soit un élément de décoration du mansucrit, soit une catégorie relativement homogène de tels éléments. [10.7.3. Bindings, Seals, and Additional Material]
+  ## (note sur un élément de décoration) contient une note décrivant soit un élément de décoration du mansucrit, soit une catégorie relativement homogène de tels éléments. [11.7.3. Bindings, Seals, and Additional Material]
   element decoNote {
     macro.specialPara,
     att.global.attributes,
@@ -9617,14 +9766,14 @@ decoNote =
   }
 additions =
   
-  ## (ajouts) contient la description des ajouts significatifs trouvés dans un manuscrit, tels que gloses marginales ou autres annotations. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (ajouts) contient la description des ajouts significatifs trouvés dans un manuscrit, tels que gloses marginales ou autres annotations. [11.7.2. Writing, Decoration, and Other Notations]
   element additions { macro.specialPara, att.global.attributes, empty }
 bindingDesc =
   [
     a:documentation [
       "(description de la reliure) décrit les reliures actuelles et anciennes d'un manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments "
       ns1:code [ "<binding>" ]
-      ", un pour chaque reliure [10.7.3.1. Binding Descriptions]"
+      ", un pour chaque reliure [11.7.3.1. Binding Descriptions]"
     ]
   ]
   element bindingDesc {
@@ -9634,7 +9783,7 @@ bindingDesc =
   }
 binding =
   
-  ## (reliure) contient la description d'une reliure, i.e. du type de couverture, d'ais, etc., rencontrés. [10.7.3.1. Binding Descriptions]
+  ## (reliure) contient la description d'une reliure, i.e. du type de couverture, d'ais, etc., rencontrés. [11.7.3.1. Binding Descriptions]
   element binding {
     (model.pLike | condition | decoNote)+,
     att.global.attributes,
@@ -9648,7 +9797,7 @@ binding =
      }?)
     >> sch:pattern [
          id =
-           "test21-binding-calendar-calendar-check-binding-constraint-rule-100"
+           "test21-binding-calendar-calendar-check-binding-constraint-rule-101"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9691,7 +9840,7 @@ sealDesc =
       ns1:code [ "<seal>" ]
       ", complétés éventuellement par des éléments "
       ns1:code [ "<decoNote>" ]
-      ". [10.7.3.2. Seals]"
+      ". [11.7.3.2. Seals]"
     ]
   ]
   element sealDesc {
@@ -9702,7 +9851,7 @@ sealDesc =
   }
 seal =
   
-  ## (sceau) contient la description d'un sceau ou d'un objet similaire, attaché au manuscrit. [10.7.3.2. Seals]
+  ## (sceau) contient la description d'un sceau ou d'un objet similaire, attaché au manuscrit. [11.7.3.2. Seals]
   element seal {
     (model.pLike | decoNote)+,
     att.global.attributes,
@@ -9717,7 +9866,7 @@ seal =
      }?)
     >> sch:pattern [
          id =
-           "test21-seal-calendar-calendar-check-seal-constraint-rule-101"
+           "test21-seal-calendar-calendar-check-seal-constraint-rule-102"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9753,7 +9902,7 @@ seal =
   }
 accMat =
   
-  ## (matériel d'accompagnement) donne des détails sur tout matériel d'accompagnement étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec le manuscrit à une époque antérieure. [10.7.3.3. Accompanying Material]
+  ## (matériel d'accompagnement) donne des détails sur tout matériel d'accompagnement étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec le manuscrit à une époque antérieure. [11.7.3.3. Accompanying Material]
   element accMat {
     macro.specialPara,
     att.global.attributes,
@@ -9762,7 +9911,7 @@ accMat =
   }
 history =
   
-  ## (histoire) rassemble les éléments servant à donner un historique complet du manuscrit ou d'une partie du manuscrit. [10.8. History]
+  ## (histoire) rassemble les éléments servant à donner un historique complet du manuscrit ou d'une partie du manuscrit. [11.8. History]
   element history {
     (model.pLike+ | (summary?, origin?, provenance*, acquisition?)),
     att.global.attributes,
@@ -9770,7 +9919,7 @@ history =
   }
 origin =
   
-  ## (origine) contient des informations sur l'origine du manuscrit ou de la partie de manuscrit. [10.8. History]
+  ## (origine) contient des informations sur l'origine du manuscrit ou de la partie de manuscrit. [11.8. History]
   element origin {
     macro.specialPara,
     att.global.attributes,
@@ -9785,7 +9934,7 @@ origin =
      }?)
     >> sch:pattern [
          id =
-           "test21-origin-calendar-calendar-check-origin-constraint-rule-102"
+           "test21-origin-calendar-calendar-check-origin-constraint-rule-103"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9810,7 +9959,7 @@ origin =
   }
 provenance =
   
-  ## (provenance) contient des informations sur un épisode précis de l'histoire du manuscrit ou de la partie du manuscrit, après sa création et avant son acquisition [10.8. History]
+  ## (provenance) contient des informations sur un épisode précis de l'histoire du manuscrit ou de la partie du manuscrit, après sa création et avant son acquisition [11.8. History]
   element provenance {
     macro.specialPara,
     att.global.attributes,
@@ -9825,7 +9974,7 @@ provenance =
      }?)
     >> sch:pattern [
          id =
-           "test21-provenance-calendar-calendar-check-provenance-constraint-rule-103"
+           "test21-provenance-calendar-calendar-check-provenance-constraint-rule-104"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9850,7 +9999,7 @@ provenance =
   }
 acquisition =
   
-  ## (acquisition) contient des informations sur les modalités et circonstances de l'entrée du manuscrit ou de la partie du manuscrit dans l'institution qui le détient [10.8. History]
+  ## (acquisition) contient des informations sur les modalités et circonstances de l'entrée du manuscrit ou de la partie du manuscrit dans l'institution qui le détient [11.8. History]
   element acquisition {
     macro.specialPara,
     att.global.attributes,
@@ -9864,7 +10013,7 @@ acquisition =
      }?)
     >> sch:pattern [
          id =
-           "test21-acquisition-calendar-calendar-check-acquisition-constraint-rule-104"
+           "test21-acquisition-calendar-calendar-check-acquisition-constraint-rule-105"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9889,7 +10038,7 @@ acquisition =
   }
 additional =
   
-  ## (informations complémentaires) regroupe les informations complémentaires sur le manuscrit, incluant une bibliographie, des indications sur ses reproductions, ou des informations sur sa conservation et sur sa gestion [10.9. Additional Information]
+  ## (informations complémentaires) regroupe les informations complémentaires sur le manuscrit, incluant une bibliographie, des indications sur ses reproductions, ou des informations sur sa conservation et sur sa gestion [11.9. Additional Information]
   element additional {
     ((adminInfo?, surrogates?, listBibl?) | model.pLike+),
     att.global.attributes,
@@ -9897,7 +10046,7 @@ additional =
   }
 adminInfo =
   
-  ## (informations administratives) contient, pour le manuscrit en cours de description, les informations sur son détenteur actuel, sur ses conditions d'accès et sur les modalités de sa description. [10.9.1. Administrative Information]
+  ## (informations administratives) contient, pour le manuscrit en cours de description, les informations sur son détenteur actuel, sur ses conditions d'accès et sur les modalités de sa description. [11.9.1. Administrative Information]
   element adminInfo {
     (recordHist?, availability?, custodialHist?, model.noteLike?),
     att.global.attributes,
@@ -9905,7 +10054,7 @@ adminInfo =
   }
 recordHist =
   
-  ## (histoire de la description) donne des informations sur la source de la description et sur les modifications apportées à la description précédente. [10.9.1. Administrative Information]
+  ## (histoire de la description) donne des informations sur la source de la description et sur les modifications apportées à la description précédente. [11.9.1. Administrative Information]
   element recordHist {
     (model.pLike+ | (source, change*)),
     att.global.attributes,
@@ -9913,14 +10062,14 @@ recordHist =
   }
 source =
   
-  ## (source) décrit la source des informations contenues dans la description du manuscrit. [10.9.1.1. Record History]
+  ## (source) décrit la source des informations contenues dans la description du manuscrit. [11.9.1.1. Record History]
   element source { macro.specialPara, att.global.attributes, empty }
 custodialHist =
   [
     a:documentation [
       "(histoire de la conservation) contient des informations sur l'histoire de la conservation, soit en texte libre, soit sous la forme d'une série d'éléments "
       ns1:code [ "<custEvent>" ]
-      ". [10.9.1.2. Availability and Custodial History]"
+      ". [11.9.1.2. Availability and Custodial History]"
     ]
   ]
   element custodialHist {
@@ -9928,7 +10077,7 @@ custodialHist =
   }
 custEvent =
   
-  ## (événement dans la conservation) décrit un événement dans l'histoire de la conservation du manuscrit. [10.9.1.2. Availability and Custodial History]
+  ## (événement dans la conservation) décrit un événement dans l'histoire de la conservation du manuscrit. [11.9.1.2. Availability and Custodial History]
   element custEvent {
     macro.specialPara,
     att.global.attributes,
@@ -9943,7 +10092,7 @@ custEvent =
      }?)
     >> sch:pattern [
          id =
-           "test21-custEvent-calendar-calendar-check-custEvent-constraint-rule-105"
+           "test21-custEvent-calendar-calendar-check-custEvent-constraint-rule-106"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9968,11 +10117,11 @@ custEvent =
   }
 surrogates =
   
-  ## (reproductions) contient des informations sur toute reproduction numérique ou photographique du manuscrit en cours de description, qu'elle soit détenue par l'institution de conservation ou ailleurs. [10.9. Additional Information]
+  ## (reproductions) contient des informations sur toute reproduction numérique ou photographique du manuscrit en cours de description, qu'elle soit détenue par l'institution de conservation ou ailleurs. [11.9. Additional Information]
   element surrogates { macro.specialPara, att.global.attributes, empty }
 msPart =
   
-  ## (unité codicologique d'un manuscrit) contient des informations sur un manuscrit ou sur une partie d'un manuscrit, distinct à l'origine, qui fait aujourd'hui partie d'un manuscrit composite. [10.10. Manuscript Parts]
+  ## (unité codicologique d'un manuscrit) contient des informations sur un manuscrit ou sur une partie d'un manuscrit, distinct à l'origine, qui fait aujourd'hui partie d'un manuscrit composite. [11.10. Manuscript Parts]
   element msPart {
     (msIdentifier,
      model.headLike*,
@@ -9984,7 +10133,7 @@ msPart =
   }
 msFrag =
   
-  ## (fragment d'un manuscrit) contient des informations sur un fragment d'un manuscrit dispersé, aujourd'hui conservé séparément ou incorporé dans un autre manuscrit. [10.11. Manuscript Fragments]
+  ## (fragment d'un manuscrit) contient des informations sur un fragment d'un manuscrit dispersé, aujourd'hui conservé séparément ou incorporé dans un autre manuscrit. [11.11. Manuscript Fragments]
   element msFrag {
     ((altIdentifier | msIdentifier),
      model.headLike*,
@@ -10082,12 +10231,12 @@ att.coordinated.attribute.points =
   }?
 facsimile =
   
-  ## contient une représentation d'une source écrite quelconque sous la forme d'un ensemble d'images plutôt que sous la forme d'un texte transcrit ou encodé. [11.1. Digital Facsimiles]
+  ## contient une représentation d'une source écrite quelconque sous la forme d'un ensemble d'images plutôt que sous la forme d'un texte transcrit ou encodé. [12.1. Digital Facsimiles]
   element facsimile {
     (front?, (model.graphicLike | surface | surfaceGrp)+, back?)
     >> sch:pattern [
          id =
-           "test21-facsimile-no_facsimile_text_nodes-constraint-rule-106"
+           "test21-facsimile-no_facsimile_text_nodes-constraint-rule-107"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10113,7 +10262,7 @@ facsimile =
   }
 sourceDoc =
   
-  ## contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]
+  ## contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]
   element sourceDoc {
     (model.global | model.graphicLike | surface | surfaceGrp)+,
     att.global.attributes,
@@ -10122,7 +10271,7 @@ sourceDoc =
   }
 surface =
   
-  ## définit une surface écrite comme un rectangle décrit par ses coordonnées spatiales, en regroupant éventuellement une ou plusieurs représentations graphiques de cet espace et des zones rectangulaires intéressantes à l'intérieur de celui-ci. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]
+  ## définit une surface écrite comme un rectangle décrit par ses coordonnées spatiales, en regroupant éventuellement une ou plusieurs représentations graphiques de cet espace et des zones rectangulaires intéressantes à l'intérieur de celui-ci. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]
   element surface {
     ((model.global | model.labelLike | model.graphicLike)*,
      ((zone | line | path | surface | surfaceGrp), model.global*)*),
@@ -10143,7 +10292,7 @@ surface =
   }
 surfaceGrp =
   
-  ## (surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [11.1. Digital Facsimiles]
+  ## (surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [12.1. Digital Facsimiles]
   element surfaceGrp {
     (model.global | surface | surfaceGrp)+,
     att.global.attributes,
@@ -10156,7 +10305,7 @@ zone =
     a:documentation [
       "définit une surface planaire de tout type par rapport à un élément "
       ns1:code [ "<surface>" ]
-      ". [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]"
+      ". [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]"
     ]
   ]
   element zone {
@@ -10190,13 +10339,13 @@ path =
     a:documentation [
       "(path) defines any line passing through two or more points within a "
       ns1:code [ "<surface>" ]
-      " element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]"
+      " element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]"
     ]
   ]
   element path {
     empty
     >> sch:pattern [
-         id = "test21-path-pathmustnotbeclosed-constraint-rule-107"
+         id = "test21-path-pathmustnotbeclosed-constraint-rule-108"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10282,14 +10431,14 @@ addSpan =
     a:documentation [
       "(partie de texte ajoutée) marque le début d'une longue partie de texte ajoutée par un auteur, un copiste, un annotateur ou un correcteur (voir aussi "
       ns1:code [ "<add>" ]
-      "). [11.3.1.4. Additions and Deletions]"
+      "). [12.3.1.4. Additions and Deletions]"
     ]
   ]
   element addSpan {
     empty
     >> sch:pattern [
          id =
-           "test21-addSpan-addSpan-requires-spanTo-constraint-rule-108"
+           "test21-addSpan-addSpan-requires-spanTo-constraint-rule-109"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10310,7 +10459,7 @@ addSpan =
        ]
     >> sch:pattern [
          id =
-           "test21-addSpan-addSpan-requires-spanTo-fr-constraint-rule-109"
+           "test21-addSpan-addSpan-requires-spanTo-fr-constraint-rule-110"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10339,7 +10488,7 @@ addSpan =
     }
     >> sch:pattern [
          id =
-           "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-110"
+           "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-111"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10367,7 +10516,7 @@ addSpan =
   }
 damage =
   
-  ## (dommage) sert à encoder une zone qui a subi des dommages dans le manuscrit témoin du texte. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (dommage) sert à encoder une zone qui a subi des dommages dans le manuscrit témoin du texte. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element damage {
     macro.paraContent,
     att.global.attributes,
@@ -10377,12 +10526,12 @@ damage =
   }
 damageSpan =
   
-  ## (partie de texte endommagée) marque le début d'une longue partie de texte, endommagée d'une manière quelconque mais toujours lisible. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (partie de texte endommagée) marque le début d'une longue partie de texte, endommagée d'une manière quelconque mais toujours lisible. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element damageSpan {
     empty
     >> sch:pattern [
          id =
-           "test21-damageSpan-damageSpan-requires-spanTo-constraint-rule-111"
+           "test21-damageSpan-damageSpan-requires-spanTo-constraint-rule-112"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10403,7 +10552,7 @@ damageSpan =
        ]
     >> sch:pattern [
          id =
-           "test21-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-112"
+           "test21-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-113"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10428,12 +10577,12 @@ damageSpan =
   }
 delSpan =
   
-  ## (partie de texte supprimée) marque le début d'une longue partie de texte supprimée, signalée comme supprimée ou bien signalée comme superflue ou fausse par un auteur, un copiste, un annotateur ou un correcteur. [11.3.1.4. Additions and Deletions]
+  ## (partie de texte supprimée) marque le début d'une longue partie de texte supprimée, signalée comme supprimée ou bien signalée comme superflue ou fausse par un auteur, un copiste, un annotateur ou un correcteur. [12.3.1.4. Additions and Deletions]
   element delSpan {
     empty
     >> sch:pattern [
          id =
-           "test21-delSpan-delSpan-requires-spanTo-constraint-rule-113"
+           "test21-delSpan-delSpan-requires-spanTo-constraint-rule-114"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10454,7 +10603,7 @@ delSpan =
        ]
     >> sch:pattern [
          id =
-           "test21-delSpan-delSpan-requires-spanTo-fr-constraint-rule-114"
+           "test21-delSpan-delSpan-requires-spanTo-fr-constraint-rule-115"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10480,7 +10629,7 @@ delSpan =
   }
 ex =
   
-  ## (développement éditorial) contient une succession de lettres ajoutées par un éditeur ou un transcripteur pour développer une abréviation. [11.3.1.2. Abbreviation and Expansion]
+  ## (développement éditorial) contient une succession de lettres ajoutées par un éditeur ou un transcripteur pour développer une abréviation. [12.3.1.2. Abbreviation and Expansion]
   element ex {
     macro.xtext,
     att.global.attributes,
@@ -10490,7 +10639,7 @@ ex =
   }
 fw =
   
-  ## (élément de mise en page) permet d'encoder un titre courant (en haut ou en bas de la page), une réclame ou une autre information comparable, qui apparaît sur la page courante. [11.6. Headers, Footers, and Similar Matter]
+  ## (élément de mise en page) permet d'encoder un titre courant (en haut ou en bas de la page), une réclame ou une autre information comparable, qui apparaît sur la page courante. [12.6. Headers, Footers, and Similar Matter]
   element fw {
     macro.phraseSeq,
     att.global.attributes,
@@ -10499,9 +10648,13 @@ fw =
     att.written.attributes,
     
     ## caractérise l'information encodée conformément à une typologie appropriée.
-    ## Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNum (line number); 5] sig (signature); 6] catch (catchword)
     attribute type {
-      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      
+      ## first type
+      "A"
+      | 
+        ## second type
+        "B"
     }?,
     empty
   }
@@ -10510,13 +10663,13 @@ handNotes =
     a:documentation [
       "contient un ou plusieurs éléments "
       ns1:code [ "<handNote>" ]
-      " qui documentent les différentes mains identifiées dans les textes source. [11.3.2.1. Document Hands]"
+      " qui documentent les différentes mains identifiées dans les textes source. [12.3.2.1. Document Hands]"
     ]
   ]
   element handNotes { handNote+, att.global.attributes, empty }
 handShift =
   
-  ## (reprise de main) marque le début d'une section du texte écrite par une nouvelle main ou le début d'une nouvelle séance d'écriture. [11.3.2.1. Document Hands]
+  ## (reprise de main) marque le début d'une section du texte écrite par une nouvelle main ou le début d'une nouvelle séance d'écriture. [12.3.2.1. Document Hands]
   element handShift {
     empty,
     att.global.attributes,
@@ -10530,7 +10683,7 @@ handShift =
   }
 am =
   
-  ## (marqueur d'abréviation) contient une succession de lettres ou de signes présents dans une abréviation mais omis ou remplacés dans la forme développée de l'abréviation [11.3.1.2. Abbreviation and Expansion]
+  ## (marqueur d'abréviation) contient une succession de lettres ou de signes présents dans une abréviation mais omis ou remplacés dans la forme développée de l'abréviation [12.3.1.2. Abbreviation and Expansion]
   element am {
     (text | model.gLike | model.pPart.transcriptional)*,
     att.global.attributes,
@@ -10540,7 +10693,7 @@ am =
   }
 restore =
   
-  ## (rétablissement) indique le rétablissement d'un état antérieur du texte par suppression d'une marque ou d'une instruction de l'éditeur ou de l'auteur. [11.3.1.6. Cancellation of Deletions and Other Markings]
+  ## (rétablissement) indique le rétablissement d'un état antérieur du texte par suppression d'une marque ou d'une instruction de l'éditeur ou de l'auteur. [12.3.1.6. Cancellation of Deletions and Other Markings]
   element restore {
     macro.paraContent,
     att.global.attributes,
@@ -10551,7 +10704,7 @@ restore =
   }
 space =
   
-  ## (espace) permet de situer un espace significatif dans le texte édité. [11.4.1. Space]
+  ## (espace) permet de situer un espace significatif dans le texte édité. [12.4.1. Space]
   element space {
     (model.descLike | model.certLike)*,
     att.global.attribute.xmlid,
@@ -10596,11 +10749,11 @@ space =
   }
 subst =
   
-  ## ( substitution) regroupe une ou plusieurs parties de texte supprimées et une ou plusieurs parties de texte ajoutées, lorsque cette combinaison peut être considérée comme une intervention unique sur le texte. [11.3.1.5. Substitutions]
+  ## ( substitution) regroupe une ou plusieurs parties de texte supprimées et une ou plusieurs parties de texte ajoutées, lorsque cette combinaison peut être considérée comme une intervention unique sur le texte. [12.3.1.5. Substitutions]
   element subst {
     ((add | surplus | del | model.milestoneLike)+)
     >> sch:pattern [
-         id = "test21-subst-substContents1-constraint-rule-115"
+         id = "test21-subst-substContents1-constraint-rule-116"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10628,7 +10781,7 @@ subst =
   }
 substJoin =
   
-  ## (jointure de substitution) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions]
+  ## (jointure de substitution) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [12.3.1.5. Substitutions]
   element substJoin {
     (model.descLike | model.certLike)*,
     att.global.attributes,
@@ -10639,7 +10792,7 @@ substJoin =
   }
 supplied =
   
-  ## (texte restitué) permet d'encoder du texte restitué par l'auteur de la transcription ou par l'éditeur pour une raison quelconque, le plus souvent parce que le texte du document original ne peut être lu, par suite de dommages matériels ou de lacunes. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (texte restitué) permet d'encoder du texte restitué par l'auteur de la transcription ou par l'éditeur pour une raison quelconque, le plus souvent parce que le texte du document original ne peut être lu, par suite de dommages matériels ou de lacunes. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element supplied {
     macro.paraContent,
     att.global.attributes,
@@ -10649,7 +10802,7 @@ supplied =
   }
 surplus =
   
-  ## (Texte superflu) permet d'encoder une partie de texte présente dans la source lorsque l'éditeur la considère superflue ou redondante. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (Texte superflu) permet d'encoder une partie de texte présente dans la source lorsque l'éditeur la considère superflue ou redondante. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element surplus {
     macro.paraContent,
     att.global.attributes,
@@ -10666,7 +10819,7 @@ surplus =
   }
 secl =
   
-  ## (secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [11.3.1.7. Text Omitted from or Supplied in the Transcription]
+  ## (secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [12.3.1.7. Text Omitted from or Supplied in the Transcription]
   element secl {
     macro.paraContent,
     att.global.attributes,
@@ -10683,7 +10836,7 @@ secl =
   }
 line =
   
-  ## contains the transcription of a topographic line in the source document [11.2.2. Embedded Transcription]
+  ## contains the transcription of a topographic line in the source document [12.2.2. Embedded Transcription]
   element line {
     (text | model.global | model.gLike | model.linePart)*,
     att.typed.attributes,
@@ -10694,11 +10847,11 @@ line =
   }
 listTranspose =
   
-  ## supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [11.3.4.5. Transpositions]
+  ## supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [12.3.4.5. Transpositions]
   element listTranspose { desc*, att.global.attributes, empty }
 metamark =
   
-  ## contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [11.3.4.2. Metamarks]
+  ## contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [12.3.4.2. Metamarks]
   element metamark {
     macro.specialPara,
     att.spanning.attributes,
@@ -10720,7 +10873,7 @@ metamark =
   }
 mod =
   
-  ## represents any kind of modification identified within a single document. [11.3.4.1. Generic Modification]
+  ## represents any kind of modification identified within a single document. [12.3.4.1. Generic Modification]
   element mod {
     macro.paraContent,
     att.global.attributes,
@@ -10732,7 +10885,7 @@ mod =
   }
 redo =
   
-  ## indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
+  ## indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
   element redo {
     empty,
     att.global.attributes,
@@ -10750,7 +10903,7 @@ redo =
   }
 retrace =
   
-  ## contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [11.3.4.3. Fixation and Clarification]
+  ## contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [12.3.4.3. Fixation and Clarification]
   element retrace {
     macro.paraContent,
     att.global.attributes,
@@ -10761,7 +10914,7 @@ retrace =
   }
 undo =
   
-  ## indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
+  ## indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
   element undo {
     empty,
     att.global.attributes,
@@ -10782,7 +10935,7 @@ TEI =
     a:documentation [
       "(document TEI) contient un seul document conforme à la TEI, qui comprend un en-tête TEI et un texte, soit de façon isolée, soit comme partie d’un élément "
       ns1:code [ "<teiCorpus>" ]
-      ". [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      ". [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element TEI {
@@ -10817,7 +10970,7 @@ TEI =
   }
 \text =
   
-  ## (texte) contient un seul texte quelconque, simple ou composite, par exemple un poème ou une pièce de théâtre, un recueil d’essais, un roman, un dictionnaire ou un échantillon de corpus. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (texte) contient un seul texte quelconque, simple ou composite, par exemple un poème ou une pièce de théâtre, un recueil d’essais, un roman, un dictionnaire ou un échantillon de corpus. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element text {
     (model.global*,
      (front, model.global*)?,
@@ -10860,7 +11013,7 @@ body =
   }
 group =
   
-  ## (groupe) contient un ensemble de textes distincts (ou des groupes de textes de ce type), considérés comme formant une unité, par exemple pour présenter les œuvres complètes d’un auteur, une suite d’essais en prose, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]
+  ## (groupe) contient un ensemble de textes distincts (ou des groupes de textes de ce type), considérés comme formant une unité, par exemple pour présenter les œuvres complètes d’un auteur, une suite d’essais en prose, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]
   element group {
     ((model.divTop | model.global)*,
      ((\text | group), (\text | group | model.global)*),
@@ -10881,7 +11034,7 @@ group =
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "test21-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-116"
+           "test21-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-117"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -10903,7 +11056,7 @@ group =
        ]
     >> sch:pattern [
          id =
-           "test21-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-117"
+           "test21-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-118"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -11051,6 +11204,7 @@ trailer =
     att.typed.attributes,
     att.placement.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 byline =
@@ -11059,6 +11213,7 @@ byline =
   element byline {
     (text | model.gLike | model.phrase | docAuthor | model.global)*,
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 dateline =
@@ -11067,6 +11222,7 @@ dateline =
   element dateline {
     (text | model.gLike | model.phrase | model.global | docDate)*,
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 argument =
@@ -11075,13 +11231,17 @@ argument =
   element argument {
     ((model.global | model.headLike)*, (model.common, model.global*)+),
     att.global.attributes,
+    att.cmc.attributes,
     empty
   }
 epigraph =
   
   ## (epigraph) contient une citation, anonyme ou attribuée et qui apparaît au début d’une section ou d’un chapitre ou sur une page de titre. [4.2.3. Arguments, Epigraphs, and Postscripts 4.2. Elements Common to All Divisions 4.6. Title Pages]
   element epigraph {
-    (model.common | model.global)*, att.global.attributes, empty
+    (model.common | model.global)*,
+    att.global.attributes,
+    att.cmc.attributes,
+    empty
   }
 opener =
   
@@ -11099,6 +11259,7 @@ opener =
      | model.global)*,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 closer =
@@ -11114,6 +11275,7 @@ closer =
      | model.global)*,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 salute =
@@ -11123,6 +11285,7 @@ salute =
     macro.paraContent,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 signed =
@@ -11132,6 +11295,7 @@ signed =
     macro.paraContent,
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 postscript =
@@ -11144,6 +11308,7 @@ postscript =
      (model.divBottomPart, model.global*)*),
     att.global.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 titlePage =
@@ -11185,27 +11350,14 @@ titlePart =
     att.typed.attribute.subtype,
     
     ## (type) précise le rôle de cette subdivision du titre.
-    ## Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)
     [ a:defaultValue = "main" ]
     attribute type {
       
-      ## (main) titre principal de l'oeuvre.
-      "main"
-      | 
-        ## (sous-titre de l’ouvrage.) sous-titre de l'oeuvre.
-        "sub"
-      | 
-        ## (titre alternatif de
-        ##                         l’ouvrage.) autre titre de l'oeuvre.
-        "alt"
-      | 
-        ## (short) forme abrégée du titre.
-        "short"
+      ## first type
+      "A"
       | 
-        ## (description paraphrastique de
-        ##                             l’ouvrage.) texte qui paraphrase l'oeuvre.
-        "desc"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+        ## second type
+        "B"
     }?,
     empty
   }
@@ -11216,6 +11368,7 @@ docAuthor =
     macro.phraseSeq,
     att.global.attributes,
     att.canonical.attributes,
+    att.cmc.attributes,
     empty
   }
 imprimatur =
@@ -11246,6 +11399,7 @@ docDate =
   element docDate {
     macro.phraseSeq,
     att.global.attributes,
+    att.cmc.attributes,
     att.datable.attributes,
     att.calendarSystem.attributes,
     empty
diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd
index 1fdd5f4db..edd0f7649 100644
--- a/Test/expected-results/test30.dtd
+++ b/Test/expected-results/test30.dtd
@@ -305,6 +305,10 @@ group %teidata.count;  #IMPLIED'>
 break %teidata.enumerated;  #IMPLIED'>
 <!ENTITY % Tatt.breaking.attributes '
  %Tatt.breaking.attribute.break;'> 
+<!ENTITY % Tatt.cmc.attribute.generatedBy '
+generatedBy %teidata.enumerated;  #IMPLIED'>
+<!ENTITY % Tatt.cmc.attributes '
+ %Tatt.cmc.attribute.generatedBy;'> 
 <!ENTITY % Tatt.cReferencing.attribute.cRef '
 cRef %teidata.text;  #IMPLIED'>
 <!ENTITY % Tatt.cReferencing.attributes '
@@ -885,11 +889,11 @@ to %teidata.word;  #IMPLIED'>
 <!ENTITY % model.global_sequenceOptional "%model.global.meta;?, %model.milestoneLike;?, %model.noteLike;?, %model.global.edit;?, metamark?, notatedMusic?, figure?"> 
 <!ENTITY % model.global_sequenceOptionalRepeatable "%model.global.meta;*, %model.milestoneLike;*, %model.noteLike;*, %model.global.edit;*, metamark*, notatedMusic*, figure*"> 
 <!ENTITY % model.global_sequenceRepeatable "%model.global.meta;+, %model.milestoneLike;+, %model.noteLike;+, %model.global.edit;+, metamark+, notatedMusic+, figure+"> 
-<!ENTITY % model.biblPart "%model.respLike; |%model.imprintPart; |series |citedRange |bibl |relatedItem |textLang |edition |extent |availability |listRelation |objectIdentifier"> 
-<!ENTITY % model.biblPart_sequence "%model.respLike;, %model.imprintPart;, series, citedRange, bibl, relatedItem, textLang, edition, extent, availability, listRelation, objectIdentifier"> 
-<!ENTITY % model.biblPart_sequenceOptional "%model.respLike;?, %model.imprintPart;?, series?, citedRange?, bibl?, relatedItem?, textLang?, edition?, extent?, availability?, listRelation?, objectIdentifier?"> 
-<!ENTITY % model.biblPart_sequenceOptionalRepeatable "%model.respLike;*, %model.imprintPart;*, series*, citedRange*, bibl*, relatedItem*, textLang*, edition*, extent*, availability*, listRelation*, objectIdentifier*"> 
-<!ENTITY % model.biblPart_sequenceRepeatable "%model.respLike;+, %model.imprintPart;+, series+, citedRange+, bibl+, relatedItem+, textLang+, edition+, extent+, availability+, listRelation+, objectIdentifier+"> 
+<!ENTITY % model.biblPart "%model.respLike; |%model.imprintPart; |quote |series |citedRange |bibl |relatedItem |textLang |edition |extent |availability |listRelation |objectIdentifier"> 
+<!ENTITY % model.biblPart_sequence "%model.respLike;, %model.imprintPart;, quote, series, citedRange, bibl, relatedItem, textLang, edition, extent, availability, listRelation, objectIdentifier"> 
+<!ENTITY % model.biblPart_sequenceOptional "%model.respLike;?, %model.imprintPart;?, quote?, series?, citedRange?, bibl?, relatedItem?, textLang?, edition?, extent?, availability?, listRelation?, objectIdentifier?"> 
+<!ENTITY % model.biblPart_sequenceOptionalRepeatable "%model.respLike;*, %model.imprintPart;*, quote*, series*, citedRange*, bibl*, relatedItem*, textLang*, edition*, extent*, availability*, listRelation*, objectIdentifier*"> 
+<!ENTITY % model.biblPart_sequenceRepeatable "%model.respLike;+, %model.imprintPart;+, quote+, series+, citedRange+, bibl+, relatedItem+, textLang+, edition+, extent+, availability+, listRelation+, objectIdentifier+"> 
 <!ENTITY % model.frontPart "listBibl |divGen |titlePage"> 
 <!ENTITY % model.frontPart_sequence "listBibl, divGen, titlePage"> 
 <!ENTITY % model.frontPart_sequenceOptional "listBibl?, divGen?, titlePage?"> 
@@ -910,6 +914,11 @@ to %teidata.word;  #IMPLIED'>
 <!ENTITY % model.inter_sequenceOptional "%model.biblLike;?, %model.labelLike;?, %model.listLike;?, %model.stageLike;?, %model.attributable;?"> 
 <!ENTITY % model.inter_sequenceOptionalRepeatable "%model.biblLike;*, %model.labelLike;*, %model.listLike;*, %model.stageLike;*, %model.attributable;*"> 
 <!ENTITY % model.inter_sequenceRepeatable "%model.biblLike;+, %model.labelLike;+, %model.listLike;+, %model.stageLike;+, %model.attributable;+"> 
+<!ENTITY % model.cmc ""> 
+<!ENTITY % model.cmc_sequence ""> 
+<!ENTITY % model.cmc_sequenceOptional ""> 
+<!ENTITY % model.cmc_sequenceOptionalRepeatable ""> 
+<!ENTITY % model.cmc_sequenceRepeatable ""> 
 <!ENTITY % model.common "%model.divPart; |%model.inter; |q"> 
 <!ENTITY % model.common_sequence "%model.divPart;, %model.inter;, q"> 
 <!ENTITY % model.common_sequenceOptional "%model.divPart;?, %model.inter;?, q?"> 
@@ -985,11 +994,11 @@ to %teidata.word;  #IMPLIED'>
 <!ENTITY % model.profileDescPart_sequenceOptional "abstract?, creation?, langUsage?, textClass?, calendarDesc?, correspDesc?, handNotes?, listTranspose?, settingDesc?"> 
 <!ENTITY % model.profileDescPart_sequenceOptionalRepeatable "abstract*, creation*, langUsage*, textClass*, calendarDesc*, correspDesc*, handNotes*, listTranspose*, settingDesc*"> 
 <!ENTITY % model.profileDescPart_sequenceRepeatable "abstract+, creation+, langUsage+, textClass+, calendarDesc+, correspDesc+, handNotes+, listTranspose+, settingDesc+"> 
-<!ENTITY % model.standOffPart "%model.global.meta; |%model.biblLike; |%model.listLike; |%model.annotationLike; |listChange |zone |seg |listAnnotation"> 
-<!ENTITY % model.standOffPart_sequence "%model.global.meta;, %model.biblLike;, %model.listLike;, %model.annotationLike;, listChange, zone, seg, listAnnotation"> 
-<!ENTITY % model.standOffPart_sequenceOptional "%model.global.meta;?, %model.biblLike;?, %model.listLike;?, %model.annotationLike;?, listChange?, zone?, seg?, listAnnotation?"> 
-<!ENTITY % model.standOffPart_sequenceOptionalRepeatable "%model.global.meta;*, %model.biblLike;*, %model.listLike;*, %model.annotationLike;*, listChange*, zone*, seg*, listAnnotation*"> 
-<!ENTITY % model.standOffPart_sequenceRepeatable "%model.global.meta;+, %model.biblLike;+, %model.listLike;+, %model.annotationLike;+, listChange+, zone+, seg+, listAnnotation+"> 
+<!ENTITY % model.standOffPart "%model.global.meta; |%model.biblLike; |%model.listLike; |%model.annotationLike; |xenoData |listChange |zone |seg |listAnnotation"> 
+<!ENTITY % model.standOffPart_sequence "%model.global.meta;, %model.biblLike;, %model.listLike;, %model.annotationLike;, xenoData, listChange, zone, seg, listAnnotation"> 
+<!ENTITY % model.standOffPart_sequenceOptional "%model.global.meta;?, %model.biblLike;?, %model.listLike;?, %model.annotationLike;?, xenoData?, listChange?, zone?, seg?, listAnnotation?"> 
+<!ENTITY % model.standOffPart_sequenceOptionalRepeatable "%model.global.meta;*, %model.biblLike;*, %model.listLike;*, %model.annotationLike;*, xenoData*, listChange*, zone*, seg*, listAnnotation*"> 
+<!ENTITY % model.standOffPart_sequenceRepeatable "%model.global.meta;+, %model.biblLike;+, %model.listLike;+, %model.annotationLike;+, xenoData+, listChange+, zone+, seg+, listAnnotation+"> 
 <!ENTITY % Tatt.formula.attribute.formula '
 formula %teidata.xpath;  #IMPLIED'>
 <!ENTITY % Tatt.formula.attributes '
@@ -1216,7 +1225,7 @@ xml:space (default|preserve) #IMPLIED'>
 <!ATTLIST Menu
  %Tatt.global.attribute.xmlid;
  %Tatt.global.rendition.attribute.rend; >
-<!--doc:(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple TEI elements may be combined within a TEI (or teiCorpus) element. [4. Default Text Structure 15.1. Varieties of Composite Text] -->
+<!--doc:(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple TEI elements may be combined within a TEI (or teiCorpus) element. [4. Default Text Structure 16.1. Varieties of Composite Text] -->
 <!ELEMENT TEI ((teiHeader,(((%model.resource;)+,(TEI)*)|(TEI)+)))>
 <!ATTLIST TEI xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST TEI
@@ -1226,7 +1235,7 @@ version %teidata.version;  #IMPLIED >
 <!ATTLIST TEI xsi:schemaLocation CDATA #IMPLIED
  xmlns:xsi CDATA #FIXED 'http://www.w3.org/2001/XMLSchema-instance'
  >
-<!--doc:(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors] -->
+<!--doc:(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors] -->
 <!ELEMENT ab %macro.abContent;>
 <!ATTLIST ab xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST ab
@@ -1234,13 +1243,15 @@ version %teidata.version;  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.declaring.attributes;
  %Tatt.fragmentable.attributes;
- %Tatt.written.attributes; >
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(abbreviation) contains an abbreviation of any sort. [3.6.5. Abbreviations and Their Expansions] -->
 <!ELEMENT abbr %macro.phraseSeq;>
 <!ATTLIST abbr xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST abbr
  %Tatt.global.attributes;
  %Tatt.typed.attribute.subtype;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED >
 <!--doc:contains a summary or formal abstract prefixed to an existing source document by the encoder. [2.4.4. Abstracts] -->
 <!ELEMENT abstract (%model.pLike;|%model.listLike;|listBibl)+>
@@ -1255,15 +1266,17 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.transcriptional.attributes;
  %Tatt.placement.attributes;
  %Tatt.typed.attributes;
- %Tatt.dimensions.attributes; >
-<!--doc:(additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [13.2.1. Personal Names] -->
+ %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [14.2.1. Personal Names] -->
 <!ELEMENT addName %macro.phraseSeq;>
 <!ATTLIST addName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST addName
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also add). [11.3.1.4. Additions and Deletions] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also add). [12.3.1.4. Additions and Deletions] -->
 <!ELEMENT addSpan  EMPTY>
 <!ATTLIST addSpan xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST addSpan
@@ -1282,8 +1295,9 @@ type %teidata.enumerated;  #IMPLIED >
 <!ELEMENT address (((%model.global;)*,((%model.addrPart;),(%model.global;)*)+))>
 <!ATTLIST address xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST address
- %Tatt.global.attributes; >
-<!--doc:(affiliation) contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor. [15.2.2. The Participant Description] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(affiliation) contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor. [16.2.2. The Participant Description] -->
 <!ELEMENT affiliation %macro.phraseSeq;>
 <!ATTLIST affiliation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST affiliation
@@ -1292,9 +1306,10 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.datable.attributes;
  %Tatt.naming.attributes;
  %Tatt.typed.attribute.subtype;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED >
-<!--doc:(age) specifies the age of a person. [13.3.2.1. Personal Characteristics] -->
+<!--doc:(age) specifies the age of a person. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT age %macro.phraseSeq.limited;>
 <!ATTLIST age xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST age
@@ -1306,7 +1321,7 @@ calendar CDATA  #IMPLIED >
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED
 value %teidata.count;  #IMPLIED >
-<!--doc:(alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation] -->
+<!--doc:(alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation] -->
 <!ELEMENT alt  EMPTY>
 <!ATTLIST alt xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST alt
@@ -1314,17 +1329,19 @@ value %teidata.count;  #IMPLIED >
  %Tatt.pointing.attribute.targetLang;
  %Tatt.pointing.attribute.evaluate;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 target CDATA  #IMPLIED
 mode (excl|incl) #IMPLIED
 weights CDATA  #IMPLIED >
-<!--doc:(alternation group) groups a collection of alt elements and possibly pointers. [16.8. Alternation] -->
+<!--doc:(alternation group) groups a collection of alt elements and possibly pointers. [17.8. Alternation] -->
 <!ELEMENT altGrp (((%model.descLike;)*,(alt|ptr)*))>
 <!ATTLIST altGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST altGrp
  %Tatt.global.attributes;
  %Tatt.pointing.group.attributes;
+ %Tatt.cmc.attributes;
 mode (excl|incl) "excl"  >
-<!--doc:(abbreviation marker) contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation. [11.3.1.2. Abbreviation and Expansion] -->
+<!--doc:(abbreviation marker) contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation. [12.3.1.2. Abbreviation and Expansion] -->
 <!ELEMENT am (#PCDATA|_DUMMY_model.gLike|%model.pPart.transcriptional;)*>
 <!ATTLIST am xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST am
@@ -1336,13 +1353,14 @@ mode (excl|incl) "excl"  >
 <!ATTLIST analytic xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST analytic
  %Tatt.global.attributes; >
-<!--doc:(anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment] -->
+<!--doc:(anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment] -->
 <!ELEMENT anchor  EMPTY>
 <!ATTLIST anchor xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST anchor
  %Tatt.global.attributes;
- %Tatt.typed.attributes; >
-<!--doc:represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container] -->
 <!ELEMENT annotation (((respStmt)*,(revisionDesc)*,(licence)*,(%model.annotationPart.body;)*))>
 <!ATTLIST annotation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST annotation
@@ -1385,7 +1403,8 @@ version %teidata.versionNumber;  #REQUIRED >
 <!ELEMENT argument (((%model.global;|%model.headLike;)*,((%model.common;),(%model.global;)*)+))>
 <!ATTLIST argument xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST argument
- %Tatt.global.attributes; >
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(author) in a bibliographic reference, contains the name(s) of an author, personal or corporate, of a work; for example in the same form as that provided by a recognized bibliographic name authority. [3.12.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement] -->
 <!ELEMENT author %macro.phraseSeq;>
 <!ATTLIST author xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1413,7 +1432,7 @@ status (free|unknown|restricted) #IMPLIED >
 <!ATTLIST back
  %Tatt.global.attributes;
  %Tatt.declaring.attributes; >
-<!--doc:(bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements] -->
+<!--doc:(bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements] -->
 <!ELEMENT bibl (#PCDATA|_DUMMY_model.gLike|%model.highlighted;|%model.pPart.data;|%model.pPart.edit;|%model.segLike;|%model.ptrLike;|%model.biblPart;|%model.global;)*>
 <!ATTLIST bibl xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST bibl
@@ -1421,22 +1440,24 @@ status (free|unknown|restricted) #IMPLIED >
  %Tatt.declarable.attributes;
  %Tatt.typed.attributes;
  %Tatt.sortable.attributes;
- %Tatt.docStatus.attributes; >
-<!--doc:(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements] -->
+ %Tatt.docStatus.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements] -->
 <!ELEMENT biblFull (((titleStmt,(editionStmt)?,(extent)?,publicationStmt,(seriesStmt)*,(notesStmt)?),(sourceDesc)*)|(fileDesc,profileDesc))>
 <!ATTLIST biblFull xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST biblFull
  %Tatt.global.attributes;
  %Tatt.declarable.attributes;
  %Tatt.sortable.attributes;
- %Tatt.docStatus.attributes; >
+ %Tatt.docStatus.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(scope of bibliographic reference) defines the scope of a bibliographic reference, for example as a list of page numbers, or a named subdivision of a larger work. [3.12.2.5. Scopes and Ranges in Bibliographic Citations] -->
 <!ELEMENT biblScope %macro.phraseSeq;>
 <!ATTLIST biblScope xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST biblScope
  %Tatt.global.attributes;
  %Tatt.citing.attributes; >
-<!--doc:(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements] -->
+<!--doc:(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements] -->
 <!ELEMENT biblStruct (((analytic)*,(monogr,(series)*)+,(%model.noteLike;|%model.ptrLike;|relatedItem|citedRange)*))>
 <!ATTLIST biblStruct xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST biblStruct
@@ -1444,7 +1465,8 @@ status (free|unknown|restricted) #IMPLIED >
  %Tatt.declarable.attributes;
  %Tatt.typed.attributes;
  %Tatt.sortable.attributes;
- %Tatt.docStatus.attributes; >
+ %Tatt.docStatus.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:provides encoded binary data representing an inline graphic, audio, video or other object. [3.10. Graphics and Other Non-textual Components] -->
 <!ELEMENT binaryObject (#PCDATA)>
 <!ATTLIST binaryObject xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1453,8 +1475,9 @@ status (free|unknown|restricted) #IMPLIED >
  %Tatt.media.attributes;
  %Tatt.timed.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 encoding CDATA  #IMPLIED >
-<!--doc:(birth) contains information about a person's birth, such as its date and place. [15.2.2. The Participant Description] -->
+<!--doc:(birth) contains information about a person's birth, such as its date and place. [16.2.2. The Participant Description] -->
 <!ELEMENT birth %macro.phraseSeq;>
 <!ATTLIST birth xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST birth
@@ -1466,7 +1489,7 @@ encoding CDATA  #IMPLIED >
  %Tatt.typed.attribute.subtype;
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED >
-<!--doc:(bloc) contains the name of a geo-political unit consisting of two or more nation states or countries. [13.2.3. Place Names] -->
+<!--doc:(bloc) contains the name of a geo-political unit consisting of two or more nation states or countries. [14.2.3. Place Names] -->
 <!ELEMENT bloc %macro.phraseSeq;>
 <!ATTLIST bloc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST bloc
@@ -1474,6 +1497,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.datable.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(text body) contains the whole body of a single unitary text, excluding any front or back matter. [4. Default Text Structure] -->
 <!ELEMENT body (((%model.global;)*,((%model.divTop;),(%model.global;|%model.divTop;)*)?,((%model.divGenLike;),(%model.global;|%model.divGenLike;)*)?,(((%model.divLike;),(%model.global;|%model.divGenLike;)*)+|((_DUMMY_model.div1Like),(%model.global;|%model.divGenLike;)*)+|(((schemaSpec|%model.common;),(%model.global;)*)+,(((%model.divLike;),(%model.global;|%model.divGenLike;)*)+|((_DUMMY_model.div1Like),(%model.global;|%model.divGenLike;)*)+)?)),((%model.divBottom;),(%model.global;)*)*))>
@@ -1485,7 +1509,8 @@ calendar CDATA  #IMPLIED >
 <!ELEMENT byline (#PCDATA|_DUMMY_model.gLike|%model.phrase;|docAuthor|%model.global;)*>
 <!ATTLIST byline xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST byline
- %Tatt.global.attributes; >
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(canonical reference pattern) specifies an expression and replacement pattern for transforming a canonical reference into a URI. [2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration 2.3.6.2. Search-and-Replace Method] -->
 <!ELEMENT cRefPattern (%model.pLike;)*>
 <!ATTLIST cRefPattern xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1532,14 +1557,15 @@ Elements] -->
  %Tatt.typed.attributes;
  %Tatt.edition.attributes;
  %Tatt.spanning.attributes;
- %Tatt.breaking.attributes; >
-<!--doc:(cell) contains one cell of a table. [14.1.1. TEI Tables] -->
+ %Tatt.breaking.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(cell) contains one cell of a table. [15.1.1. TEI Tables] -->
 <!ELEMENT cell %macro.specialPara;>
 <!ATTLIST cell xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST cell
  %Tatt.global.attributes;
  %Tatt.tableDecoration.attributes; >
-<!--doc:(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions] -->
+<!--doc:(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions] -->
 <!ELEMENT change %macro.specialPara;>
 <!ATTLIST change xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST change
@@ -1554,21 +1580,23 @@ target CDATA  #IMPLIED >
 <!ELEMENT choice (%model.choicePart;|choice)>
 <!ATTLIST choice xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST choice
- %Tatt.global.attributes; >
-<!--doc:(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples] -->
 <!ELEMENT cit (%model.biblLike;|_DUMMY_model.egLike|_DUMMY_model.entryPart|%model.global;|%model.graphicLike;|%model.ptrLike;|%model.attributable;|pc|q)+>
 <!ATTLIST cit xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST cit
  %Tatt.global.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures] -->
 <!ELEMENT citeData  EMPTY>
 <!ATTLIST citeData xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST citeData
  %Tatt.global.attributes;
  %Tatt.citeStructurePart.attributes;
 property %teidata.pointer;  #REQUIRED >
-<!--doc:(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures] -->
+<!--doc:(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures] -->
 <!ELEMENT citeStructure (((citeData)*,(citeStructure)*,(%model.descLike;)*))>
 <!ATTLIST citeStructure xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST citeStructure
@@ -1595,7 +1623,7 @@ scheme %teidata.pointer;  #REQUIRED >
 <!ATTLIST classDecl xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST classDecl
  %Tatt.global.attributes; >
-<!--doc:(climate) contains information about the physical climate of a place. [13.3.4.3. States, Traits, and Events] -->
+<!--doc:(climate) contains information about the physical climate of a place. [14.3.4.3. States, Traits, and Events] -->
 <!ELEMENT climate (((precision)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+),(%model.noteLike;|%model.biblLike;)*,(climate)*))>
 <!ATTLIST climate xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST climate
@@ -1604,13 +1632,15 @@ scheme %teidata.pointer;  #REQUIRED >
  %Tatt.editLike.attributes;
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(closer) groups together salutations, datelines, and similar phrases appearing as a final group at the end of a division, especially of a letter. [4.2.2. Openers and Closers 4.2. Elements Common to All Divisions] -->
 <!ELEMENT closer (#PCDATA|_DUMMY_model.gLike|signed|dateline|salute|%model.phrase;|%model.global;)*>
 <!ATTLIST closer xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST closer
  %Tatt.global.attributes;
- %Tatt.written.attributes; >
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:defines how to calculate one unit of measure in terms of another. [2.3.9. The Unit Declaration] -->
 <!ELEMENT conversion  EMPTY>
 <!ATTLIST conversion xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1628,8 +1658,9 @@ toUnit %teidata.pointer;  #REQUIRED >
 <!ATTLIST corr
  %Tatt.global.attributes;
  %Tatt.editLike.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements] -->
 <!ELEMENT correction (%model.pLike;)+>
 <!ATTLIST correction xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST correction
@@ -1658,7 +1689,7 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.canonical.attributes;
  %Tatt.global.attributes;
  %Tatt.typed.attributes; >
-<!--doc:(country) contains the name of a geo-political unit, such as a nation, country, colony, or commonwealth, larger than or administratively superior to a region and smaller than a bloc. [13.2.3. Place Names] -->
+<!--doc:(country) contains the name of a geo-political unit, such as a nation, country, colony, or commonwealth, larger than or administratively superior to a region and smaller than a bloc. [14.2.3. Place Names] -->
 <!ELEMENT country %macro.phraseSeq;>
 <!ATTLIST country xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST country
@@ -1666,6 +1697,7 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.datable.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(creation) contains information about the creation of a text. [2.4.1. Creation 2.4. The Profile Description] -->
 <!ELEMENT creation (#PCDATA|%model.limitedPhrase;|listChange)*>
@@ -1674,14 +1706,14 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.datable.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(damage) contains an area of damage to the text witness. [11.3.3.1. Damage, Illegibility, and Supplied Text] -->
+<!--doc:(damage) contains an area of damage to the text witness. [12.3.3.1. Damage, Illegibility, and Supplied Text] -->
 <!ELEMENT damage %macro.paraContent;>
 <!ATTLIST damage xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST damage
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.damaged.attributes; >
-<!--doc:(damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text] -->
+<!--doc:(damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [12.3.3.1. Damage, Illegibility, and Supplied Text] -->
 <!ELEMENT damageSpan  EMPTY>
 <!ATTLIST damageSpan xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST damageSpan
@@ -1689,7 +1721,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.damaged.attributes;
  %Tatt.typed.attributes;
  %Tatt.spanning.attributes; >
-<!--doc:(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates] -->
+<!--doc:(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates] -->
 <!ELEMENT date (#PCDATA|_DUMMY_model.gLike|%model.phrase;|%model.global;)*>
 <!ATTLIST date xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST date
@@ -1699,13 +1731,15 @@ calendar CDATA  #IMPLIED >
  %Tatt.calendarSystem.attributes;
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(dateline) contains a brief description of the place, date, time, etc. of production of a letter, newspaper story, or other work, prefixed or suffixed to it as a kind of heading or trailer. [4.2.2. Openers and Closers] -->
 <!ELEMENT dateline (#PCDATA|_DUMMY_model.gLike|%model.phrase;|%model.global;|docDate)*>
 <!ATTLIST dateline xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST dateline
- %Tatt.global.attributes; >
-<!--doc:(death) contains information about a person's death, such as its date and place. [15.2.2. The Participant Description] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(death) contains information about a person's death, such as its date and place. [16.2.2. The Participant Description] -->
 <!ELEMENT death %macro.phraseSeq;>
 <!ATTLIST death xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST death
@@ -1724,8 +1758,9 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.transcriptional.attributes;
  %Tatt.typed.attributes;
- %Tatt.dimensions.attributes; >
-<!--doc:(deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [11.3.1.4. Additions and Deletions] -->
+ %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [12.3.1.4. Additions and Deletions] -->
 <!ELEMENT delSpan  EMPTY>
 <!ATTLIST delSpan xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST delSpan
@@ -1734,12 +1769,13 @@ calendar CDATA  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.spanning.attributes;
  %Tatt.dimensions.attributes; >
-<!--doc:(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components] -->
+<!--doc:(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components] -->
 <!ELEMENT desc %macro.limitedContent;>
 <!ATTLIST desc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST desc
  %Tatt.global.attributes;
  %Tatt.typed.attribute.subtype;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED >
 <!--doc:identifies any word or phrase which is regarded as linguistically distinct, for example as archaic, technical, dialectal, non-preferred, etc., or as forming part of a sublanguage. [3.3.2.3. Other Linguistically Distinct Material] -->
 <!ELEMENT distinct %macro.phraseSeq;>
@@ -1747,6 +1783,7 @@ type %teidata.enumerated;  #IMPLIED >
 <!ATTLIST distinct
  %Tatt.global.attributes;
  %Tatt.typed.attribute.subtype;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED
 time %teidata.text;  #IMPLIED
 space %teidata.text;  #IMPLIED
@@ -1757,7 +1794,7 @@ social %teidata.text;  #IMPLIED >
 <!ATTLIST distributor
  %Tatt.global.attributes;
  %Tatt.canonical.attributes; >
-<!--doc:(district) contains the name of any kind of subdivision of a settlement, such as a parish, ward, or other administrative or geographic unit. [13.2.3. Place Names] -->
+<!--doc:(district) contains the name of any kind of subdivision of a settlement, such as a parish, ward, or other administrative or geographic unit. [14.2.3. Place Names] -->
 <!ELEMENT district %macro.phraseSeq;>
 <!ATTLIST district xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST district
@@ -1765,6 +1802,7 @@ social %teidata.text;  #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.datable.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(text division) contains a subdivision of the front, body, or back of a text. [4.1. Divisions of the Body] -->
 <!ELEMENT div (((%model.divTop;|%model.global;)*,((((%model.divLike;|%model.divGenLike;),(%model.global;)*)+|(((schemaSpec|%model.common;),(%model.global;)*)+,((%model.divLike;|%model.divGenLike;),(%model.global;)*)*)),((%model.divBottom;),(%model.global;)*)*)?))>
@@ -1788,12 +1826,14 @@ type %teidata.enumerated;  #IMPLIED >
 <!ATTLIST docAuthor xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST docAuthor
  %Tatt.global.attributes;
- %Tatt.canonical.attributes; >
+ %Tatt.canonical.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(document date) contains the date of a document, as given on a title page or in a dateline. [4.6. Title Pages] -->
 <!ELEMENT docDate %macro.phraseSeq;>
 <!ATTLIST docDate xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST docDate
  %Tatt.global.attributes;
+ %Tatt.cmc.attributes;
  %Tatt.datable.attributes;
  %Tatt.calendarSystem.attributes; >
 <!--doc:(document edition) contains an edition statement as presented on a title page of a document. [4.6. Title Pages] -->
@@ -1830,13 +1870,13 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.datable.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements] -->
+<!--doc:(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements] -->
 <!ELEMENT editorialDecl (%model.pLike;|%model.editorialDeclPart;)+>
 <!ATTLIST editorialDecl xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST editorialDecl
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
-<!--doc:(education) contains a description of the educational experience of a person. [15.2.2. The Participant Description] -->
+<!--doc:(education) contains a description of the educational experience of a person. [16.2.2. The Participant Description] -->
 <!ELEMENT education %macro.phraseSeq;>
 <!ATTLIST education xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST education
@@ -1858,12 +1898,14 @@ calendar CDATA  #IMPLIED >
 <!ELEMENT email %macro.phraseSeq;>
 <!ATTLIST email xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST email
- %Tatt.global.attributes; >
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language] -->
 <!ELEMENT emph %macro.paraContent;>
 <!ATTLIST emph xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST emph
- %Tatt.global.attributes; >
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(encoding description) documents the relationship between an electronic text and the source or sources from which it was derived. [2.3. The Encoding Description 2.1.1. The TEI Header and Its Components] -->
 <!ELEMENT encodingDesc (%model.encodingDescPart;|%model.pLike;)+>
 <!ATTLIST encodingDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1873,8 +1915,9 @@ calendar CDATA  #IMPLIED >
 <!ELEMENT epigraph (%model.common;|%model.global;)*>
 <!ATTLIST epigraph xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST epigraph
- %Tatt.global.attributes; >
-<!--doc:(event) contains data relating to anything of significance that happens in time. [13.3.1. Basic Principles] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(event) contains data relating to anything of significance that happens in time. [14.3.1. Basic Principles] -->
 <!ELEMENT event (((idno)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+|(eventName)+),(%model.noteLike;|%model.biblLike;|linkGrp|link|idno|ptr)*,(%model.eventLike;)*,(%model.personLike;|listPerson)*,(%model.placeLike;|listPlace)*,(%model.objectLike;)*,(relation|listRelation)*))>
 <!ATTLIST event xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST event
@@ -1886,7 +1929,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.sortable.attributes;
  %Tatt.typed.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names] -->
+<!--doc:(name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names] -->
 <!ELEMENT eventName %macro.phraseSeq;>
 <!ATTLIST eventName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST eventName
@@ -1895,7 +1938,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.personal.attributes;
  %Tatt.typed.attributes; >
-<!--doc:(editorial expansion) contains a sequence of letters added by an editor or transcriber when expanding an abbreviation. [11.3.1.2. Abbreviation and Expansion] -->
+<!--doc:(editorial expansion) contains a sequence of letters added by an editor or transcriber when expanding an abbreviation. [12.3.1.2. Abbreviation and Expansion] -->
 <!ELEMENT ex %macro.xtext;>
 <!ATTLIST ex xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST ex
@@ -1907,19 +1950,20 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST expan xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST expan
  %Tatt.global.attributes;
- %Tatt.editLike.attributes; >
-<!--doc:(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description] -->
+ %Tatt.editLike.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description] -->
 <!ELEMENT extent %macro.phraseSeq;>
 <!ATTLIST extent xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST extent
  %Tatt.global.attributes; >
-<!--doc:contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text. [11.1. Digital Facsimiles] -->
+<!--doc:contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text. [12.1. Digital Facsimiles] -->
 <!ELEMENT facsimile (((front)?,(%model.graphicLike;|surface|surfaceGrp)+,(back)?))>
 <!ATTLIST facsimile xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST facsimile
  %Tatt.global.attributes;
  %Tatt.declaring.attributes; >
-<!--doc:(faith) specifies the faith, religion, or belief set of a person. [13.3.2.1. Personal Characteristics] -->
+<!--doc:(faith) specifies the faith, religion, or belief set of a person. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT faith %macro.phraseSeq;>
 <!ATTLIST faith xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST faith
@@ -1930,19 +1974,20 @@ calendar CDATA  #IMPLIED >
  %Tatt.typed.attribute.subtype;
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED >
-<!--doc:(description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [14.4. Specific Elements for Graphic Images] -->
+<!--doc:(description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [15.4. Specific Elements for Graphic Images] -->
 <!ELEMENT figDesc %macro.limitedContent;>
 <!ATTLIST figDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST figDesc
  %Tatt.global.attributes; >
-<!--doc:(figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [14.4. Specific Elements for Graphic Images] -->
+<!--doc:(figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [15.4. Specific Elements for Graphic Images] -->
 <!ELEMENT figure (%model.headLike;|%model.common;|figDesc|%model.graphicLike;|%model.global;|%model.divBottom;)*>
 <!ATTLIST figure xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST figure
  %Tatt.global.attributes;
  %Tatt.placement.attributes;
  %Tatt.typed.attributes;
- %Tatt.written.attributes; >
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(file description) contains a full bibliographic description of an electronic file. [2.2. The File Description 2.1.1. The TEI Header and Its Components] -->
 <!ELEMENT fileDesc (((titleStmt,(editionStmt)?,(extent)?,publicationStmt,(seriesStmt)*,(notesStmt)?),(sourceDesc)+))>
 <!ATTLIST fileDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1954,8 +1999,9 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST floatingText
  %Tatt.global.attributes;
  %Tatt.declaring.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(floruit) contains information about a person's period of activity. [13.3.2.1. Personal Characteristics] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(floruit) contains information about a person's period of activity. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT floruit %macro.phraseSeq;>
 <!ATTLIST floruit xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST floruit
@@ -1968,20 +2014,23 @@ calendar CDATA  #IMPLIED >
 <!ELEMENT foreign %macro.phraseSeq;>
 <!ATTLIST foreign xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST foreign
- %Tatt.global.attributes; >
-<!--doc:(forename) contains a forename, given or baptismal name. [13.2.1. Personal Names] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(forename) contains a forename, given or baptismal name. [14.2.1. Personal Names] -->
 <!ELEMENT forename %macro.phraseSeq;>
 <!ATTLIST forename xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST forename
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(formula) contains a mathematical or other formula. [14.2. Formulæ and Mathematical Expressions] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(formula) contains a mathematical or other formula. [15.2. Formulæ and Mathematical Expressions] -->
 <!ELEMENT formula (#PCDATA|%model.graphicLike;|%model.hiLike;)*>
 <!ATTLIST formula xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST formula
  %Tatt.global.attributes;
- %Tatt.notated.attributes; >
+ %Tatt.notated.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(front matter) contains any prefatory matter (headers, abstracts, title page, prefaces, dedications, etc.) found at the start of a document, before the main body. [4.6. Title Pages 4. Default Text Structure] -->
 <!ELEMENT front (((%model.frontPart;|%model.pLike;|%model.pLike.front;|%model.global;)*,((((_DUMMY_model.div1Like),(_DUMMY_model.div1Like|%model.frontPart;|%model.global;)*)|((%model.divLike;),(%model.divLike;|%model.frontPart;|%model.global;)*)),((%model.divBottom;),(%model.divBottom;|%model.global;)*)?)?))>
 <!ATTLIST front xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -1996,7 +2045,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.canonical.attributes;
  %Tatt.datable.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(forme work) contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page. [11.6. Headers, Footers, and Similar Matter] -->
+<!--doc:(forme work) contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page. [12.6. Headers, Footers, and Similar Matter] -->
 <!ELEMENT fw %macro.phraseSeq;>
 <!ATTLIST fw xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST fw
@@ -2013,6 +2062,7 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.timed.attributes;
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 reason NMTOKENS  #IMPLIED
 agent %teidata.enumerated;  #IMPLIED >
 <!--doc:(gathering beginning) marks the beginning of a new gathering or quire in a transcribed codex. [3.11.3. Milestone
@@ -2024,15 +2074,17 @@ Elements] -->
  %Tatt.typed.attributes;
  %Tatt.spanning.attributes;
  %Tatt.breaking.attributes;
- %Tatt.edition.attributes; >
-<!--doc:(generational name component) contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. [13.2.1. Personal Names] -->
+ %Tatt.edition.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(generational name component) contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. [14.2.1. Personal Names] -->
 <!ELEMENT genName %macro.phraseSeq;>
 <!ATTLIST genName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST genName
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(gender) specifies the gender identity of a person, persona, or character. [13.3.2.1. Personal Characteristics] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(gender) specifies the gender identity of a person, persona, or character. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT gender %macro.phraseSeq;>
 <!ATTLIST gender xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST gender
@@ -2042,12 +2094,13 @@ Elements] -->
  %Tatt.typed.attributes;
 calendar CDATA  #IMPLIED
 value CDATA  #IMPLIED >
-<!--doc:(geographical coordinates) contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation. [13.3.4.1. Varieties of Location] -->
+<!--doc:(geographical coordinates) contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation. [14.3.4.1. Varieties of Location] -->
 <!ELEMENT geo (#PCDATA)>
 <!ATTLIST geo xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST geo
  %Tatt.global.attributes;
- %Tatt.declaring.attributes; >
+ %Tatt.declaring.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the geo element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration] -->
 <!ELEMENT geoDecl %macro.phraseSeq;>
 <!ATTLIST geoDecl xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2055,7 +2108,7 @@ value CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.declarable.attributes;
 datum %teidata.enumerated;  "WGS84"  >
-<!--doc:(geographical feature name) contains a common noun identifying some geographical feature contained within a geographic name, such as valley, mount, etc. [13.2.3. Place Names] -->
+<!--doc:(geographical feature name) contains a common noun identifying some geographical feature contained within a geographic name, such as valley, mount, etc. [14.2.3. Place Names] -->
 <!ELEMENT geogFeat %macro.phraseSeq;>
 <!ATTLIST geogFeat xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST geogFeat
@@ -2065,8 +2118,9 @@ datum %teidata.enumerated;  "WGS84"  >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(geographical name) identifies a name associated with some geographical feature such as Windrush Valley or Mount Sinai. [13.2.3. Place Names] -->
+<!--doc:(geographical name) identifies a name associated with some geographical feature such as Windrush Valley or Mount Sinai. [14.2.3. Place Names] -->
 <!ELEMENT geogName %macro.phraseSeq;>
 <!ATTLIST geogName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST geogName
@@ -2075,8 +2129,9 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components] -->
+<!--doc:(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components] -->
 <!ELEMENT gloss %macro.phraseSeq;>
 <!ATTLIST gloss xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST gloss
@@ -2084,8 +2139,9 @@ calendar CDATA  #IMPLIED >
  %Tatt.declaring.attributes;
  %Tatt.typed.attributes;
  %Tatt.pointing.attributes;
- %Tatt.cReferencing.attributes; >
-<!--doc:(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles] -->
+ %Tatt.cReferencing.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles] -->
 <!ELEMENT graphic (%model.descLike;)*>
 <!ATTLIST graphic xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST graphic
@@ -2093,26 +2149,27 @@ calendar CDATA  #IMPLIED >
  %Tatt.media.attributes;
  %Tatt.resourced.attributes;
  %Tatt.declaring.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text] -->
 <!ELEMENT group (((%model.divTop;|%model.global;)*,((text|group),(text|group|%model.global;)*),(%model.divBottom;)*))>
 <!ATTLIST group xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST group
  %Tatt.global.attributes;
  %Tatt.declaring.attributes;
  %Tatt.typed.attributes; >
-<!--doc:(note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing, Decoration, and Other Notations] -->
+<!--doc:(note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing, Decoration, and Other Notations] -->
 <!ELEMENT handNote %macro.specialPara;>
 <!ATTLIST handNote xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST handNote
  %Tatt.global.attributes;
  %Tatt.handFeatures.attributes; >
-<!--doc:contains one or more handNote elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands] -->
+<!--doc:contains one or more handNote elements documenting the different hands identified within the source texts. [12.3.2.1. Document Hands] -->
 <!ELEMENT handNotes (handNote)+>
 <!ATTLIST handNotes xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST handNotes
  %Tatt.global.attributes; >
-<!--doc:(handwriting shift) marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint. [11.3.2.1. Document Hands] -->
+<!--doc:(handwriting shift) marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint. [12.3.2.1. Document Hands] -->
 <!ELEMENT handShift  EMPTY>
 <!ATTLIST handShift xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST handShift
@@ -2126,7 +2183,8 @@ new %teidata.pointer;  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.placement.attributes;
- %Tatt.written.attributes; >
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(heading for list items) contains the heading for the item or gloss column in a glossary list or similar structured list. [3.8. Lists] -->
 <!ELEMENT headItem %macro.phraseSeq;>
 <!ATTLIST headItem xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2142,15 +2200,16 @@ new %teidata.pointer;  #IMPLIED >
 <!ATTLIST hi xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST hi
  %Tatt.global.attributes;
- %Tatt.written.attributes; >
-<!--doc:(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements] -->
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements] -->
 <!ELEMENT hyphenation (%model.pLike;)+>
 <!ATTLIST hyphenation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST hyphenation
  %Tatt.global.attributes;
  %Tatt.declarable.attributes;
 eol (all|some|hard|none) "some"  >
-<!--doc:(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information] -->
+<!--doc:(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information] -->
 <!ELEMENT idno (#PCDATA|_DUMMY_model.gLike|idno)*>
 <!ATTLIST idno xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST idno
@@ -2158,6 +2217,7 @@ eol (all|some|hard|none) "some"  >
  %Tatt.sortable.attributes;
  %Tatt.datable.attributes;
  %Tatt.typed.attribute.subtype;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED >
 <!--doc:(imprimatur) contains a formal statement authorizing the publication of a work, sometimes required to appear on a title page or its verso. [4.6. Title Pages] -->
@@ -2176,6 +2236,7 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST index
  %Tatt.global.attributes;
  %Tatt.spanning.attributes;
+ %Tatt.cmc.attributes;
 indexName %teidata.name;  #IMPLIED >
 <!--doc:(interpretation) describes the scope of any analytic or interpretive information added to the text in addition to the transcription. [2.3.3. The Editorial Practices Declaration] -->
 <!ELEMENT interpretation (%model.pLike;)+>
@@ -2189,21 +2250,23 @@ indexName %teidata.name;  #IMPLIED >
 <!ATTLIST item
  %Tatt.global.attributes;
  %Tatt.sortable.attributes; >
-<!--doc:(join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation] -->
+<!--doc:(join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation] -->
 <!ELEMENT join (%model.descLike;|_DUMMY_model.certLike)*>
 <!ATTLIST join xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST join
  %Tatt.global.attributes;
  %Tatt.pointing.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 result %teidata.name;  #IMPLIED
 scope (root|branches) "root"  >
-<!--doc:(join group) groups a collection of join elements and possibly pointers. [16.7. Aggregation] -->
+<!--doc:(join group) groups a collection of join elements and possibly pointers. [17.7. Aggregation] -->
 <!ELEMENT joinGrp (((equiv|gloss|%model.descLike;)*,(join|ptr)+))>
 <!ATTLIST joinGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST joinGrp
  %Tatt.global.attributes;
  %Tatt.pointing.group.attributes;
+ %Tatt.cmc.attributes;
 result %teidata.name;  #IMPLIED >
 <!--doc:(keywords) contains a list of keywords or phrases identifying the topic or nature of a text. [2.4.3. The Text Classification] -->
 <!ELEMENT keywords ((term)+|list)>
@@ -2216,7 +2279,8 @@ scheme %teidata.pointer;  #IMPLIED >
 <!ATTLIST l xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST l
  %Tatt.global.attributes;
- %Tatt.fragmentable.attributes; >
+ %Tatt.fragmentable.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(label) contains any label or heading used to identify part of a text, typically but not exclusively in a list or glossary. [3.8. Lists] -->
 <!ELEMENT label %macro.phraseSeq;>
 <!ATTLIST label xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2224,8 +2288,9 @@ scheme %teidata.pointer;  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.placement.attributes;
- %Tatt.written.attributes; >
-<!--doc:(language knowledge) summarizes the state of a person's linguistic knowledge, either as prose or by a list of langKnown elements. [13.3.2.1. Personal Characteristics] -->
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(language knowledge) summarizes the state of a person's linguistic knowledge, either as prose or by a list of langKnown elements. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT langKnowledge (((precision)*,(%model.pLike;|(langKnown)+)))>
 <!ATTLIST langKnowledge xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST langKnowledge
@@ -2236,7 +2301,7 @@ scheme %teidata.pointer;  #IMPLIED >
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED
 tags CDATA  #IMPLIED >
-<!--doc:(language known) summarizes the state of a person's linguistic competence, i.e., knowledge of a single language. [15.2.2. The Participant Description] -->
+<!--doc:(language known) summarizes the state of a person's linguistic competence, i.e., knowledge of a single language. [16.2.2. The Participant Description] -->
 <!ELEMENT langKnown %macro.phraseSeq.limited;>
 <!ATTLIST langKnown xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST langKnown
@@ -2246,7 +2311,7 @@ tags CDATA  #IMPLIED >
 calendar CDATA  #IMPLIED
 tag %teidata.language;  #REQUIRED
 level %teidata.word;  #IMPLIED >
-<!--doc:(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements] -->
+<!--doc:(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements] -->
 <!ELEMENT langUsage ((%model.pLike;)+|(language)+)>
 <!ATTLIST langUsage xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST langUsage
@@ -2268,7 +2333,8 @@ Elements 7.2.5. Speech Contents] -->
  %Tatt.typed.attributes;
  %Tatt.edition.attributes;
  %Tatt.spanning.attributes;
- %Tatt.breaking.attributes; >
+ %Tatt.breaking.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(line group) contains one or more verse lines functioning as a formal unit, e.g. a stanza, refrain, verse paragraph, etc. [3.13.1. Core Tags for Verse 3.13. Passages of Verse or Drama 7.2.5. Speech Contents] -->
 <!ELEMENT lg (((%model.divTop;|%model.global;)*,(%model.lLike;|%model.stageLike;|%model.labelLike;|%model.pPart.transcriptional;|lg),(%model.lLike;|%model.stageLike;|%model.labelLike;|%model.pPart.transcriptional;|%model.global;|lg)*,((%model.divBottom;),(%model.global;)*)*))>
 <!ATTLIST lg xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2276,7 +2342,8 @@ Elements 7.2.5. Speech Contents] -->
  %Tatt.global.attributes;
  %Tatt.divLike.attributes;
  %Tatt.typed.attributes;
- %Tatt.declaring.attributes; >
+ %Tatt.declaring.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:contains information about a licence or other legal agreement applicable to the text. [2.2.4. Publication, Distribution, Licensing, etc.] -->
 <!ELEMENT licence %macro.specialPara;>
 <!ATTLIST licence xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2285,7 +2352,7 @@ Elements 7.2.5. Speech Contents] -->
  %Tatt.pointing.attributes;
  %Tatt.datable.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:contains the transcription of a topographic line in the source document [11.2.2. Embedded Transcription] -->
+<!--doc:contains the transcription of a topographic line in the source document [12.2.2. Embedded Transcription] -->
 <!ELEMENT line (#PCDATA|%model.global;|_DUMMY_model.gLike|%model.linePart;)*>
 <!ATTLIST line xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST line
@@ -2293,19 +2360,21 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.coordinated.attributes;
  %Tatt.written.attributes; >
-<!--doc:(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links] -->
+<!--doc:(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links] -->
 <!ELEMENT link  EMPTY>
 <!ATTLIST link xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST link
  %Tatt.global.attributes;
  %Tatt.pointing.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(link group) defines a collection of associations or hypertextual links. [16.1. Links] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(link group) defines a collection of associations or hypertextual links. [17.1. Links] -->
 <!ELEMENT linkGrp (((%model.descLike;)*,(link|ptr)+))>
 <!ATTLIST linkGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST linkGrp
  %Tatt.global.attributes;
- %Tatt.pointing.group.attributes; >
+ %Tatt.pointing.group.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(list) contains any sequence of items organized as a list. [3.8. Lists] -->
 <!ELEMENT list (((%model.divTop;|%model.global;|(desc)*)*,((item,(%model.global;)*)+|((headLabel)?,(headItem)?,(label,(%model.global;)*,item,(%model.global;)*)+)),((%model.divBottom;),(%model.global;)*)*))>
 <!ATTLIST list xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2313,8 +2382,9 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.sortable.attributes;
  %Tatt.typed.attribute.subtype;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED >
-<!--doc:contains a list of annotations, typically encoded as annotation, annotationBlock, or note, possibly organized with nested listAnnotation elements. [16.10. The standOff Container] -->
+<!--doc:contains a list of annotations, typically encoded as annotation, annotationBlock, or note, possibly organized with nested listAnnotation elements. [17.10. The standOff Container] -->
 <!ELEMENT listAnnotation (((%model.headLike;)*,(%model.labelLike;)*,(%model.annotationLike;|listAnnotation)+))>
 <!ATTLIST listAnnotation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listAnnotation
@@ -2322,15 +2392,16 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.notated.attributes;
  %Tatt.declaring.attributes; >
-<!--doc:(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements] -->
+<!--doc:(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements] -->
 <!ELEMENT listBibl (((%model.headLike;)*,(desc)*,(%model.milestoneLike;|relation|listRelation)*,((%model.biblLike;)+,(%model.milestoneLike;|relation|listRelation)*)+))>
 <!ATTLIST listBibl xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listBibl
  %Tatt.global.attributes;
  %Tatt.sortable.attributes;
  %Tatt.declarable.attributes;
- %Tatt.typed.attributes; >
-<!--doc:groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions] -->
 <!ELEMENT listChange (((desc)*,(listChange|change)+))>
 <!ATTLIST listChange xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listChange
@@ -2338,72 +2409,79 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.sortable.attributes;
  %Tatt.typed.attributes;
 ordered %teidata.truthValue;  "true"  >
-<!--doc:(list of events) contains a list of descriptions, each of which provides information about an identifiable event. [13.3.1. Basic Principles] -->
+<!--doc:(list of events) contains a list of descriptions, each of which provides information about an identifiable event. [14.3.1. Basic Principles] -->
 <!ELEMENT listEvent (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((%model.eventLike;)+,(relation|listRelation)*)+))>
 <!ATTLIST listEvent xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listEvent
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declarable.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:(list of canonical names) contains a list of nyms, that is, standardized names for any thing. [13.3.7. Names and Nyms] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(list of canonical names) contains a list of nyms, that is, standardized names for any thing. [14.3.7. Names and Nyms] -->
 <!ELEMENT listNym (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((nym|listNym)+,(relation|listRelation)*)+))>
 <!ATTLIST listNym xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listNym
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declarable.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:(list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [13.3.6. Objects] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [14.3.6. Objects] -->
 <!ELEMENT listObject (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((%model.objectLike;)+,(relation|listRelation)*)+))>
 <!ATTLIST listObject xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listObject
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declarable.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:(list of organizations) contains a list of elements, each of which provides information about an identifiable organization. [13.2.2. Organizational Names] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(list of organizations) contains a list of elements, each of which provides information about an identifiable organization. [14.2.2. Organizational Names] -->
 <!ELEMENT listOrg (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((org|listOrg)+,(relation|listRelation)*)+))>
 <!ATTLIST listOrg xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listOrg
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declarable.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:(list of persons) contains a list of descriptions, each of which provides information about an identifiable person or a group of people, for example the participants in a language interaction, or the people referred to in a historical source. [13.3.2. The Person Element 15.2. Contextual Information 2.4. The Profile Description 15.3.2. Declarable Elements] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(list of persons) contains a list of descriptions, each of which provides information about an identifiable person or a group of people, for example the participants in a language interaction, or the people referred to in a historical source. [14.3.2. The Person Element 16.2. Contextual Information 2.4. The Profile Description 16.3.2. Declarable Elements] -->
 <!ELEMENT listPerson (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((%model.personLike;|listPerson)+,(relation|listRelation)*)+))>
 <!ATTLIST listPerson xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listPerson
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declarable.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:(list of places) contains a list of places, optionally followed by a list of relationships (other than containment) defined amongst them. [2.2.7. The Source Description 13.3.4. Places] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(list of places) contains a list of places, optionally followed by a list of relationships (other than containment) defined amongst them. [2.2.7. The Source Description 14.3.4. Places] -->
 <!ELEMENT listPlace (((%model.headLike;)*,(desc)*,(relation|listRelation)*,((%model.placeLike;|listPlace)+,(relation|listRelation)*)+))>
 <!ATTLIST listPlace xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listPlace
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declarable.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers] -->
 <!ELEMENT listPrefixDef (((desc)*,(prefixDef|listPrefixDef)+))>
 <!ATTLIST listPrefixDef xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listPrefixDef
  %Tatt.global.attributes; >
-<!--doc:provides information about relationships identified amongst people, places, and organizations, either informally as prose or as formally expressed relation links. [13.3.2.3. Personal Relationships] -->
+<!--doc:provides information about relationships identified amongst people, places, and organizations, either informally as prose or as formally expressed relation links. [14.3.2.3. Personal Relationships] -->
 <!ELEMENT listRelation (((%model.headLike;)*,(desc)*,(%model.pLike;|(relation|listRelation)+)))>
 <!ATTLIST listRelation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listRelation
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
- %Tatt.sortable.attributes; >
-<!--doc:supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [11.3.4.5. Transpositions] -->
+ %Tatt.sortable.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [12.3.4.5. Transpositions] -->
 <!ELEMENT listTranspose (((desc)*,(transpose)+))>
 <!ATTLIST listTranspose xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST listTranspose
  %Tatt.global.attributes; >
-<!--doc:(location) defines the location of a place as a set of geographical coordinates, in terms of other named geo-political entities, or as an address. [13.3.4. Places] -->
+<!--doc:(location) defines the location of a place as a set of geographical coordinates, in terms of other named geo-political entities, or as an address. [14.3.4. Places] -->
 <!ELEMENT location (precision|%model.labelLike;|%model.placeNamePart;|%model.offsetLike;|%model.measureLike;|%model.addressLike;|%model.noteLike;|%model.biblLike;)*>
 <!ATTLIST location xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST location
@@ -2411,6 +2489,7 @@ ordered %teidata.truthValue;  "true"  >
  %Tatt.typed.attributes;
  %Tatt.datable.attributes;
  %Tatt.editLike.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(measure) contains a word or phrase referring to some quantity of an object or commodity, usually comprising a number, a unit, and a commodity name. [3.6.3. Numbers and
 Measures] -->
@@ -2420,15 +2499,17 @@ Measures] -->
  %Tatt.global.attributes;
  %Tatt.typed.attribute.subtype;
  %Tatt.measurement.attributes;
+ %Tatt.cmc.attributes;
  %Tatt.ranging.attributes;
 type %teidata.enumerated;  #IMPLIED >
-<!--doc:(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions] -->
+<!--doc:(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions] -->
 <!ELEMENT measureGrp (#PCDATA|_DUMMY_model.gLike|%model.measureLike;)*>
 <!ATTLIST measureGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST measureGrp
  %Tatt.global.attributes;
  %Tatt.measurement.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:indicates the location of any form of external media such as an audio or video clip etc. [3.10. Graphics and Other Non-textual Components] -->
 <!ELEMENT media (%model.descLike;)*>
 <!ATTLIST media xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2441,6 +2522,7 @@ type %teidata.enumerated;  #IMPLIED >
  %Tatt.resourced.attributes;
  %Tatt.declaring.attributes;
  %Tatt.timed.attributes;
+ %Tatt.cmc.attributes;
 mimeType CDATA  #REQUIRED >
 <!--doc:contains the formalized descriptive title for a meeting or conference, for use in a bibliographic description for an item derived from such a meeting, or as a heading or preamble to publications emanating from it. [3.12.2.2. Titles, Authors, and Editors] -->
 <!ELEMENT meeting %macro.limitedContent;>
@@ -2449,13 +2531,15 @@ mimeType CDATA  #REQUIRED >
  %Tatt.global.attributes;
  %Tatt.datable.attributes;
  %Tatt.canonical.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:marks words or phrases mentioned, not used. [3.3.3. Quotation] -->
 <!ELEMENT mentioned %macro.phraseSeq;>
 <!ATTLIST mentioned xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST mentioned
- %Tatt.global.attributes; >
-<!--doc:contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [11.3.4.2. Metamarks] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [12.3.4.2. Metamarks] -->
 <!ELEMENT metamark %macro.specialPara;>
 <!ATTLIST metamark xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST metamark
@@ -2474,8 +2558,9 @@ Elements] -->
  %Tatt.typed.attributes;
  %Tatt.edition.attributes;
  %Tatt.spanning.attributes;
- %Tatt.breaking.attributes; >
-<!--doc:represents any kind of modification identified within a single document. [11.3.4.1. Generic Modification] -->
+ %Tatt.breaking.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:represents any kind of modification identified within a single document. [12.3.4.1. Generic Modification] -->
 <!ELEMENT mod %macro.paraContent;>
 <!ATTLIST mod xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST mod
@@ -2498,20 +2583,22 @@ Elements] -->
  %Tatt.datable.attributes;
  %Tatt.editLike.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(name link) contains a connecting phrase or link used within a name but not regarded as part of it, such as van der or of. [13.2.1. Personal Names] -->
+<!--doc:(name link) contains a connecting phrase or link used within a name but not regarded as part of it, such as van der or of. [14.2.1. Personal Names] -->
 <!ELEMENT nameLink %macro.phraseSeq;>
 <!ATTLIST nameLink xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST nameLink
  %Tatt.global.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(namespace) supplies the formal name of the namespace to which the elements documented by its children belong. [2.3.4. The Tagging Declaration] -->
 <!ELEMENT namespace (tagUsage)+>
 <!ATTLIST namespace xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST namespace
  %Tatt.global.attributes;
 name CDATA  #REQUIRED >
-<!--doc:(nationality) contains an informal description of a person's present or past nationality or citizenship. [15.2.2. The Participant Description] -->
+<!--doc:(nationality) contains an informal description of a person's present or past nationality or citizenship. [16.2.2. The Participant Description] -->
 <!ELEMENT nationality %macro.phraseSeq;>
 <!ATTLIST nationality xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST nationality
@@ -2522,21 +2609,22 @@ name CDATA  #REQUIRED >
  %Tatt.typed.attribute.subtype;
 type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED >
-<!--doc:(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements] -->
+<!--doc:(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements] -->
 <!ELEMENT normalization (%model.pLike;)+>
 <!ATTLIST normalization xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST normalization
  %Tatt.global.attributes;
  %Tatt.declarable.attributes;
 method (silent|markup) "silent"  >
-<!--doc:encodes the presence of music notation in a text [14.3. Notated Music in Written Text] -->
+<!--doc:encodes the presence of music notation in a text [15.3. Notated Music in Written Text] -->
 <!ELEMENT notatedMusic (%model.labelLike;|%model.ptrLike;|graphic|binaryObject|seg)*>
 <!ATTLIST notatedMusic xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST notatedMusic
  %Tatt.global.attributes;
  %Tatt.placement.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries] -->
 <!ELEMENT note %macro.specialPara;>
 <!ATTLIST note xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST note
@@ -2545,7 +2633,8 @@ method (silent|markup) "silent"  >
  %Tatt.pointing.attributes;
  %Tatt.typed.attributes;
  %Tatt.written.attributes;
- %Tatt.anchoring.attributes; >
+ %Tatt.anchoring.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(note group) contains a group of notes [3.9.1.1. Encoding Grouped Notes] -->
 <!ELEMENT noteGrp (((desc)*,(note|noteGrp)+))>
 <!ATTLIST noteGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2555,7 +2644,8 @@ method (silent|markup) "silent"  >
  %Tatt.pointing.attributes;
  %Tatt.typed.attributes;
  %Tatt.written.attributes;
- %Tatt.anchoring.attributes; >
+ %Tatt.anchoring.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(notes statement) collects together any notes providing information about a text additional to that recorded in other parts of the bibliographic description. [2.2.6. The Notes Statement 2.2. The File Description] -->
 <!ELEMENT notesStmt (%model.noteLike;|relatedItem)+>
 <!ATTLIST notesStmt xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2569,9 +2659,10 @@ Measures] -->
  %Tatt.global.attributes;
  %Tatt.typed.attribute.subtype;
  %Tatt.ranging.attributes;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED
 value %teidata.numeric;  #IMPLIED >
-<!--doc:(canonical name) contains the definition for a canonical name or name component of any kind. [13.3.7. Names and Nyms] -->
+<!--doc:(canonical name) contains the definition for a canonical name or name component of any kind. [14.3.7. Names and Nyms] -->
 <!ELEMENT nym (((idno)*,(_DUMMY_model.entryPart)*,(%model.pLike;)*,(nym)*))>
 <!ATTLIST nym xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST nym
@@ -2579,7 +2670,7 @@ value %teidata.numeric;  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.sortable.attributes;
 parts CDATA  #IMPLIED >
-<!--doc:contains a description of a single identifiable physical object. [13.3.6. Objects] -->
+<!--doc:contains a description of a single identifiable physical object. [14.3.6. Objects] -->
 <!ELEMENT object (((objectIdentifier)+,(%model.headLike;)*,((%model.pLike;)+|(msContents|physDesc|history|additional)*),(%model.noteLike;|%model.biblLike;|linkGrp|link)*,(object)*))>
 <!ATTLIST object xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST object
@@ -2589,12 +2680,12 @@ parts CDATA  #IMPLIED >
  %Tatt.declaring.attributes;
  %Tatt.docStatus.attributes;
  %Tatt.canonical.attributes; >
-<!--doc:(object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [13.3.6. Objects] -->
+<!--doc:(object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [14.3.6. Objects] -->
 <!ELEMENT objectIdentifier (%model.placeNamePart;|institution|repository|collection|idno|msName|objectName|altIdentifier|address)+>
 <!ATTLIST objectIdentifier xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST objectIdentifier
  %Tatt.global.attributes; >
-<!--doc:(name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names] -->
+<!--doc:(name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names] -->
 <!ELEMENT objectName %macro.phraseSeq;>
 <!ATTLIST objectName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST objectName
@@ -2603,8 +2694,9 @@ parts CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(occupation) contains an informal description of a person's trade, profession or occupation. [15.2.2. The Participant Description] -->
+<!--doc:(occupation) contains an informal description of a person's trade, profession or occupation. [16.2.2. The Participant Description] -->
 <!ELEMENT occupation %macro.specialPara;>
 <!ATTLIST occupation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST occupation
@@ -2617,7 +2709,7 @@ type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED
 scheme %teidata.pointer;  #IMPLIED
 code %teidata.pointer;  #IMPLIED >
-<!--doc:(offset) marks that part of a relative temporal or spatial expression which indicates the direction of the offset between the two place names, dates, or times involved in the expression. [13.2.3. Place Names] -->
+<!--doc:(offset) marks that part of a relative temporal or spatial expression which indicates the direction of the offset between the two place names, dates, or times involved in the expression. [14.2.3. Place Names] -->
 <!ELEMENT offset %macro.phraseSeq;>
 <!ATTLIST offset xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST offset
@@ -2627,14 +2719,16 @@ code %teidata.pointer;  #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(opener) groups together dateline, byline, salutation, and similar phrases appearing as a preliminary group at the start of a division, especially of a letter. [4.2. Elements Common to All Divisions] -->
 <!ELEMENT opener (#PCDATA|_DUMMY_model.gLike|%model.phrase;|argument|byline|dateline|epigraph|salute|signed|%model.global;)*>
 <!ATTLIST opener xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST opener
  %Tatt.global.attributes;
- %Tatt.written.attributes; >
-<!--doc:(organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [13.3.3. Organizational Data] -->
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [14.3.3. Organizational Data] -->
 <!ELEMENT org (((%model.headLike;)*,((%model.pLike;)*|(%model.labelLike;|%model.nameLike;|%model.placeLike;|%model.orgPart;|%model.milestoneLike;)*),(%model.noteLike;|%model.biblLike;|linkGrp|link|ptr)*,(%model.personLike;)*))>
 <!ATTLIST org xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST org
@@ -2643,7 +2737,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.sortable.attributes;
 role NMTOKENS  #IMPLIED >
-<!--doc:(organization name) contains an organizational name. [13.2.2. Organizational Names] -->
+<!--doc:(organization name) contains an organizational name. [14.2.2. Organizational Names] -->
 <!ELEMENT orgName %macro.phraseSeq;>
 <!ATTLIST orgName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST orgName
@@ -2652,19 +2746,21 @@ role NMTOKENS  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.personal.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus] -->
+Normalization 13. Critical Apparatus] -->
 <!ELEMENT orig %macro.paraContent;>
 <!ATTLIST orig xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST orig
- %Tatt.global.attributes; >
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents] -->
 <!ELEMENT p %macro.paraContent;>
 <!ATTLIST p xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST p
  %Tatt.global.attribute.xmlid; >
-<!--doc:(path) defines any line passing through two or more points within a surface element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] -->
+<!--doc:(path) defines any line passing through two or more points within a surface element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription] -->
 <!ELEMENT path  EMPTY>
 <!ATTLIST path xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST path
@@ -2686,8 +2782,9 @@ Elements] -->
  %Tatt.typed.attributes;
  %Tatt.edition.attributes;
  %Tatt.spanning.attributes;
- %Tatt.breaking.attributes; >
-<!--doc:(personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [13.2.1. Personal Names] -->
+ %Tatt.breaking.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [14.2.1. Personal Names] -->
 <!ELEMENT persName %macro.phraseSeq;>
 <!ATTLIST persName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST persName
@@ -2696,18 +2793,20 @@ Elements] -->
  %Tatt.editLike.attributes;
  %Tatt.personal.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [13.3.2.1. Personal Characteristics] -->
+<!--doc:(personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT persPronouns %macro.phraseSeq;>
 <!ATTLIST persPronouns xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST persPronouns
  %Tatt.global.attributes;
  %Tatt.datable.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 evidence %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED
 value NMTOKENS  #IMPLIED >
-<!--doc:(person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [13.3.2. The Person Element 15.2.2. The Participant Description] -->
+<!--doc:(person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [14.3.2. The Person Element 16.2.2. The Participant Description] -->
 <!ELEMENT person ((%model.pLike;)+|(%model.personPart;|%model.global;|ptr)*)>
 <!ATTLIST person xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST person
@@ -2718,7 +2817,7 @@ role NMTOKENS  #IMPLIED
 sex CDATA  #IMPLIED
 gender CDATA  #IMPLIED
 age %teidata.enumerated;  #IMPLIED >
-<!--doc:(personal group) describes a group of individuals treated as a single person for analytic purposes. [15.2.2. The Participant Description] -->
+<!--doc:(personal group) describes a group of individuals treated as a single person for analytic purposes. [16.2.2. The Participant Description] -->
 <!ELEMENT personGrp ((%model.pLike;)+|(%model.personPart;|%model.global;)*)>
 <!ATTLIST personGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST personGrp
@@ -2729,7 +2828,7 @@ sex CDATA  #IMPLIED
 gender CDATA  #IMPLIED
 age %teidata.enumerated;  #IMPLIED
 size CDATA  #IMPLIED >
-<!--doc:provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [13.3.2. The Person Element] -->
+<!--doc:provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [14.3.2. The Person Element] -->
 <!ELEMENT persona ((%model.pLike;)+|(%model.personPart;|%model.global;)*)>
 <!ATTLIST persona xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST persona
@@ -2740,7 +2839,7 @@ role NMTOKENS  #IMPLIED
 sex CDATA  #IMPLIED
 gender CDATA  #IMPLIED
 age %teidata.enumerated;  #IMPLIED >
-<!--doc:(place) contains data about a geographic location [13.3.4. Places] -->
+<!--doc:(place) contains data about a geographic location [14.3.4. Places] -->
 <!ELEMENT place (((%model.headLike;)*,((%model.pLike;)*|(%model.labelLike;|%model.placeStateLike;|%model.eventLike;|name)*),(%model.noteLike;|%model.biblLike;|idno|ptr|linkGrp|link)*,(%model.placeLike;|listPlace)*))>
 <!ATTLIST place xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST place
@@ -2748,7 +2847,7 @@ age %teidata.enumerated;  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.editLike.attributes;
  %Tatt.sortable.attributes; >
-<!--doc:(place name) contains an absolute or relative place name. [13.2.3. Place Names] -->
+<!--doc:(place name) contains an absolute or relative place name. [14.2.3. Place Names] -->
 <!ELEMENT placeName %macro.phraseSeq;>
 <!ATTLIST placeName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST placeName
@@ -2757,13 +2856,14 @@ age %teidata.enumerated;  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc: -->
 <!ELEMENT platypus  EMPTY>
 <!ATTLIST platypus xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST platypus
 bill CDATA #IMPLIED >
-<!--doc:(population) contains information about the population of a place. [13.3.4.3. States, Traits, and Events] -->
+<!--doc:(population) contains information about the population of a place. [14.3.4.3. States, Traits, and Events] -->
 <!ELEMENT population (((precision)*,(%model.headLike;)*,(((%model.pLike;)+|(%model.labelLike;)+),(%model.noteLike;|%model.biblLike;)*)?,(population)*))>
 <!ATTLIST population xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST population
@@ -2773,6 +2873,7 @@ bill CDATA #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:(postal box or post office box) contains a number or other identifier for some postal delivery point other than a street address. [3.6.2. Addresses] -->
 <!ELEMENT postBox (#PCDATA)>
@@ -2789,8 +2890,9 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST postscript xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST postscript
  %Tatt.global.attributes;
- %Tatt.written.attributes; >
-<!--doc:(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] -->
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers] -->
 <!ELEMENT prefixDef (%model.pLike;)*>
 <!ATTLIST prefixDef xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST prefixDef
@@ -2810,13 +2912,13 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST profileDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST profileDesc
  %Tatt.global.attributes; >
-<!--doc:(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements] -->
+<!--doc:(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements] -->
 <!ELEMENT projectDesc (%model.pLike;)+>
 <!ATTLIST projectDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST projectDesc
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
-<!--doc:(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links] -->
+<!--doc:(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links] -->
 <!ELEMENT ptr  EMPTY>
 <!ATTLIST ptr xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST ptr
@@ -2825,7 +2927,8 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.internetMedia.attributes;
  %Tatt.pointing.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(publication place) contains the name of the place where a bibliographic item was published. [3.12.2.4. Imprint, Size of a Document, and Reprint Information] -->
 <!ELEMENT pubPlace %macro.phraseSeq;>
 <!ATTLIST pubPlace xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2857,8 +2960,9 @@ placement (internal|external) #IMPLIED >
 <!ATTLIST q
  %Tatt.global.attributes;
  %Tatt.ascribed.directed.attributes;
+ %Tatt.cmc.attributes;
 type %teidata.enumerated;  #IMPLIED >
-<!--doc:(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements] -->
+<!--doc:(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements] -->
 <!ELEMENT quotation (%model.pLike;)*>
 <!ATTLIST quotation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST quotation
@@ -2871,14 +2975,15 @@ marks (none|some|all) #IMPLIED >
 <!ATTLIST quote
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
- %Tatt.notated.attributes; >
+ %Tatt.notated.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(ruby base) contains the base text annotated by a ruby gloss. [3.4.2. Ruby Annotations] -->
 <!ELEMENT rb %macro.phraseSeq;>
 <!ATTLIST rb xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST rb
  %Tatt.global.attributes;
  %Tatt.typed.attributes; >
-<!--doc:indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications] -->
+<!--doc:indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications] -->
 <!ELEMENT redo  EMPTY>
 <!ATTLIST redo xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST redo
@@ -2887,7 +2992,7 @@ marks (none|some|all) #IMPLIED >
  %Tatt.transcriptional.attributes;
  %Tatt.dimensions.attributes;
 target CDATA  #IMPLIED >
-<!--doc:(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links] -->
+<!--doc:(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links] -->
 <!ELEMENT ref %macro.paraContent;>
 <!ATTLIST ref xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST ref
@@ -2896,7 +3001,8 @@ target CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.internetMedia.attributes;
  %Tatt.pointing.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(reference state) specifies one component of a canonical reference defined by the milestone method. [2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] -->
 <!ELEMENT refState  EMPTY>
 <!ATTLIST refState xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -2913,14 +3019,15 @@ delim %teidata.text;  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
 <!--doc:(regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus] -->
+Normalization 13. Critical Apparatus] -->
 <!ELEMENT reg %macro.paraContent;>
 <!ATTLIST reg xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST reg
  %Tatt.global.attributes;
  %Tatt.editLike.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(region) contains the name of an administrative unit such as a state, province, or county, larger than a settlement, but smaller than a country. [13.2.3. Place Names] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(region) contains the name of an administrative unit such as a state, province, or county, larger than a settlement, but smaller than a country. [14.2.3. Place Names] -->
 <!ELEMENT region %macro.phraseSeq;>
 <!ATTLIST region xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST region
@@ -2928,6 +3035,7 @@ Normalization 12. Critical Apparatus] -->
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.datable.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
 <!--doc:contains or references some other bibliographic item which is related to the present one in some specified manner, for example as a constituent or alternative version of it. [3.12.2.7. Related Items] -->
 <!ELEMENT relatedItem (%model.biblLike;|%model.ptrLike;)?>
@@ -2936,7 +3044,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
 target %teidata.pointer;  #IMPLIED >
-<!--doc:(relationship) describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items. [13.3.2.3. Personal Relationships] -->
+<!--doc:(relationship) describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items. [14.3.2.3. Personal Relationships] -->
 <!ELEMENT relation (desc)?>
 <!ATTLIST relation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST relation
@@ -2959,7 +3067,7 @@ passive CDATA  #IMPLIED >
  %Tatt.styleDef.attributes;
 scope %teidata.enumerated;  #IMPLIED
 selector %teidata.text;  #IMPLIED >
-<!--doc:(residence) describes a person's present or past places of residence. [15.2.2. The Participant Description] -->
+<!--doc:(residence) describes a person's present or past places of residence. [16.2.2. The Participant Description] -->
 <!ELEMENT residence %macro.phraseSeq;>
 <!ATTLIST residence xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST residence
@@ -2984,7 +3092,7 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST respStmt
  %Tatt.global.attributes;
  %Tatt.canonical.attributes; >
-<!--doc:(restore) indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction. [11.3.1.6. Cancellation of Deletions and Other Markings] -->
+<!--doc:(restore) indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction. [12.3.1.6. Cancellation of Deletions and Other Markings] -->
 <!ELEMENT restore %macro.paraContent;>
 <!ATTLIST restore xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST restore
@@ -2992,7 +3100,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.transcriptional.attributes;
  %Tatt.typed.attributes;
  %Tatt.dimensions.attributes; >
-<!--doc:contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [11.3.4.3. Fixation and Clarification] -->
+<!--doc:contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [12.3.4.3. Fixation and Clarification] -->
 <!ELEMENT retrace %macro.paraContent;>
 <!ATTLIST retrace xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST retrace
@@ -3006,26 +3114,28 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST revisionDesc
  %Tatt.global.attributes;
  %Tatt.docStatus.attributes; >
-<!--doc:(role name) contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. [13.2.1. Personal Names] -->
+<!--doc:(role name) contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. [14.2.1. Personal Names] -->
 <!ELEMENT roleName %macro.phraseSeq;>
 <!ATTLIST roleName xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST roleName
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(row) contains one row of a table. [14.1.1. TEI Tables] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(row) contains one row of a table. [15.1.1. TEI Tables] -->
 <!ELEMENT row (cell)+>
 <!ATTLIST row xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST row
  %Tatt.global.attributes;
  %Tatt.tableDecoration.attributes; >
-<!--doc:(referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings] -->
+<!--doc:(referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings] -->
 <!ELEMENT rs %macro.phraseSeq;>
 <!ATTLIST rs xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST rs
  %Tatt.global.attributes;
  %Tatt.naming.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(ruby text) contains a ruby text, an annotation closely associated with a passage of the main text. [3.4.2. Ruby Annotations] -->
 <!ELEMENT rt %macro.phraseSeq;>
 <!ATTLIST rt xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -3042,13 +3152,15 @@ to %teidata.pointer;  #IMPLIED >
 <!ATTLIST ruby xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST ruby
  %Tatt.global.attributes;
- %Tatt.typed.attributes; >
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(speech or thought) indicates passages thought or spoken aloud, whether explicitly indicated in the source or not, whether directly or indirectly reported, whether by real people or fictional characters. [3.3.3. Quotation] -->
 <!ELEMENT said %macro.specialPara;>
 <!ATTLIST said xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST said
  %Tatt.global.attributes;
  %Tatt.ascribed.directed.attributes;
+ %Tatt.cmc.attributes;
 aloud %teidata.xTruthValue;  #IMPLIED
 direct %teidata.xTruthValue;  "true"  >
 <!--doc:(salutation) contains a salutation or greeting prefixed to a foreword, dedicatory epistle, or other division of a text, or the salutation in the closing of a letter, preface, etc. [4.2.2. Openers and Closers] -->
@@ -3056,8 +3168,9 @@ direct %teidata.xTruthValue;  "true"  >
 <!ATTLIST salute xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST salute
  %Tatt.global.attributes;
- %Tatt.written.attributes; >
-<!--doc:(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements] -->
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements] -->
 <!ELEMENT samplingDecl (%model.pLike;)+>
 <!ATTLIST samplingDecl xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST samplingDecl
@@ -3071,13 +3184,13 @@ direct %teidata.xTruthValue;  "true"  >
  %Tatt.typed.attributes;
  %Tatt.resourced.attributes;
 key %teidata.xmlName;  #IMPLIED >
-<!--doc:describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Writing, Decoration, and Other Notations] -->
+<!--doc:describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Writing, Decoration, and Other Notations] -->
 <!ELEMENT scriptNote %macro.specialPara;>
 <!ATTLIST scriptNote xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST scriptNote
  %Tatt.global.attributes;
  %Tatt.handFeatures.attributes; >
-<!--doc:(secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [11.3.1.7. Text Omitted from or Supplied in the Transcription] -->
+<!--doc:(secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [12.3.1.7. Text Omitted from or Supplied in the Transcription] -->
 <!ELEMENT secl %macro.paraContent;>
 <!ATTLIST secl xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST secl
@@ -3085,7 +3198,7 @@ key %teidata.xmlName;  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
 reason CDATA  #IMPLIED >
-<!--doc:(arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents] -->
+<!--doc:(arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents] -->
 <!ELEMENT seg %macro.paraContent;>
 <!ATTLIST seg xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST seg
@@ -3093,8 +3206,9 @@ reason CDATA  #IMPLIED >
  %Tatt.segLike.attributes;
  %Tatt.typed.attributes;
  %Tatt.written.attributes;
- %Tatt.notated.attributes; >
-<!--doc:(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements] -->
+ %Tatt.notated.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements] -->
 <!ELEMENT segmentation (%model.pLike;)+>
 <!ATTLIST segmentation xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST segmentation
@@ -3111,19 +3225,19 @@ reason CDATA  #IMPLIED >
 <!ATTLIST seriesStmt
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
-<!--doc:describes one particular setting in which a language interaction takes place. [15.2.3. The Setting Description] -->
+<!--doc:describes one particular setting in which a language interaction takes place. [16.2.3. The Setting Description] -->
 <!ELEMENT setting (persName|platypus|%model.dateLike;|%model.settingPart;)+>
 <!ATTLIST setting xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST setting
  %Tatt.global.attributes;
  %Tatt.ascribed.attributes; >
-<!--doc:(setting description) describes the setting or settings within which a language interaction takes place, or other places otherwise referred to in a text, edition, or metadata. [15.2. Contextual Information 2.4. The Profile Description] -->
+<!--doc:(setting description) describes the setting or settings within which a language interaction takes place, or other places otherwise referred to in a text, edition, or metadata. [16.2. Contextual Information 2.4. The Profile Description] -->
 <!ELEMENT settingDesc (place|setting)+>
 <!ATTLIST settingDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST settingDesc
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
-<!--doc:(settlement) contains the name of a settlement such as a city, town, or village identified as a single geo-political or administrative unit. [13.2.3. Place Names] -->
+<!--doc:(settlement) contains the name of a settlement such as a city, town, or village identified as a single geo-political or administrative unit. [14.2.3. Place Names] -->
 <!ELEMENT settlement %macro.phraseSeq;>
 <!ATTLIST settlement xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST settlement
@@ -3131,8 +3245,9 @@ reason CDATA  #IMPLIED >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.datable.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(sex) specifies the sex of an organism. [13.3.2.1. Personal Characteristics] -->
+<!--doc:(sex) specifies the sex of an organism. [14.3.2.1. Personal Characteristics] -->
 <!ELEMENT sex %macro.phraseSeq;>
 <!ATTLIST sex xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST sex
@@ -3146,19 +3261,22 @@ value CDATA  #IMPLIED >
 <!ELEMENT sic %macro.paraContent;>
 <!ATTLIST sic xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST sic
- %Tatt.global.attributes; >
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(signature) contains the closing salutation, etc., appended to a foreword, dedicatory epistle, or other division of a text. [4.2.2. Openers and Closers] -->
 <!ELEMENT signed %macro.paraContent;>
 <!ATTLIST signed xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST signed
  %Tatt.global.attributes;
- %Tatt.written.attributes; >
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation] -->
 <!ELEMENT soCalled %macro.phraseSeq;>
 <!ATTLIST soCalled xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST soCalled
- %Tatt.global.attributes; >
-<!--doc:(socio-economic status) contains an informal description of a person's perceived social or economic status. [15.2.2. The Participant Description] -->
+ %Tatt.global.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(socio-economic status) contains an informal description of a person's perceived social or economic status. [16.2.2. The Participant Description] -->
 <!ELEMENT socecStatus %macro.phraseSeq;>
 <!ATTLIST socecStatus xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST socecStatus
@@ -3171,13 +3289,13 @@ type %teidata.enumerated;  #IMPLIED
 calendar CDATA  #IMPLIED
 scheme %teidata.pointer;  #IMPLIED
 code %teidata.pointer;  #IMPLIED >
-<!--doc:(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description] -->
+<!--doc:(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description] -->
 <!ELEMENT sourceDesc ((%model.pLike;)+|(%model.biblLike;|_DUMMY_model.sourceDescPart|%model.listLike;)+)>
 <!ATTLIST sourceDesc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST sourceDesc
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
-<!--doc:contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] -->
+<!--doc:contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription] -->
 <!ELEMENT sourceDoc (%model.global;|%model.graphicLike;|surface|surfaceGrp)+>
 <!ATTLIST sourceDoc xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST sourceDoc
@@ -3189,7 +3307,7 @@ code %teidata.pointer;  #IMPLIED >
 <!ATTLIST sp
  %Tatt.global.attributes;
  %Tatt.ascribed.directed.attributes; >
-<!--doc:(space) indicates the location of a significant space in the text. [11.4.1. Space] -->
+<!--doc:(space) indicates the location of a significant space in the text. [12.4.1. Space] -->
 <!ELEMENT space (%model.descLike;|_DUMMY_model.certLike)*>
 <!ATTLIST space xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST space
@@ -3233,15 +3351,16 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.placement.attributes;
  %Tatt.written.attributes;
+ %Tatt.cmc.attributes;
 type NMTOKENS  #IMPLIED >
-<!--doc:Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container] -->
+<!--doc:Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container] -->
 <!ELEMENT standOff (%model.standOffPart;)+>
 <!ATTLIST standOff xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST standOff
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.declaring.attributes; >
-<!--doc:(state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics] -->
+<!--doc:(state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics] -->
 <!ELEMENT state (((precision)*,((state)+|((%model.headLike;)*,(%model.pLike;)+,(%model.noteLike;|%model.biblLike;)*)|(%model.labelLike;|%model.noteLike;|%model.biblLike;)*)))>
 <!ATTLIST state xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST state
@@ -3251,8 +3370,9 @@ type NMTOKENS  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.naming.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements] -->
+<!--doc:(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements] -->
 <!ELEMENT stdVals (%model.pLike;)+>
 <!ATTLIST stdVals xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST stdVals
@@ -3270,14 +3390,14 @@ calendar CDATA  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.declarable.attributes;
  %Tatt.styleDef.attributes; >
-<!--doc:(substitution) groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text. [11.3.1.5. Substitutions] -->
+<!--doc:(substitution) groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text. [12.3.1.5. Substitutions] -->
 <!ELEMENT subst (add|surplus|del|%model.milestoneLike;)+>
 <!ATTLIST subst xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST subst
  %Tatt.global.attributes;
  %Tatt.transcriptional.attributes;
  %Tatt.dimensions.attributes; >
-<!--doc:(substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions] -->
+<!--doc:(substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [12.3.1.5. Substitutions] -->
 <!ELEMENT substJoin (%model.descLike;|_DUMMY_model.certLike)*>
 <!ATTLIST substJoin xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST substJoin
@@ -3285,7 +3405,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.pointing.attributes;
  %Tatt.transcriptional.attributes;
  %Tatt.dimensions.attributes; >
-<!--doc:(supplied) signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe. [11.3.3.1. Damage, Illegibility, and Supplied Text] -->
+<!--doc:(supplied) signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe. [12.3.3.1. Damage, Illegibility, and Supplied Text] -->
 <!ELEMENT supplied %macro.paraContent;>
 <!ATTLIST supplied xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST supplied
@@ -3293,7 +3413,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
 reason CDATA  #IMPLIED >
-<!--doc:defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] -->
+<!--doc:defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription] -->
 <!ELEMENT surface (((%model.global;|%model.labelLike;|%model.graphicLike;)*,((zone|line|path|surface|surfaceGrp),(%model.global;)*)*))>
 <!ATTLIST surface xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST surface
@@ -3303,21 +3423,22 @@ reason CDATA  #IMPLIED >
  %Tatt.typed.attributes;
 attachment %teidata.enumerated;  #IMPLIED
 flipping %teidata.truthValue;  #IMPLIED >
-<!--doc:(surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [11.1. Digital Facsimiles] -->
+<!--doc:(surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [12.1. Digital Facsimiles] -->
 <!ELEMENT surfaceGrp (%model.global;|surface|surfaceGrp)+>
 <!ATTLIST surfaceGrp xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST surfaceGrp
  %Tatt.global.attributes;
  %Tatt.declaring.attributes;
  %Tatt.typed.attributes; >
-<!--doc:(surname) contains a family (inherited) name, as opposed to a given, baptismal, or nick name. [13.2.1. Personal Names] -->
+<!--doc:(surname) contains a family (inherited) name, as opposed to a given, baptismal, or nick name. [14.2.1. Personal Names] -->
 <!ELEMENT surname %macro.phraseSeq;>
 <!ATTLIST surname xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST surname
  %Tatt.global.attributes;
  %Tatt.personal.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(surplus) marks text present in the source which the editor believes to be superfluous or redundant. [11.3.3.1. Damage, Illegibility, and Supplied Text] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(surplus) marks text present in the source which the editor believes to be superfluous or redundant. [12.3.3.1. Damage, Illegibility, and Supplied Text] -->
 <!ELEMENT surplus %macro.paraContent;>
 <!ATTLIST surplus xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST surplus
@@ -3325,12 +3446,13 @@ flipping %teidata.truthValue;  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
 reason CDATA  #IMPLIED >
-<!--doc:(table) contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables] -->
+<!--doc:(table) contains text displayed in tabular form, in rows and columns. [15.1.1. TEI Tables] -->
 <!ELEMENT table (((%model.headLike;|%model.global;)*,((row,(%model.global;)*)+|((%model.graphicLike;),(%model.global;)*)+),((%model.divBottom;),(%model.global;)*)*))>
 <!ATTLIST table xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST table
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 rows %teidata.count;  #IMPLIED
 cols %teidata.count;  #IMPLIED >
 <!--doc:(element usage) documents the usage of a specific element within a specified document. [2.3.4. The Tagging Declaration] -->
@@ -3354,7 +3476,7 @@ partial %teidata.truthValue;  #IMPLIED >
 <!ATTLIST taxonomy
  %Tatt.global.attributes;
  %Tatt.datcat.attributes; >
-<!--doc:(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more TEI elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text] -->
+<!--doc:(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more TEI elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text] -->
 <!ELEMENT teiCorpus ((teiHeader,(%model.resource;)*,(%model.describedResource;)+))>
 <!ATTLIST teiCorpus xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST teiCorpus
@@ -3364,7 +3486,7 @@ version %teidata.version;  #IMPLIED >
 <!ATTLIST teiCorpus xsi:schemaLocation CDATA #IMPLIED
  xmlns:xsi CDATA #FIXED 'http://www.w3.org/2001/XMLSchema-instance'
  >
-<!--doc:(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text] -->
+<!--doc:(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text] -->
 <!ELEMENT teiHeader ((fileDesc,(%model.teiHeaderPart;)*,(revisionDesc)?))>
 <!ATTLIST teiHeader xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST teiHeader
@@ -3379,8 +3501,9 @@ version %teidata.version;  #IMPLIED >
  %Tatt.typed.attributes;
  %Tatt.canonical.attributes;
  %Tatt.sortable.attributes;
- %Tatt.cReferencing.attributes; >
-<!--doc:(terrain) contains information about the physical terrain of a place. [13.3.4.3. States, Traits, and Events] -->
+ %Tatt.cReferencing.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(terrain) contains information about the physical terrain of a place. [14.3.4.3. States, Traits, and Events] -->
 <!ELEMENT terrain (((precision)*,(%model.headLike;)*,((%model.pLike;)+|(%model.labelLike;)+),(%model.noteLike;|%model.biblLike;)*,(terrain)*))>
 <!ATTLIST terrain xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST terrain
@@ -3389,8 +3512,9 @@ version %teidata.version;  #IMPLIED >
  %Tatt.editLike.attributes;
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text] -->
+<!--doc:(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text] -->
 <!ELEMENT text (((%model.global;)*,(front,(%model.global;)*)?,(body|group),(%model.global;)*,(back,(%model.global;)*)?))>
 <!ATTLIST text xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST text
@@ -3404,7 +3528,7 @@ calendar CDATA  #IMPLIED >
 <!ATTLIST textClass
  %Tatt.global.attributes;
  %Tatt.declarable.attributes; >
-<!--doc:(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems] -->
+<!--doc:(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems] -->
 <!ELEMENT textLang %macro.specialPara;>
 <!ATTLIST textLang xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST textLang
@@ -3421,12 +3545,14 @@ otherLangs CDATA  #IMPLIED >
  %Tatt.canonical.attributes;
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
- %Tatt.typed.attributes; >
-<!--doc:(timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time] -->
+ %Tatt.typed.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time] -->
 <!ELEMENT timeline (when)+>
 <!ATTLIST timeline xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST timeline
  %Tatt.global.attributes;
+ %Tatt.cmc.attributes;
 origin %teidata.pointer;  #IMPLIED
 unit %teidata.enumerated;  #IMPLIED
 interval %teidata.interval;  #IMPLIED >
@@ -3438,6 +3564,7 @@ interval %teidata.interval;  #IMPLIED >
  %Tatt.typed.attribute.subtype;
  %Tatt.canonical.attributes;
  %Tatt.datable.attributes;
+ %Tatt.cmc.attributes;
 type CDATA  #IMPLIED
 calendar CDATA  #IMPLIED
 level (a|m|j|s|u) #IMPLIED >
@@ -3467,8 +3594,9 @@ type %teidata.enumerated;  "main"  >
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
  %Tatt.placement.attributes;
- %Tatt.written.attributes; >
-<!--doc:(trait) contains a description of some status or quality attributed to a person, place, or organization typically, but not necessarily, independent of the volition or action of the holder and usually not at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics] -->
+ %Tatt.written.attributes;
+ %Tatt.cmc.attributes; >
+<!--doc:(trait) contains a description of some status or quality attributed to a person, place, or organization typically, but not necessarily, independent of the volition or action of the holder and usually not at some specific time or for a specific date range. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics] -->
 <!ELEMENT trait (((precision)*,((trait)+|((%model.headLike;)*,(%model.pLike;)+,(%model.noteLike;|%model.biblLike;)*)|(%model.labelLike;|%model.noteLike;|%model.biblLike;)*)))>
 <!ATTLIST trait xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST trait
@@ -3478,17 +3606,19 @@ type %teidata.enumerated;  "main"  >
  %Tatt.naming.attributes;
  %Tatt.typed.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions] -->
+<!--doc:(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions] -->
 <!ELEMENT unclear %macro.paraContent;>
 <!ATTLIST unclear xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST unclear
  %Tatt.global.attributes;
  %Tatt.editLike.attributes;
  %Tatt.dimensions.attributes;
+ %Tatt.cmc.attributes;
 reason NMTOKENS  #IMPLIED
 agent %teidata.enumerated;  #IMPLIED >
-<!--doc:indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications] -->
+<!--doc:indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications] -->
 <!ELEMENT undo  EMPTY>
 <!ATTLIST undo xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST undo
@@ -3504,7 +3634,8 @@ Measures] -->
 <!ATTLIST unit
  %Tatt.global.attributes;
  %Tatt.typed.attributes;
- %Tatt.measurement.attributes; >
+ %Tatt.measurement.attributes;
+ %Tatt.cmc.attributes; >
 <!--doc:(unit declarations) provides information about units of measurement that are not members of the International System of Units. [2.3.9. The Unit Declaration] -->
 <!ELEMENT unitDecl (unitDef)+>
 <!ATTLIST unitDecl xmlns CDATA "http://www.tei-c.org/ns/1.0">
@@ -3522,7 +3653,7 @@ calendar CDATA  #IMPLIED >
  %Tatt.canonical.attributes;
  %Tatt.typed.attributes;
 calendar CDATA  #IMPLIED >
-<!--doc:indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time] -->
+<!--doc:indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time] -->
 <!ELEMENT when  EMPTY>
 <!ATTLIST when xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST when
@@ -3538,7 +3669,7 @@ since %teidata.pointer;  #IMPLIED >
  %Tatt.global.attributes;
  %Tatt.declarable.attributes;
  %Tatt.typed.attributes; >
-<!--doc:defines any two-dimensional area within a surface element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] -->
+<!--doc:defines any two-dimensional area within a surface element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription] -->
 <!ELEMENT zone (#PCDATA|_DUMMY_model.gLike|%model.graphicLike;|%model.global;|surface|%model.linePart;)*>
 <!ATTLIST zone xmlns CDATA "http://www.tei-c.org/ns/1.0">
 <!ATTLIST zone
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index a4977a482..7737005bb 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -258,6 +258,48 @@ Tatt.breaking.attribute.break =
   attribute break {
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
+Tatt.cmc.attributes = Tatt.cmc.attribute.generatedBy
+Tatt.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "testbasic-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 Tatt.cReferencing.attributes = Tatt.cReferencing.attribute.cRef
 Tatt.cReferencing.attribute.cRef =
   [
@@ -341,7 +383,7 @@ Tatt.datable.w3c.attribute.to =
   }?
 sch:pattern [
   id =
-    "testbasic-att.datable.w3c-att-datable-w3c-when-constraint-rule-1"
+    "testbasic-att.datable.w3c-att-datable-w3c-when-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -361,7 +403,7 @@ sch:pattern [
 ]
 sch:pattern [
   id =
-    "testbasic-att.datable.w3c-att-datable-w3c-from-constraint-rule-2"
+    "testbasic-att.datable.w3c-att-datable-w3c-from-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -380,7 +422,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "testbasic-att.datable.w3c-att-datable-w3c-to-constraint-rule-3"
+  id = "testbasic-att.datable.w3c-att-datable-w3c-to-constraint-rule-4"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -666,7 +708,7 @@ Tatt.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "testbasic-att.global.source-source-only_1_ODD_source-constraint-rule-4"
+    "testbasic-att.global.source-source-only_1_ODD_source-constraint-rule-5"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -910,7 +952,7 @@ Tatt.measurement.attribute.commodity =
   }?
 sch:pattern [
   id =
-    "testbasic-att.measurement-att-measurement-unitRef-constraint-rule-5"
+    "testbasic-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1016,7 +1058,7 @@ Tatt.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "testbasic-att.typed-subtypeTyped-constraint-rule-6"
+  id = "testbasic-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1059,7 +1101,7 @@ Tatt.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "testbasic-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "testbasic-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1180,7 +1222,7 @@ Tatt.spanning.attribute.spanTo =
   }?
 sch:pattern [
   id =
-    "testbasic-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "testbasic-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1236,7 +1278,7 @@ Tatt.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "testbasic-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "testbasic-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2147,6 +2189,7 @@ Tmodel.global =
 Tmodel.biblPart =
   Tmodel.respLike
   | Tmodel.imprintPart
+  | Tquote
   | Tseries
   | TcitedRange
   | Tbibl
@@ -2205,7 +2248,8 @@ Tmodel.inter =
   | Tmodel.listLike
   | Tmodel.stageLike
   | Tmodel.attributable
-Tmodel.common = Tmodel.divPart | Tmodel.inter | Tq
+Tmodel.cmc = notAllowed
+Tmodel.common = Tmodel.divPart | Tmodel.inter | Tmodel.cmc | Tq
 Tmodel.phrase =
   Tmodel.segLike
   | Tmodel.highlighted
@@ -2278,6 +2322,7 @@ Tmodel.standOffPart =
   | Tmodel.biblLike
   | Tmodel.listLike
   | Tmodel.annotationLike
+  | TxenoData
   | TlistChange
   | Tzone
   | Tseg
@@ -2354,7 +2399,7 @@ Tatt.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "testbasic-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
+    "testbasic-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2439,7 +2484,7 @@ Tp =
     Tmacro.paraContent
     >> sch:pattern [
          id =
-           "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
+           "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2461,7 +2506,7 @@ Tp =
        ]
     >> sch:pattern [
          id =
-           "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
+           "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2487,11 +2532,18 @@ Tp =
 Tforeign =
   
   ## (foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]
-  element foreign { Tmacro.phraseSeq, Tatt.global.attributes, empty }
+  element foreign {
+    Tmacro.phraseSeq, Tatt.global.attributes, Tatt.cmc.attributes, empty
+  }
 Temph =
   
   ## (emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
-  element emph { Tmacro.paraContent, Tatt.global.attributes, empty }
+  element emph {
+    Tmacro.paraContent,
+    Tatt.global.attributes,
+    Tatt.cmc.attributes,
+    empty
+  }
 Thi =
   
   ## (highlighted) marks a word or phrase as graphically distinct from the surrounding text, for reasons concerning which no claim is made. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
@@ -2499,6 +2551,7 @@ Thi =
     Tmacro.paraContent,
     Tatt.global.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tdistinct =
@@ -2508,6 +2561,7 @@ Tdistinct =
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.typed.attribute.subtype,
+    Tatt.cmc.attributes,
     
     ## specifies the sublanguage or register to which the word or phrase is being assigned
     attribute type {
@@ -2531,6 +2585,7 @@ Tsaid =
     Tmacro.specialPara,
     Tatt.global.attributes,
     Tatt.ascribed.directed.attributes,
+    Tatt.cmc.attributes,
     
     ## may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.
     attribute aloud {
@@ -2564,6 +2619,7 @@ Tquote =
     Tatt.global.attributes,
     Tatt.typed.attributes,
     Tatt.notated.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tq =
@@ -2573,6 +2629,7 @@ Tq =
     Tmacro.specialPara,
     Tatt.global.attributes,
     Tatt.ascribed.directed.attributes,
+    Tatt.cmc.attributes,
     
     ## (type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
     ## Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (written); 4] soCalled (so called); 5] foreign (foreign); 6] distinct (distinct); 7] term; 8] emph (emph); 9] mentioned (mentioned)
@@ -2610,7 +2667,7 @@ Tq =
   }
 Tcit =
   
-  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]
+  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]
   element cit {
     (Tmodel.biblLike
      | Tmodel.egLike
@@ -2622,24 +2679,29 @@ Tcit =
      | Tq)+,
     Tatt.global.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tmentioned =
   
   ## marks words or phrases mentioned, not used. [3.3.3. Quotation]
-  element mentioned { Tmacro.phraseSeq, Tatt.global.attributes, empty }
+  element mentioned {
+    Tmacro.phraseSeq, Tatt.global.attributes, Tatt.cmc.attributes, empty
+  }
 TsoCalled =
   
   ## (so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]
-  element soCalled { Tmacro.phraseSeq, Tatt.global.attributes, empty }
+  element soCalled {
+    Tmacro.phraseSeq, Tatt.global.attributes, Tatt.cmc.attributes, empty
+  }
 Tdesc =
   
-  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]
+  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]
   element desc {
     Tmacro.limitedContent
     >> sch:pattern [
          id =
-           "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
+           "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2662,21 +2724,17 @@ Tdesc =
        ],
     Tatt.global.attributes,
     Tatt.typed.attribute.subtype,
+    Tatt.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Suggested values include: 1] deprecationInfo (deprecation information)
     attribute type {
-      
-      ## (deprecation
-      ##           information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
-      "deprecationInfo"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
 Tgloss =
   
-  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]
+  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]
   element gloss {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -2684,6 +2742,7 @@ Tgloss =
     Tatt.typed.attributes,
     Tatt.pointing.attributes,
     Tatt.cReferencing.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tterm =
@@ -2698,13 +2757,18 @@ Tterm =
     Tatt.canonical.attributes,
     Tatt.sortable.attributes,
     Tatt.cReferencing.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Truby =
   
   ## (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]
   element ruby {
-    (Trb, Trt+), Tatt.global.attributes, Tatt.typed.attributes, empty
+    (Trb, Trt+),
+    Tatt.global.attributes,
+    Tatt.typed.attributes,
+    Tatt.cmc.attributes,
+    empty
   }
 Trb =
   
@@ -2731,7 +2795,7 @@ Trt =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-rt-target-rt-target-not-span-constraint-rule-14"
+           "testbasic-rt-target-rt-target-not-span-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2754,7 +2818,7 @@ Trt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "testbasic-rt-from-rt-from-constraint-rule-15"
+         id = "testbasic-rt-from-rt-from-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2779,7 +2843,7 @@ Trt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "testbasic-rt-to-rt-to-constraint-rule-16"
+         id = "testbasic-rt-to-rt-to-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2803,7 +2867,12 @@ Trt =
 Tsic =
   
   ## (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]
-  element sic { Tmacro.paraContent, Tatt.global.attributes, empty }
+  element sic {
+    Tmacro.paraContent,
+    Tatt.global.attributes,
+    Tatt.cmc.attributes,
+    empty
+  }
 Tcorr =
   
   ## (correction) contains the correct form of a passage apparently erroneous in the copy text. [3.5.1. Apparent Errors]
@@ -2812,6 +2881,7 @@ Tcorr =
     Tatt.global.attributes,
     Tatt.editLike.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tchoice =
@@ -2822,24 +2892,31 @@ Tchoice =
     (Tmodel.choicePart | Tchoice),
     (Tmodel.choicePart | Tchoice)*,
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Treg =
   
   ## (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element reg {
     Tmacro.paraContent,
     Tatt.global.attributes,
     Tatt.editLike.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Torig =
   
   ## (original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
-  element orig { Tmacro.paraContent, Tatt.global.attributes, empty }
+  ## Normalization 13. Critical Apparatus]
+  element orig {
+    Tmacro.paraContent,
+    Tatt.global.attributes,
+    Tatt.cmc.attributes,
+    empty
+  }
 Tgap =
   
   ## (gap) indicates a point where material has been omitted in a transcription, whether for editorial reasons described in the TEI header, as part of sampling practice, or because the material is illegible, invisible, or inaudible. [3.5.3. Additions, Deletions, and Omissions]
@@ -2849,6 +2926,7 @@ Tgap =
     Tatt.timed.attributes,
     Tatt.editLike.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     
     ## (reason) gives the reason for omission
     ## Suggested values include: 1] cancelled (cancelled); 2] deleted (deleted); 3] editorial (editorial); 4] illegible (illegible); 5] inaudible (inaudible); 6] irrelevant (irrelevant); 7] sampling (sampling)
@@ -2906,6 +2984,7 @@ Tadd =
     Tatt.placement.attributes,
     Tatt.typed.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tdel =
@@ -2917,16 +2996,18 @@ Tdel =
     Tatt.transcriptional.attributes,
     Tatt.typed.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tunclear =
   
-  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
+  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
   element unclear {
     Tmacro.paraContent,
     Tatt.global.attributes,
     Tatt.editLike.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     
     ## indicates why the material is hard to transcribe.
     ## Suggested values include: 1] illegible (illegible); 2] inaudible (inaudible); 3] faded (faded); 4] background_noise (background noise); 5] eccentric_ductus (eccentric ductus)
@@ -2968,6 +3049,7 @@ Tname =
     Tatt.datable.attributes,
     Tatt.editLike.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -2977,7 +3059,7 @@ Tname =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-name-calendar-calendar-check-name-constraint-rule-17"
+           "testbasic-name-calendar-calendar-check-name-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3002,24 +3084,28 @@ Tname =
   }
 Trs =
   
-  ## (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]
+  ## (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]
   element rs {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Temail =
   
   ## (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]
-  element email { Tmacro.phraseSeq, Tatt.global.attributes, empty }
+  element email {
+    Tmacro.phraseSeq, Tatt.global.attributes, Tatt.cmc.attributes, empty
+  }
 Taddress =
   
   ## (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]
   element address {
     (Tmodel.global*, (Tmodel.addrPart, Tmodel.global*)+),
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TaddrLine =
@@ -3047,23 +3133,11 @@ Tnum =
     Tatt.global.attributes,
     Tatt.typed.attribute.subtype,
     Tatt.ranging.attributes,
+    Tatt.cmc.attributes,
     
     ## indicates the type of numeric value.
-    ## Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage
     attribute type {
-      
-      ## absolute number, e.g. 21, 21.5
-      "cardinal"
-      | 
-        ## ordinal number, e.g. 21st
-        "ordinal"
-      | 
-        ## fraction, e.g. one half or three-quarters
-        "fraction"
-      | 
-        ## a percentage
-        "percentage"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     
     ## supplies the value of the number in standard form.
@@ -3083,6 +3157,7 @@ Tmeasure =
     Tatt.global.attributes,
     Tatt.typed.attribute.subtype,
     Tatt.measurement.attributes,
+    Tatt.cmc.attributes,
     Tatt.ranging.attributes,
     
     ## specifies the type of measurement in any convenient typology.
@@ -3093,12 +3168,13 @@ Tmeasure =
   }
 TmeasureGrp =
   
-  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]
+  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]
   element measureGrp {
     (text | Tmodel.gLike | Tmodel.measureLike)*,
     Tatt.global.attributes,
     Tatt.measurement.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tunit =
@@ -3110,11 +3186,12 @@ Tunit =
     Tatt.global.attributes,
     Tatt.typed.attributes,
     Tatt.measurement.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tdate =
   
-  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]
+  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]
   element date {
     (text | Tmodel.gLike | Tmodel.phrase | Tmodel.global)*,
     Tatt.global.attributes,
@@ -3124,6 +3201,7 @@ Tdate =
     Tatt.editLike.attributes,
     Tatt.dimensions.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Ttime =
@@ -3138,6 +3216,7 @@ Ttime =
     Tatt.editLike.attributes,
     Tatt.dimensions.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tabbr =
@@ -3147,9 +3226,9 @@ Tabbr =
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.typed.attribute.subtype,
+    Tatt.cmc.attributes,
     
     ## (type) allows the encoder to classify the abbreviation according to some convenient typology.
-    ## Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3162,15 +3241,16 @@ Texpan =
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.editLike.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tptr =
   
-  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]
   element ptr {
     empty
     >> sch:pattern [
-         id = "testbasic-ptr-ptrAtts-constraint-rule-18"
+         id = "testbasic-ptr-ptrAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3195,15 +3275,16 @@ Tptr =
     Tatt.internetMedia.attributes,
     Tatt.pointing.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tref =
   
-  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]
   element ref {
     Tmacro.paraContent
     >> sch:pattern [
-         id = "testbasic-ref-refAtts-constraint-rule-19"
+         id = "testbasic-ref-refAtts-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3229,6 +3310,7 @@ Tref =
     Tatt.internetMedia.attributes,
     Tatt.pointing.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tlist =
@@ -3243,7 +3325,7 @@ Tlist =
      (Tmodel.divBottom, Tmodel.global*)*)
     >> sch:pattern [
          id =
-           "testbasic-list-gloss-list-must-have-labels-constraint-rule-20"
+           "testbasic-list-gloss-list-must-have-labels-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3263,31 +3345,11 @@ Tlist =
     Tatt.global.attributes,
     Tatt.sortable.attributes,
     Tatt.typed.attribute.subtype,
+    Tatt.cmc.attributes,
     
     ## (type) describes the nature of the items in the list.
-    ## Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)
     attribute type {
-      [
-        a:documentation [
-          "(gloss) each list item glosses some term or concept, which is given by a "
-          ns1:code [ "<label>" ]
-          " element preceding the list item."
-        ]
-      ]
-      "gloss"
-      | 
-        ## (index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.
-        "index"
-      | 
-        ## (instructions) each list item is a step in a sequence of instructions, as in a recipe.
-        "instructions"
-      | 
-        ## (litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.
-        "litany"
-      | 
-        ## (syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.
-        "syllogism"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -3309,6 +3371,7 @@ Tlabel =
     Tatt.typed.attributes,
     Tatt.placement.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Thead =
@@ -3326,6 +3389,7 @@ Thead =
     Tatt.typed.attributes,
     Tatt.placement.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TheadLabel =
@@ -3338,7 +3402,7 @@ TheadItem =
   element headItem { Tmacro.phraseSeq, Tatt.global.attributes, empty }
 Tnote =
   
-  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]
+  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]
   element note {
     Tmacro.specialPara,
     Tatt.global.attributes,
@@ -3347,6 +3411,7 @@ Tnote =
     Tatt.typed.attributes,
     Tatt.written.attributes,
     Tatt.anchoring.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TnoteGrp =
@@ -3360,6 +3425,7 @@ TnoteGrp =
     Tatt.typed.attributes,
     Tatt.written.attributes,
     Tatt.anchoring.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tindex =
@@ -3369,6 +3435,7 @@ Tindex =
     (Tterm, Tindex?)*,
     Tatt.global.attributes,
     Tatt.spanning.attributes,
+    Tatt.cmc.attributes,
     
     ## a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.
     attribute indexName { xsd:Name }?,
@@ -3387,6 +3454,7 @@ Tmedia =
     Tatt.resourced.attributes,
     Tatt.declaring.attributes,
     Tatt.timed.attributes,
+    Tatt.cmc.attributes,
     
     ## (MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type
     attribute mimeType {
@@ -3398,7 +3466,7 @@ Tmedia =
   }
 Tgraphic =
   
-  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]
+  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]
   element graphic {
     Tmodel.descLike*,
     Tatt.global.attributes,
@@ -3406,6 +3474,7 @@ Tgraphic =
     Tatt.resourced.attributes,
     Tatt.declaring.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TbinaryObject =
@@ -3417,6 +3486,7 @@ TbinaryObject =
     Tatt.media.attributes,
     Tatt.timed.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     [
       a:documentation [
         "The encoding used to encode the binary data. If not specified, this is assumed to be "
@@ -3443,6 +3513,7 @@ Tmilestone =
     Tatt.edition.attributes,
     Tatt.spanning.attributes,
     Tatt.breaking.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tgb =
@@ -3456,6 +3527,7 @@ Tgb =
     Tatt.spanning.attributes,
     Tatt.breaking.attributes,
     Tatt.edition.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tpb =
@@ -3469,6 +3541,7 @@ Tpb =
     Tatt.edition.attributes,
     Tatt.spanning.attributes,
     Tatt.breaking.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tlb =
@@ -3482,6 +3555,7 @@ Tlb =
     Tatt.edition.attributes,
     Tatt.spanning.attributes,
     Tatt.breaking.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tcb =
@@ -3495,6 +3569,7 @@ Tcb =
     Tatt.edition.attributes,
     Tatt.spanning.attributes,
     Tatt.breaking.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tanalytic =
@@ -3573,7 +3648,7 @@ Tauthor =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-author-calendar-calendar-check-author-constraint-rule-21"
+           "testbasic-author-calendar-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3613,7 +3688,7 @@ Teditor =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-editor-calendar-calendar-check-editor-constraint-rule-22"
+           "testbasic-editor-calendar-calendar-check-editor-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3664,7 +3739,7 @@ Tresp =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-resp-calendar-calendar-check-resp-constraint-rule-23"
+           "testbasic-resp-calendar-calendar-check-resp-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3693,7 +3768,7 @@ Ttitle =
   element title {
     Tmacro.paraContent
     >> sch:pattern [
-         id = "testbasic-title-calendar-check-title-constraint-rule-24"
+         id = "testbasic-title-calendar-check-title-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3718,24 +3793,10 @@ Ttitle =
     Tatt.typed.attribute.subtype,
     Tatt.canonical.attributes,
     Tatt.datable.attributes,
+    Tatt.cmc.attributes,
     
     ## classifies the title according to some convenient typology.
-    ## Suggested values include: 1] biography; 2] chronology; 3] introduction; 4] project
-    attribute type {
-      
-      ##
-      "biography"
-      | 
-        ##
-        "chronology"
-      | 
-        ##
-        "introduction"
-      | 
-        ##
-        "project"
-      | text
-    }?,
+    attribute type { text }?,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -3745,7 +3806,7 @@ Ttitle =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-title-calendar-calendar-check-title-constraint-rule-25"
+           "testbasic-title-calendar-calendar-check-title-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3795,6 +3856,7 @@ Tmeeting =
     Tatt.global.attributes,
     Tatt.datable.attributes,
     Tatt.canonical.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -3804,7 +3866,7 @@ Tmeeting =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-meeting-calendar-calendar-check-meeting-constraint-rule-26"
+           "testbasic-meeting-calendar-calendar-check-meeting-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3877,7 +3939,7 @@ TpubPlace =
   }
 Tbibl =
   
-  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element bibl {
     (text
      | Tmodel.gLike
@@ -3893,11 +3955,12 @@ Tbibl =
     Tatt.typed.attributes,
     Tatt.sortable.attributes,
     Tatt.docStatus.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TbiblStruct =
   
-  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblStruct {
     (Tanalytic*,
      (Tmonogr, Tseries*)+,
@@ -3907,11 +3970,12 @@ TbiblStruct =
     Tatt.typed.attributes,
     Tatt.sortable.attributes,
     Tatt.docStatus.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TlistBibl =
   
-  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element listBibl {
     (Tmodel.headLike*,
      Tdesc*,
@@ -3922,6 +3986,7 @@ TlistBibl =
     Tatt.sortable.attributes,
     Tatt.declarable.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TrelatedItem =
@@ -3931,7 +3996,7 @@ TrelatedItem =
     ((Tmodel.biblLike | Tmodel.ptrLike)?)
     >> sch:pattern [
          id =
-           "testbasic-relatedItem-targetorcontent1-constraint-rule-27"
+           "testbasic-relatedItem-targetorcontent1-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3976,7 +4041,7 @@ Tl =
       | Tmodel.global)*)
     >> sch:pattern [
          id =
-           "testbasic-l-abstractModel-structure-l-in-l-constraint-rule-28"
+           "testbasic-l-abstractModel-structure-l-in-l-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3996,6 +4061,7 @@ Tl =
        ],
     Tatt.global.attributes,
     Tatt.fragmentable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tlg =
@@ -4016,7 +4082,7 @@ Tlg =
       | Tlg)*,
      (Tmodel.divBottom, Tmodel.global*)*)
     >> sch:pattern [
-         id = "testbasic-lg-atleast1oflggapl-constraint-rule-29"
+         id = "testbasic-lg-atleast1oflggapl-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4036,7 +4102,7 @@ Tlg =
        ]
     >> sch:pattern [
          id =
-           "testbasic-lg-abstractModel-structure-lg-in-l-constraint-rule-30"
+           "testbasic-lg-abstractModel-structure-lg-in-l-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4058,6 +4124,7 @@ Tlg =
     Tatt.divLike.attributes,
     Tatt.typed.attributes,
     Tatt.declaring.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tsp =
@@ -4090,6 +4157,7 @@ Tstage =
     Tatt.global.attributes,
     Tatt.placement.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -4132,7 +4200,7 @@ TteiCorpus =
     a:documentation [
       "(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more "
       ns1:code [ "<TEI>" ]
-      " elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      " elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element teiCorpus {
@@ -4155,7 +4223,6 @@ TdivGen =
     Tatt.typed.attribute.subtype,
     
     ## specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-    ## Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -4163,7 +4230,7 @@ TdivGen =
   }
 TtextLang =
   
-  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]
+  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]
   element textLang {
     Tmacro.specialPara,
     Tatt.global.attributes,
@@ -4215,7 +4282,7 @@ Tatt.patternReplacement.attribute.replacementPattern =
   attribute replacementPattern { text }
 TteiHeader =
   
-  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]
+  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]
   element teiHeader {
     (TfileDesc, Tmodel.teiHeaderPart*, TrevisionDesc?),
     Tatt.global.attributes,
@@ -4258,7 +4325,7 @@ Tsponsor =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-sponsor-calendar-calendar-check-sponsor-constraint-rule-31"
+           "testbasic-sponsor-calendar-calendar-check-sponsor-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4298,7 +4365,7 @@ Tfunder =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-funder-calendar-calendar-check-funder-constraint-rule-32"
+           "testbasic-funder-calendar-calendar-check-funder-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4338,7 +4405,7 @@ Tprincipal =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-principal-calendar-calendar-check-principal-constraint-rule-33"
+           "testbasic-principal-calendar-calendar-check-principal-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4375,7 +4442,7 @@ Tedition =
   element edition { Tmacro.phraseSeq, Tatt.global.attributes, empty }
 Textent =
   
-  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]
+  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]
   element extent { Tmacro.phraseSeq, Tatt.global.attributes, empty }
 TpublicationStmt =
   
@@ -4407,56 +4474,18 @@ Tauthority =
   }
 Tidno =
   
-  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
+  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element idno {
     (text | Tmodel.gLike | Tidno)*,
     Tatt.global.attributes,
     Tatt.sortable.attributes,
     Tatt.datable.attributes,
     Tatt.typed.attribute.subtype,
+    Tatt.cmc.attributes,
     
     ## categorizes the identifier, for example as an ISBN, Social Security number, etc.
-    ## Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC
     attribute type {
-      [
-        a:documentation [
-          "International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the "
-          ns1:a [
-            href = "https://www.isbn-international.org"
-            " International ISBN Agency."
-          ]
-          "\x{a}" ~
-          "                  "
-        ]
-      ]
-      "ISBN"
-      | 
-        ## International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.
-        "ISSN"
-      | 
-        ## Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.
-        "DOI"
-      | [
-          a:documentation [
-            "Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of "
-            ns1:a [
-              href = "https://datatracker.ietf.org/doc/html/rfc3986"
-              "RFC 3986"
-            ]
-            "."
-          ]
-        ]
-        "URI"
-      | 
-        ## A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.
-        "VIAF"
-      | 
-        ## English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.
-        "ESTC"
-      | 
-        ## OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.
-        "OCLC"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
@@ -4467,7 +4496,7 @@ Tidno =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-idno-calendar-calendar-check-idno-constraint-rule-34"
+           "testbasic-idno-calendar-calendar-check-idno-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4529,7 +4558,7 @@ Tlicence =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-licence-calendar-calendar-check-licence-constraint-rule-35"
+           "testbasic-licence-calendar-calendar-check-licence-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4570,7 +4599,7 @@ TnotesStmt =
   }
 TsourceDesc =
   
-  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]
+  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]
   element sourceDesc {
     (Tmodel.pLike+
      | (Tmodel.biblLike | Tmodel.sourceDescPart | Tmodel.listLike)+),
@@ -4580,7 +4609,7 @@ TsourceDesc =
   }
 TbiblFull =
   
-  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblFull {
     (((TtitleStmt,
        TeditionStmt?,
@@ -4594,6 +4623,7 @@ TbiblFull =
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
     Tatt.docStatus.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TencodingDesc =
@@ -4619,7 +4649,7 @@ TschemaRef =
   }
 TprojectDesc =
   
-  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element projectDesc {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4628,7 +4658,7 @@ TprojectDesc =
   }
 TsamplingDecl =
   
-  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element samplingDecl {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4637,7 +4667,7 @@ TsamplingDecl =
   }
 TeditorialDecl =
   
-  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element editorialDecl {
     (Tmodel.pLike | Tmodel.editorialDeclPart)+,
     Tatt.global.attributes,
@@ -4646,7 +4676,7 @@ TeditorialDecl =
   }
 Tcorrection =
   
-  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element correction {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4682,7 +4712,7 @@ Tcorrection =
   }
 Tnormalization =
   
-  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element normalization {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4702,11 +4732,11 @@ Tnormalization =
   }
 Tquotation =
   
-  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element quotation {
     (Tmodel.pLike*)
     >> sch:pattern [
-         id = "testbasic-quotation-quotationContents-constraint-rule-36"
+         id = "testbasic-quotation-quotationContents-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4746,7 +4776,7 @@ Tquotation =
   }
 Thyphenation =
   
-  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element hyphenation {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4772,7 +4802,7 @@ Thyphenation =
   }
 Tsegmentation =
   
-  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element segmentation {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4781,7 +4811,7 @@ Tsegmentation =
   }
 TstdVals =
   
-  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element stdVals {
     Tmodel.pLike+,
     Tatt.global.attributes,
@@ -4930,7 +4960,7 @@ TrefsDecl =
   }
 TciteStructure =
   
-  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeStructure {
     (TciteData*, TciteStructure*, Tmodel.descLike*),
     Tatt.global.attributes,
@@ -4958,7 +4988,7 @@ TciteStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-match-citestructure-outer-match-constraint-rule-37"
+           "testbasic-citeStructure-match-citestructure-outer-match-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4979,7 +5009,7 @@ TciteStructure =
        ]
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-match-citestructure-inner-match-constraint-rule-38"
+           "testbasic-citeStructure-match-citestructure-inner-match-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5013,7 +5043,7 @@ TciteStructure =
   }
 TciteData =
   
-  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeData {
     empty,
     Tatt.global.attributes,
@@ -5036,7 +5066,7 @@ TcRefPattern =
   }
 TprefixDef =
   
-  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element prefixDef {
     Tmodel.pLike*,
     Tatt.global.attributes,
@@ -5050,7 +5080,7 @@ TprefixDef =
   }
 TlistPrefixDef =
   
-  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element listPrefixDef {
     (Tdesc*, (TprefixDef | TlistPrefixDef)+),
     Tatt.global.attributes,
@@ -5161,7 +5191,7 @@ TunitDecl =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39"
+           "testbasic-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5202,7 +5232,7 @@ TunitDef =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-unitDef-calendar-calendar-check-unitDef-constraint-rule-40"
+           "testbasic-unitDef-calendar-calendar-check-unitDef-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5243,7 +5273,7 @@ Tconversion =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-conversion-calendar-calendar-check-conversion-constraint-rule-41"
+           "testbasic-conversion-calendar-calendar-check-conversion-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5309,7 +5339,7 @@ Tapplication =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-application-calendar-calendar-check-application-constraint-rule-42"
+           "testbasic-application-calendar-calendar-check-application-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5350,7 +5380,7 @@ TprofileDesc =
   }
 ThandNote =
   
-  ## (note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing, Decoration, and Other Notations]
+  ## (note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing, Decoration, and Other Notations]
   element handNote {
     Tmacro.specialPara,
     Tatt.global.attributes,
@@ -5381,7 +5411,7 @@ Tcreation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-creation-calendar-calendar-check-creation-constraint-rule-43"
+           "testbasic-creation-calendar-calendar-check-creation-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5406,7 +5436,7 @@ Tcreation =
   }
 TlangUsage =
   
-  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]
   element langUsage {
     (Tmodel.pLike+ | Tlanguage+),
     Tatt.global.attributes,
@@ -5538,24 +5568,8 @@ TcorrespAction =
     Tatt.sortable.attributes,
     
     ## describes the nature of the action.
-    ## Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded
     attribute type {
-      
-      ## information concerning the sending or dispatch of a message.
-      "sent"
-      | 
-        ## information concerning the receipt of a message.
-        "received"
-      | 
-        ## information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.
-        "transmitted"
-      | 
-        ## information concerning the redirection of an unread message.
-        "redirected"
-      | 
-        ## information concerning the forwarding of a message.
-        "forwarded"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5586,7 +5600,7 @@ TrevisionDesc =
   }
 Tchange =
   
-  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]
+  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]
   element change {
     Tmacro.specialPara,
     Tatt.ascribed.attributes,
@@ -5603,7 +5617,7 @@ Tchange =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-change-calendar-calendar-check-change-constraint-rule-44"
+           "testbasic-change-calendar-calendar-check-change-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5635,7 +5649,7 @@ Tchange =
   }
 TlistChange =
   
-  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]
+  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]
   element listChange {
     (Tdesc*, (TlistChange | Tchange)+),
     Tatt.global.attributes,
@@ -5843,7 +5857,7 @@ Tatt.datable.iso.attribute.to-iso =
   }?
 TorgName =
   
-  ## (organization name) contains an organizational name. [13.2.2. Organizational Names]
+  ## (organization name) contains an organizational name. [14.2.2. Organizational Names]
   element orgName {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -5851,6 +5865,7 @@ TorgName =
     Tatt.editLike.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -5860,7 +5875,7 @@ TorgName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-orgName-calendar-calendar-check-orgName-constraint-rule-45"
+           "testbasic-orgName-calendar-calendar-check-orgName-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5885,7 +5900,7 @@ TorgName =
   }
 TpersName =
   
-  ## (personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [13.2.1. Personal Names]
+  ## (personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [14.2.1. Personal Names]
   element persName {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -5893,6 +5908,7 @@ TpersName =
     Tatt.editLike.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -5902,7 +5918,7 @@ TpersName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-persName-calendar-calendar-check-persName-constraint-rule-46"
+           "testbasic-persName-calendar-calendar-check-persName-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5927,66 +5943,72 @@ TpersName =
   }
 Tsurname =
   
-  ## (surname) contains a family (inherited) name, as opposed to a given, baptismal, or nick name. [13.2.1. Personal Names]
+  ## (surname) contains a family (inherited) name, as opposed to a given, baptismal, or nick name. [14.2.1. Personal Names]
   element surname {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tforename =
   
-  ## (forename) contains a forename, given or baptismal name. [13.2.1. Personal Names]
+  ## (forename) contains a forename, given or baptismal name. [14.2.1. Personal Names]
   element forename {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TgenName =
   
-  ## (generational name component) contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. [13.2.1. Personal Names]
+  ## (generational name component) contains a name component used to distinguish otherwise similar names on the basis of the relative ages or generations of the persons named. [14.2.1. Personal Names]
   element genName {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TnameLink =
   
-  ## (name link) contains a connecting phrase or link used within a name but not regarded as part of it, such as van der or of. [13.2.1. Personal Names]
+  ## (name link) contains a connecting phrase or link used within a name but not regarded as part of it, such as van der or of. [14.2.1. Personal Names]
   element nameLink {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TaddName =
   
-  ## (additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [13.2.1. Personal Names]
+  ## (additional name) contains an additional name component, such as a nickname, epithet, or alias, or any other descriptive phrase used within a personal name. [14.2.1. Personal Names]
   element addName {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TroleName =
   
-  ## (role name) contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. [13.2.1. Personal Names]
+  ## (role name) contains a name component which indicates that the referent has a particular role or position in society, such as an official title or rank. [14.2.1. Personal Names]
   element roleName {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TplaceName =
   
-  ## (place name) contains an absolute or relative place name. [13.2.3. Place Names]
+  ## (place name) contains an absolute or relative place name. [14.2.3. Place Names]
   element placeName {
     Tmacro.phraseSeq,
     Tatt.datable.attributes,
@@ -5994,6 +6016,7 @@ TplaceName =
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6003,7 +6026,7 @@ TplaceName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-placeName-calendar-calendar-check-placeName-constraint-rule-47"
+           "testbasic-placeName-calendar-calendar-check-placeName-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6028,13 +6051,14 @@ TplaceName =
   }
 Tbloc =
   
-  ## (bloc) contains the name of a geo-political unit consisting of two or more nation states or countries. [13.2.3. Place Names]
+  ## (bloc) contains the name of a geo-political unit consisting of two or more nation states or countries. [14.2.3. Place Names]
   element bloc {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.datable.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6044,7 +6068,7 @@ Tbloc =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-bloc-calendar-calendar-check-bloc-constraint-rule-48"
+           "testbasic-bloc-calendar-calendar-check-bloc-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6069,13 +6093,14 @@ Tbloc =
   }
 Tcountry =
   
-  ## (country) contains the name of a geo-political unit, such as a nation, country, colony, or commonwealth, larger than or administratively superior to a region and smaller than a bloc. [13.2.3. Place Names]
+  ## (country) contains the name of a geo-political unit, such as a nation, country, colony, or commonwealth, larger than or administratively superior to a region and smaller than a bloc. [14.2.3. Place Names]
   element country {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.datable.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6085,7 +6110,7 @@ Tcountry =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-country-calendar-calendar-check-country-constraint-rule-49"
+           "testbasic-country-calendar-calendar-check-country-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6110,13 +6135,14 @@ Tcountry =
   }
 Tregion =
   
-  ## (region) contains the name of an administrative unit such as a state, province, or county, larger than a settlement, but smaller than a country. [13.2.3. Place Names]
+  ## (region) contains the name of an administrative unit such as a state, province, or county, larger than a settlement, but smaller than a country. [14.2.3. Place Names]
   element region {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.datable.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6126,7 +6152,7 @@ Tregion =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-region-calendar-calendar-check-region-constraint-rule-50"
+           "testbasic-region-calendar-calendar-check-region-constraint-rule-51"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6151,13 +6177,14 @@ Tregion =
   }
 Tsettlement =
   
-  ## (settlement) contains the name of a settlement such as a city, town, or village identified as a single geo-political or administrative unit. [13.2.3. Place Names]
+  ## (settlement) contains the name of a settlement such as a city, town, or village identified as a single geo-political or administrative unit. [14.2.3. Place Names]
   element settlement {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.datable.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6167,7 +6194,7 @@ Tsettlement =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-settlement-calendar-calendar-check-settlement-constraint-rule-51"
+           "testbasic-settlement-calendar-calendar-check-settlement-constraint-rule-52"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6192,13 +6219,14 @@ Tsettlement =
   }
 Tdistrict =
   
-  ## (district) contains the name of any kind of subdivision of a settlement, such as a parish, ward, or other administrative or geographic unit. [13.2.3. Place Names]
+  ## (district) contains the name of any kind of subdivision of a settlement, such as a parish, ward, or other administrative or geographic unit. [14.2.3. Place Names]
   element district {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.datable.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6208,7 +6236,7 @@ Tdistrict =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-district-calendar-calendar-check-district-constraint-rule-52"
+           "testbasic-district-calendar-calendar-check-district-constraint-rule-53"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6233,7 +6261,7 @@ Tdistrict =
   }
 Toffset =
   
-  ## (offset) marks that part of a relative temporal or spatial expression which indicates the direction of the offset between the two place names, dates, or times involved in the expression. [13.2.3. Place Names]
+  ## (offset) marks that part of a relative temporal or spatial expression which indicates the direction of the offset between the two place names, dates, or times involved in the expression. [14.2.3. Place Names]
   element offset {
     Tmacro.phraseSeq,
     Tatt.datable.attributes,
@@ -6242,6 +6270,7 @@ Toffset =
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6251,7 +6280,7 @@ Toffset =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-offset-calendar-calendar-check-offset-constraint-rule-53"
+           "testbasic-offset-calendar-calendar-check-offset-constraint-rule-54"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6276,7 +6305,7 @@ Toffset =
   }
 TgeogName =
   
-  ## (geographical name) identifies a name associated with some geographical feature such as Windrush Valley or Mount Sinai. [13.2.3. Place Names]
+  ## (geographical name) identifies a name associated with some geographical feature such as Windrush Valley or Mount Sinai. [14.2.3. Place Names]
   element geogName {
     Tmacro.phraseSeq,
     Tatt.datable.attributes,
@@ -6284,6 +6313,7 @@ TgeogName =
     Tatt.global.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6293,7 +6323,7 @@ TgeogName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-geogName-calendar-calendar-check-geogName-constraint-rule-54"
+           "testbasic-geogName-calendar-calendar-check-geogName-constraint-rule-55"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6318,7 +6348,7 @@ TgeogName =
   }
 TgeogFeat =
   
-  ## (geographical feature name) contains a common noun identifying some geographical feature contained within a geographic name, such as valley, mount, etc. [13.2.3. Place Names]
+  ## (geographical feature name) contains a common noun identifying some geographical feature contained within a geographic name, such as valley, mount, etc. [14.2.3. Place Names]
   element geogFeat {
     Tmacro.phraseSeq,
     Tatt.datable.attributes,
@@ -6327,6 +6357,7 @@ TgeogFeat =
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6336,7 +6367,7 @@ TgeogFeat =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-55"
+           "testbasic-geogFeat-calendar-calendar-check-geogFeat-constraint-rule-56"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6361,7 +6392,7 @@ TgeogFeat =
   }
 TeventName =
   
-  ## (name of an event) contains a proper noun or noun phrase used to refer to an event. [13.2.4. Event Names]
+  ## (name of an event) contains a proper noun or noun phrase used to refer to an event. [14.2.4. Event Names]
   element eventName {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6373,7 +6404,7 @@ TeventName =
   }
 Taffiliation =
   
-  ## (affiliation) contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor. [15.2.2. The Participant Description]
+  ## (affiliation) contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor. [16.2.2. The Participant Description]
   element affiliation {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6381,9 +6412,9 @@ Taffiliation =
     Tatt.datable.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attribute.subtype,
+    Tatt.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] sponsor; 2] recommend; 3] discredit; 4] pledged
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6396,7 +6427,7 @@ Taffiliation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-affiliation-calendar-calendar-check-affiliation-constraint-rule-56"
+           "testbasic-affiliation-calendar-calendar-check-affiliation-constraint-rule-57"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6421,7 +6452,7 @@ Taffiliation =
   }
 Tage =
   
-  ## (age) specifies the age of a person. [13.3.2.1. Personal Characteristics]
+  ## (age) specifies the age of a person. [14.3.2.1. Personal Characteristics]
   element age {
     Tmacro.phraseSeq.limited,
     Tatt.global.attributes,
@@ -6431,7 +6462,6 @@ Tage =
     Tatt.dimensions.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] western; 2] sui; 3] subjective; 4] objective; 5] inWorld (in world); 6] chronological; 7] biological; 8] psychological; 9] functional
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6444,7 +6474,7 @@ Tage =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-age-calendar-calendar-check-age-constraint-rule-57"
+           "testbasic-age-calendar-calendar-check-age-constraint-rule-58"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6472,7 +6502,7 @@ Tage =
   }
 Tbirth =
   
-  ## (birth) contains information about a person's birth, such as its date and place. [15.2.2. The Participant Description]
+  ## (birth) contains information about a person's birth, such as its date and place. [16.2.2. The Participant Description]
   element birth {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6483,7 +6513,6 @@ Tbirth =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] caesarean (caesarean section); 2] vaginal (vaginal delivery); 3] exNihilo (ex nihilo); 4] incorporated; 5] founded; 6] established
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6496,7 +6525,7 @@ Tbirth =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-birth-calendar-calendar-check-birth-constraint-rule-58"
+           "testbasic-birth-calendar-calendar-check-birth-constraint-rule-59"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6521,7 +6550,7 @@ Tbirth =
   }
 Tclimate =
   
-  ## (climate) contains information about the physical climate of a place. [13.3.4.3. States, Traits, and Events]
+  ## (climate) contains information about the physical climate of a place. [14.3.4.3. States, Traits, and Events]
   element climate {
     (Tmodel.headLike*,
      (Tmodel.pLike+ | Tmodel.labelLike+),
@@ -6532,6 +6561,7 @@ Tclimate =
     Tatt.editLike.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -6541,7 +6571,7 @@ Tclimate =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-climate-calendar-calendar-check-climate-constraint-rule-59"
+           "testbasic-climate-calendar-calendar-check-climate-constraint-rule-60"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6566,7 +6596,7 @@ Tclimate =
   }
 Tdeath =
   
-  ## (death) contains information about a person's death, such as its date and place. [15.2.2. The Participant Description]
+  ## (death) contains information about a person's death, such as its date and place. [16.2.2. The Participant Description]
   element death {
     Tmacro.phraseSeq,
     Tatt.datable.attributes,
@@ -6577,7 +6607,6 @@ Tdeath =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] proclaimed; 2] assumed; 3] verified; 4] clinical; 5] brain; 6] natural; 7] unnatural; 8] fragmentation; 9] dissolution
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6590,7 +6619,7 @@ Tdeath =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-death-calendar-calendar-check-death-constraint-rule-60"
+           "testbasic-death-calendar-calendar-check-death-constraint-rule-61"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6615,7 +6644,7 @@ Tdeath =
   }
 Teducation =
   
-  ## (education) contains a description of the educational experience of a person. [15.2.2. The Participant Description]
+  ## (education) contains a description of the educational experience of a person. [16.2.2. The Participant Description]
   element education {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6625,7 +6654,6 @@ Teducation =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] primary; 2] secondary; 3] undergraduate; 4] graduate; 5] residency; 6] apprenticeship
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6638,7 +6666,7 @@ Teducation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-education-calendar-calendar-check-education-constraint-rule-61"
+           "testbasic-education-calendar-calendar-check-education-constraint-rule-62"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6663,7 +6691,7 @@ Teducation =
   }
 Tevent =
   
-  ## (event) contains data relating to anything of significance that happens in time. [13.3.1. Basic Principles]
+  ## (event) contains data relating to anything of significance that happens in time. [14.3.1. Basic Principles]
   element event {
     (Tidno*,
      Tmodel.headLike*,
@@ -6695,7 +6723,7 @@ Tevent =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-event-calendar-calendar-check-event-constraint-rule-62"
+           "testbasic-event-calendar-calendar-check-event-constraint-rule-63"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6720,7 +6748,7 @@ Tevent =
   }
 Tfaith =
   
-  ## (faith) specifies the faith, religion, or belief set of a person. [13.3.2.1. Personal Characteristics]
+  ## (faith) specifies the faith, religion, or belief set of a person. [14.3.2.1. Personal Characteristics]
   element faith {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6730,7 +6758,6 @@ Tfaith =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] practicing; 2] clandestine; 3] patrilineal; 4] matrilineal; 5] convert
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6743,7 +6770,7 @@ Tfaith =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-faith-calendar-calendar-check-faith-constraint-rule-63"
+           "testbasic-faith-calendar-calendar-check-faith-constraint-rule-64"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6768,7 +6795,7 @@ Tfaith =
   }
 Tfloruit =
   
-  ## (floruit) contains information about a person's period of activity. [13.3.2.1. Personal Characteristics]
+  ## (floruit) contains information about a person's period of activity. [14.3.2.1. Personal Characteristics]
   element floruit {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6784,7 +6811,7 @@ Tfloruit =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-floruit-calendar-calendar-check-floruit-constraint-rule-64"
+           "testbasic-floruit-calendar-calendar-check-floruit-constraint-rule-65"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6809,7 +6836,7 @@ Tfloruit =
   }
 Tgender =
   
-  ## (gender) specifies the gender identity of a person, persona, or character. [13.3.2.1. Personal Characteristics]
+  ## (gender) specifies the gender identity of a person, persona, or character. [14.3.2.1. Personal Characteristics]
   element gender {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -6825,7 +6852,7 @@ Tgender =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-gender-calendar-calendar-check-gender-constraint-rule-65"
+           "testbasic-gender-calendar-calendar-check-gender-constraint-rule-66"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6857,16 +6884,20 @@ Tgender =
   }
 Tgeo =
   
-  ## (geographical coordinates) contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation. [13.3.4.1. Varieties of Location]
+  ## (geographical coordinates) contains any expression of a set of geographic coordinates, representing a point, line, or area on the surface of the earth in some notation. [14.3.4.1. Varieties of Location]
   element geo {
-    text, Tatt.global.attributes, Tatt.declaring.attributes, empty
+    text,
+    Tatt.global.attributes,
+    Tatt.declaring.attributes,
+    Tatt.cmc.attributes,
+    empty
   }
 TlangKnowledge =
   [
     a:documentation [
       "(language knowledge) summarizes the state of a person's linguistic knowledge, either as prose or by a list of "
       ns1:code [ "<langKnown>" ]
-      " elements. [13.3.2.1. Personal Characteristics]"
+      " elements. [14.3.2.1. Personal Characteristics]"
     ]
   ]
   element langKnowledge {
@@ -6877,7 +6908,6 @@ TlangKnowledge =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] listening; 2] speaking; 3] reading; 4] writing
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -6890,7 +6920,7 @@ TlangKnowledge =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-66"
+           "testbasic-langKnowledge-calendar-calendar-check-langKnowledge-constraint-rule-67"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6925,7 +6955,7 @@ TlangKnowledge =
   }
 TlangKnown =
   
-  ## (language known) summarizes the state of a person's linguistic competence, i.e., knowledge of a single language. [15.2.2. The Participant Description]
+  ## (language known) summarizes the state of a person's linguistic competence, i.e., knowledge of a single language. [16.2.2. The Participant Description]
   element langKnown {
     Tmacro.phraseSeq.limited,
     Tatt.global.attributes,
@@ -6940,7 +6970,7 @@ TlangKnown =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-langKnown-calendar-calendar-check-langKnown-constraint-rule-67"
+           "testbasic-langKnown-calendar-calendar-check-langKnown-constraint-rule-68"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6978,7 +7008,7 @@ TlangKnown =
   }
 TlistOrg =
   
-  ## (list of organizations) contains a list of elements, each of which provides information about an identifiable organization. [13.2.2. Organizational Names]
+  ## (list of organizations) contains a list of elements, each of which provides information about an identifiable organization. [14.2.2. Organizational Names]
   element listOrg {
     (Tmodel.headLike*,
      Tdesc*,
@@ -6988,11 +7018,12 @@ TlistOrg =
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TlistEvent =
   
-  ## (list of events) contains a list of descriptions, each of which provides information about an identifiable event. [13.3.1. Basic Principles]
+  ## (list of events) contains a list of descriptions, each of which provides information about an identifiable event. [14.3.1. Basic Principles]
   element listEvent {
     (Tmodel.headLike*,
      Tdesc*,
@@ -7002,11 +7033,12 @@ TlistEvent =
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TlistPerson =
   
-  ## (list of persons) contains a list of descriptions, each of which provides information about an identifiable person or a group of people, for example the participants in a language interaction, or the people referred to in a historical source. [13.3.2. The Person Element 15.2. Contextual Information 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (list of persons) contains a list of descriptions, each of which provides information about an identifiable person or a group of people, for example the participants in a language interaction, or the people referred to in a historical source. [14.3.2. The Person Element 16.2. Contextual Information 2.4. The Profile Description 16.3.2. Declarable Elements]
   element listPerson {
     (Tmodel.headLike*,
      Tdesc*,
@@ -7017,11 +7049,12 @@ TlistPerson =
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TlistPlace =
   
-  ## (list of places) contains a list of places, optionally followed by a list of relationships (other than containment) defined amongst them. [2.2.7. The Source Description 13.3.4. Places]
+  ## (list of places) contains a list of places, optionally followed by a list of relationships (other than containment) defined amongst them. [2.2.7. The Source Description 14.3.4. Places]
   element listPlace {
     (Tmodel.headLike*,
      Tdesc*,
@@ -7031,11 +7064,12 @@ TlistPlace =
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TlistRelation =
   
-  ## provides information about relationships identified amongst people, places, and organizations, either informally as prose or as formally expressed relation links. [13.3.2.3. Personal Relationships]
+  ## provides information about relationships identified amongst people, places, and organizations, either informally as prose or as formally expressed relation links. [14.3.2.3. Personal Relationships]
   element listRelation {
     (Tmodel.headLike*,
      Tdesc*,
@@ -7043,11 +7077,12 @@ TlistRelation =
     Tatt.global.attributes,
     Tatt.typed.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tlocation =
   
-  ## (location) defines the location of a place as a set of geographical coordinates, in terms of other named geo-political entities, or as an address. [13.3.4. Places]
+  ## (location) defines the location of a place as a set of geographical coordinates, in terms of other named geo-political entities, or as an address. [14.3.4. Places]
   element location {
     (Tmodel.labelLike
      | Tmodel.placeNamePart
@@ -7060,6 +7095,7 @@ Tlocation =
     Tatt.typed.attributes,
     Tatt.datable.attributes,
     Tatt.editLike.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7069,7 +7105,7 @@ Tlocation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-location-calendar-calendar-check-location-constraint-rule-68"
+           "testbasic-location-calendar-calendar-check-location-constraint-rule-69"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7094,7 +7130,7 @@ Tlocation =
   }
 Tnationality =
   
-  ## (nationality) contains an informal description of a person's present or past nationality or citizenship. [15.2.2. The Participant Description]
+  ## (nationality) contains an informal description of a person's present or past nationality or citizenship. [16.2.2. The Participant Description]
   element nationality {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -7104,7 +7140,6 @@ Tnationality =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] birth; 2] naturalised; 3] self-assigned
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7117,7 +7152,7 @@ Tnationality =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-nationality-calendar-calendar-check-nationality-constraint-rule-69"
+           "testbasic-nationality-calendar-calendar-check-nationality-constraint-rule-70"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7142,7 +7177,7 @@ Tnationality =
   }
 Toccupation =
   
-  ## (occupation) contains an informal description of a person's trade, profession or occupation. [15.2.2. The Participant Description]
+  ## (occupation) contains an informal description of a person's trade, profession or occupation. [16.2.2. The Participant Description]
   element occupation {
     Tmacro.specialPara,
     Tatt.global.attributes,
@@ -7152,7 +7187,6 @@ Toccupation =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] primary; 2] other; 3] paid; 4] unpaid
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7165,7 +7199,7 @@ Toccupation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-occupation-calendar-calendar-check-occupation-constraint-rule-70"
+           "testbasic-occupation-calendar-calendar-check-occupation-constraint-rule-71"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7210,7 +7244,7 @@ Toccupation =
   }
 Torg =
   
-  ## (organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [13.3.3. Organizational Data]
+  ## (organization) provides information about an identifiable organization such as a business, a tribe, or any other grouping of people. [14.3.3. Organizational Data]
   element org {
     (Tmodel.headLike*,
      (Tmodel.pLike*
@@ -7236,7 +7270,7 @@ Torg =
   }
 Tperson =
   
-  ## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [13.3.2. The Person Element 15.2.2. The Participant Description]
+  ## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [14.3.2. The Person Element 16.2.2. The Participant Description]
   element person {
     (Tmodel.pLike+ | (Tmodel.personPart | Tmodel.global | Tptr)*),
     Tatt.global.attributes,
@@ -7272,7 +7306,7 @@ Tperson =
   }
 Tpersona =
   
-  ## provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [13.3.2. The Person Element]
+  ## provides information about one of the personalities identified for a given individual, where an individual has multiple personalities. [14.3.2. The Person Element]
   element persona {
     (Tmodel.pLike+ | (Tmodel.personPart | Tmodel.global)*),
     Tatt.global.attributes,
@@ -7308,7 +7342,7 @@ Tpersona =
   }
 TpersonGrp =
   
-  ## (personal group) describes a group of individuals treated as a single person for analytic purposes. [15.2.2. The Participant Description]
+  ## (personal group) describes a group of individuals treated as a single person for analytic purposes. [16.2.2. The Participant Description]
   element personGrp {
     (Tmodel.pLike+ | (Tmodel.personPart | Tmodel.global)*),
     Tatt.global.attributes,
@@ -7348,12 +7382,13 @@ TpersonGrp =
   }
 TpersPronouns =
   
-  ## (personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [13.3.2.1. Personal Characteristics]
+  ## (personal pronouns) indicates the personal pronouns used, or assumed to be used, by the individual being described. [14.3.2.1. Personal Characteristics]
   element persPronouns {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.datable.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     
     ## (evidence) indicates support for the listed personal pronouns.
     ## Suggested values include: 1] conjecture (conjecture); 2] selfIdentification (self identification); 3] trustedThirdParty (trusted third party)
@@ -7378,7 +7413,7 @@ TpersPronouns =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-71"
+           "testbasic-persPronouns-calendar-calendar-check-persPronouns-constraint-rule-72"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7411,7 +7446,7 @@ TpersPronouns =
   }
 Tplace =
   
-  ## (place) contains data about a geographic location [13.3.4. Places]
+  ## (place) contains data about a geographic location [14.3.4. Places]
   element place {
     (Tmodel.headLike*,
      (Tmodel.pLike*
@@ -7434,7 +7469,7 @@ Tplace =
   }
 Tpopulation =
   
-  ## (population) contains information about the population of a place. [13.3.4.3. States, Traits, and Events]
+  ## (population) contains information about the population of a place. [14.3.4.3. States, Traits, and Events]
   element population {
     (Tmodel.headLike*,
      ((Tmodel.pLike+ | Tmodel.labelLike+),
@@ -7446,6 +7481,7 @@ Tpopulation =
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7455,7 +7491,7 @@ Tpopulation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-population-calendar-calendar-check-population-constraint-rule-72"
+           "testbasic-population-calendar-calendar-check-population-constraint-rule-73"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7480,11 +7516,11 @@ Tpopulation =
   }
 Trelation =
   
-  ## (relationship) describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items. [13.3.2.3. Personal Relationships]
+  ## (relationship) describes any kind of relationship or linkage amongst a specified group of places, events, persons, objects or other items. [14.3.2.3. Personal Relationships]
   element relation {
     (Tdesc?)
     >> sch:pattern [
-         id = "testbasic-relation-ref-or-key-or-name-constraint-rule-73"
+         id = "testbasic-relation-ref-or-key-or-name-constraint-rule-74"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7502,7 +7538,7 @@ Trelation =
          "         "
        ]
     >> sch:pattern [
-         id = "testbasic-relation-active-mutual-constraint-rule-74"
+         id = "testbasic-relation-active-mutual-constraint-rule-75"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7520,7 +7556,7 @@ Trelation =
          "         "
        ]
     >> sch:pattern [
-         id = "testbasic-relation-active-passive-constraint-rule-75"
+         id = "testbasic-relation-active-passive-constraint-rule-76"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7552,7 +7588,7 @@ Trelation =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-relation-calendar-calendar-check-relation-constraint-rule-76"
+           "testbasic-relation-calendar-calendar-check-relation-constraint-rule-77"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7603,7 +7639,7 @@ Trelation =
   }
 Tresidence =
   
-  ## (residence) describes a person's present or past places of residence. [15.2.2. The Participant Description]
+  ## (residence) describes a person's present or past places of residence. [16.2.2. The Participant Description]
   element residence {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -7613,7 +7649,6 @@ Tresidence =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] primary; 2] secondary; 3] temporary; 4] permanent
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7626,7 +7661,7 @@ Tresidence =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-residence-calendar-calendar-check-residence-constraint-rule-77"
+           "testbasic-residence-calendar-calendar-check-residence-constraint-rule-78"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7651,7 +7686,7 @@ Tresidence =
   }
 Tsex =
   
-  ## (sex) specifies the sex of an organism. [13.3.2.1. Personal Characteristics]
+  ## (sex) specifies the sex of an organism. [14.3.2.1. Personal Characteristics]
   element sex {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -7667,7 +7702,7 @@ Tsex =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-sex-calendar-calendar-check-sex-constraint-rule-78"
+           "testbasic-sex-calendar-calendar-check-sex-constraint-rule-79"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7699,7 +7734,7 @@ Tsex =
   }
 TsocecStatus =
   
-  ## (socio-economic status) contains an informal description of a person's perceived social or economic status. [15.2.2. The Participant Description]
+  ## (socio-economic status) contains an informal description of a person's perceived social or economic status. [16.2.2. The Participant Description]
   element socecStatus {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -7709,7 +7744,6 @@ TsocecStatus =
     Tatt.typed.attribute.subtype,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Sample values include: 1] atBirth; 2] atDeath; 3] dependent; 4] inherited; 5] independent
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -7722,7 +7756,7 @@ TsocecStatus =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-79"
+           "testbasic-socecStatus-calendar-calendar-check-socecStatus-constraint-rule-80"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7767,7 +7801,7 @@ TsocecStatus =
   }
 Tstate =
   
-  ## (state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics]
+  ## (state) contains a description of some status or quality attributed to a person, place, or organization often at some specific time or for a specific date range. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics]
   element state {
     (Tstate+
      | (Tmodel.headLike*,
@@ -7780,6 +7814,7 @@ Tstate =
     Tatt.typed.attributes,
     Tatt.naming.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7789,7 +7824,7 @@ Tstate =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-state-calendar-calendar-check-state-constraint-rule-80"
+           "testbasic-state-calendar-calendar-check-state-constraint-rule-81"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7814,7 +7849,7 @@ Tstate =
   }
 Tterrain =
   
-  ## (terrain) contains information about the physical terrain of a place. [13.3.4.3. States, Traits, and Events]
+  ## (terrain) contains information about the physical terrain of a place. [14.3.4.3. States, Traits, and Events]
   element terrain {
     (Tmodel.headLike*,
      (Tmodel.pLike+ | Tmodel.labelLike+),
@@ -7825,6 +7860,7 @@ Tterrain =
     Tatt.editLike.attributes,
     Tatt.naming.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7834,7 +7870,7 @@ Tterrain =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-terrain-calendar-calendar-check-terrain-constraint-rule-81"
+           "testbasic-terrain-calendar-calendar-check-terrain-constraint-rule-82"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7859,7 +7895,7 @@ Tterrain =
   }
 Ttrait =
   
-  ## (trait) contains a description of some status or quality attributed to a person, place, or organization typically, but not necessarily, independent of the volition or action of the holder and usually not at some specific time or for a specific date range. [13.3.1. Basic Principles 13.3.2.1. Personal Characteristics]
+  ## (trait) contains a description of some status or quality attributed to a person, place, or organization typically, but not necessarily, independent of the volition or action of the holder and usually not at some specific time or for a specific date range. [14.3.1. Basic Principles 14.3.2.1. Personal Characteristics]
   element trait {
     (Ttrait+
      | (Tmodel.headLike*,
@@ -7872,6 +7908,7 @@ Ttrait =
     Tatt.naming.attributes,
     Tatt.typed.attributes,
     Tatt.dimensions.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7881,7 +7918,7 @@ Ttrait =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-trait-calendar-calendar-check-trait-constraint-rule-82"
+           "testbasic-trait-calendar-calendar-check-trait-constraint-rule-83"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7906,7 +7943,7 @@ Ttrait =
   }
 TobjectName =
   
-  ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.5. Object Names]
+  ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [14.2.5. Object Names]
   element objectName {
     Tmacro.phraseSeq,
     Tatt.datable.attributes,
@@ -7914,6 +7951,7 @@ TobjectName =
     Tatt.global.attributes,
     Tatt.personal.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -7923,7 +7961,7 @@ TobjectName =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-objectName-calendar-calendar-check-objectName-constraint-rule-83"
+           "testbasic-objectName-calendar-calendar-check-objectName-constraint-rule-84"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7948,7 +7986,7 @@ TobjectName =
   }
 Tobject =
   
-  ## contains a description of a single identifiable physical object. [13.3.6. Objects]
+  ## contains a description of a single identifiable physical object. [14.3.6. Objects]
   element object {
     (TobjectIdentifier+,
      Tmodel.headLike*,
@@ -7965,7 +8003,7 @@ Tobject =
   }
 TlistObject =
   
-  ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [13.3.6. Objects]
+  ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [14.3.6. Objects]
   element listObject {
     (Tmodel.headLike*,
      Tdesc*,
@@ -7975,11 +8013,12 @@ TlistObject =
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TobjectIdentifier =
   
-  ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [13.3.6. Objects]
+  ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [14.3.6. Objects]
   element objectIdentifier {
     (Tmodel.placeNamePart | Tidno | TobjectName | Taddress)+,
     Tatt.global.attributes,
@@ -7987,7 +8026,7 @@ TobjectIdentifier =
   }
 Tnym =
   
-  ## (canonical name) contains the definition for a canonical name or name component of any kind. [13.3.7. Names and Nyms]
+  ## (canonical name) contains the definition for a canonical name or name component of any kind. [14.3.7. Names and Nyms]
   element nym {
     (Tidno*, Tmodel.entryPart*, Tmodel.pLike*, Tnym*),
     Tatt.global.attributes,
@@ -8004,7 +8043,7 @@ Tnym =
   }
 TlistNym =
   
-  ## (list of canonical names) contains a list of nyms, that is, standardized names for any thing. [13.3.7. Names and Nyms]
+  ## (list of canonical names) contains a list of nyms, that is, standardized names for any thing. [14.3.7. Names and Nyms]
   element listNym {
     (Tmodel.headLike*,
      Tdesc*,
@@ -8014,6 +8053,7 @@ TlistNym =
     Tatt.typed.attributes,
     Tatt.declarable.attributes,
     Tatt.sortable.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tatt.global.facs.attributes = Tatt.global.facs.attribute.facs
@@ -8105,12 +8145,12 @@ Tatt.coordinated.attribute.points =
   }?
 Tfacsimile =
   
-  ## contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text. [11.1. Digital Facsimiles]
+  ## contains a representation of some written source in the form of a set of images rather than as transcribed or encoded text. [12.1. Digital Facsimiles]
   element facsimile {
     (Tfront?, (Tmodel.graphicLike | Tsurface | TsurfaceGrp)+, Tback?)
     >> sch:pattern [
          id =
-           "testbasic-facsimile-no_facsimile_text_nodes-constraint-rule-84"
+           "testbasic-facsimile-no_facsimile_text_nodes-constraint-rule-85"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8136,7 +8176,7 @@ Tfacsimile =
   }
 TsourceDoc =
   
-  ## contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]
+  ## contains a transcription or other representation of a single source document potentially forming part of a dossier génétique or collection of sources. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]
   element sourceDoc {
     (Tmodel.global | Tmodel.graphicLike | Tsurface | TsurfaceGrp)+,
     Tatt.global.attributes,
@@ -8145,7 +8185,7 @@ TsourceDoc =
   }
 Tsurface =
   
-  ## defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]
+  ## defines a written surface as a two-dimensional coordinate space, optionally grouping one or more graphic representations of that space, zones of interest within that space, and, when using an embedded transcription approach, transcriptions of the writing within them. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]
   element surface {
     ((Tmodel.global | Tmodel.labelLike | Tmodel.graphicLike)*,
      ((Tzone | Tline | Tpath | Tsurface | TsurfaceGrp),
@@ -8167,7 +8207,7 @@ Tsurface =
   }
 TsurfaceGrp =
   
-  ## (surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [11.1. Digital Facsimiles]
+  ## (surface group) defines any kind of useful grouping of written surfaces, for example the recto and verso of a single leaf, which the encoder wishes to treat as a single unit. [12.1. Digital Facsimiles]
   element surfaceGrp {
     (Tmodel.global | Tsurface | TsurfaceGrp)+,
     Tatt.global.attributes,
@@ -8180,7 +8220,7 @@ Tzone =
     a:documentation [
       "defines any two-dimensional area within a "
       ns1:code [ "<surface>" ]
-      " element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]"
+      " element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]"
     ]
   ]
   element zone {
@@ -8214,13 +8254,13 @@ Tpath =
     a:documentation [
       "(path) defines any line passing through two or more points within a "
       ns1:code [ "<surface>" ]
-      " element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription]"
+      " element. [12.1. Digital Facsimiles 12.2.2. Embedded Transcription]"
     ]
   ]
   element path {
     empty
     >> sch:pattern [
-         id = "testbasic-path-pathmustnotbeclosed-constraint-rule-85"
+         id = "testbasic-path-pathmustnotbeclosed-constraint-rule-86"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8306,14 +8346,14 @@ TaddSpan =
     a:documentation [
       "(added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also "
       ns1:code [ "<add>" ]
-      "). [11.3.1.4. Additions and Deletions]"
+      "). [12.3.1.4. Additions and Deletions]"
     ]
   ]
   element addSpan {
     empty
     >> sch:pattern [
          id =
-           "testbasic-addSpan-addSpan-requires-spanTo-constraint-rule-86"
+           "testbasic-addSpan-addSpan-requires-spanTo-constraint-rule-87"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8334,7 +8374,7 @@ TaddSpan =
        ]
     >> sch:pattern [
          id =
-           "testbasic-addSpan-addSpan-requires-spanTo-fr-constraint-rule-87"
+           "testbasic-addSpan-addSpan-requires-spanTo-fr-constraint-rule-88"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8361,7 +8401,7 @@ TaddSpan =
   }
 Tdamage =
   
-  ## (damage) contains an area of damage to the text witness. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (damage) contains an area of damage to the text witness. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element damage {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8371,12 +8411,12 @@ Tdamage =
   }
 TdamageSpan =
   
-  ## (damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element damageSpan {
     empty
     >> sch:pattern [
          id =
-           "testbasic-damageSpan-damageSpan-requires-spanTo-constraint-rule-88"
+           "testbasic-damageSpan-damageSpan-requires-spanTo-constraint-rule-89"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8397,7 +8437,7 @@ TdamageSpan =
        ]
     >> sch:pattern [
          id =
-           "testbasic-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-89"
+           "testbasic-damageSpan-damageSpan-requires-spanTo-fr-constraint-rule-90"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8422,12 +8462,12 @@ TdamageSpan =
   }
 TdelSpan =
   
-  ## (deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [11.3.1.4. Additions and Deletions]
+  ## (deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [12.3.1.4. Additions and Deletions]
   element delSpan {
     empty
     >> sch:pattern [
          id =
-           "testbasic-delSpan-delSpan-requires-spanTo-constraint-rule-90"
+           "testbasic-delSpan-delSpan-requires-spanTo-constraint-rule-91"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8448,7 +8488,7 @@ TdelSpan =
        ]
     >> sch:pattern [
          id =
-           "testbasic-delSpan-delSpan-requires-spanTo-fr-constraint-rule-91"
+           "testbasic-delSpan-delSpan-requires-spanTo-fr-constraint-rule-92"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8474,7 +8514,7 @@ TdelSpan =
   }
 Tex =
   
-  ## (editorial expansion) contains a sequence of letters added by an editor or transcriber when expanding an abbreviation. [11.3.1.2. Abbreviation and Expansion]
+  ## (editorial expansion) contains a sequence of letters added by an editor or transcriber when expanding an abbreviation. [12.3.1.2. Abbreviation and Expansion]
   element ex {
     Tmacro.xtext,
     Tatt.global.attributes,
@@ -8484,7 +8524,7 @@ Tex =
   }
 Tfw =
   
-  ## (forme work) contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page. [11.6. Headers, Footers, and Similar Matter]
+  ## (forme work) contains a running head (e.g. a header, footer), catchword, or similar material appearing on the current page. [12.6. Headers, Footers, and Similar Matter]
   element fw {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
@@ -8493,7 +8533,6 @@ Tfw =
     Tatt.written.attributes,
     
     ## classifies the material encoded according to some useful typology.
-    ## Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNum (line number); 5] sig (signature); 6] catch (catchword)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -8504,13 +8543,13 @@ ThandNotes =
     a:documentation [
       "contains one or more "
       ns1:code [ "<handNote>" ]
-      " elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands]"
+      " elements documenting the different hands identified within the source texts. [12.3.2.1. Document Hands]"
     ]
   ]
   element handNotes { ThandNote+, Tatt.global.attributes, empty }
 ThandShift =
   
-  ## (handwriting shift) marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint. [11.3.2.1. Document Hands]
+  ## (handwriting shift) marks the beginning of a sequence of text written in a new hand, or the beginning of a scribal stint. [12.3.2.1. Document Hands]
   element handShift {
     empty,
     Tatt.global.attributes,
@@ -8529,7 +8568,7 @@ ThandShift =
   }
 Tam =
   
-  ## (abbreviation marker) contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation. [11.3.1.2. Abbreviation and Expansion]
+  ## (abbreviation marker) contains a sequence of letters or signs present in an abbreviation which are omitted or replaced in the expanded form of the abbreviation. [12.3.1.2. Abbreviation and Expansion]
   element am {
     (text | Tmodel.gLike | Tmodel.pPart.transcriptional)*,
     Tatt.global.attributes,
@@ -8539,7 +8578,7 @@ Tam =
   }
 Trestore =
   
-  ## (restore) indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction. [11.3.1.6. Cancellation of Deletions and Other Markings]
+  ## (restore) indicates restoration of text to an earlier state by cancellation of an editorial or authorial marking or instruction. [12.3.1.6. Cancellation of Deletions and Other Markings]
   element restore {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8550,7 +8589,7 @@ Trestore =
   }
 Tspace =
   
-  ## (space) indicates the location of a significant space in the text. [11.4.1. Space]
+  ## (space) indicates the location of a significant space in the text. [12.4.1. Space]
   element space {
     (Tmodel.descLike | Tmodel.certLike)*,
     Tatt.global.attribute.xmlid,
@@ -8591,11 +8630,11 @@ Tspace =
   }
 Tsubst =
   
-  ## (substitution) groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text. [11.3.1.5. Substitutions]
+  ## (substitution) groups one or more deletions (or surplus text) with one or more additions when the combination is to be regarded as a single intervention in the text. [12.3.1.5. Substitutions]
   element subst {
     ((Tadd | Tsurplus | Tdel | Tmodel.milestoneLike)+)
     >> sch:pattern [
-         id = "testbasic-subst-substContents1-constraint-rule-92"
+         id = "testbasic-subst-substContents1-constraint-rule-93"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8623,7 +8662,7 @@ Tsubst =
   }
 TsubstJoin =
   
-  ## (substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions]
+  ## (substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [12.3.1.5. Substitutions]
   element substJoin {
     (Tmodel.descLike | Tmodel.certLike)*,
     Tatt.global.attributes,
@@ -8634,7 +8673,7 @@ TsubstJoin =
   }
 Tsupplied =
   
-  ## (supplied) signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (supplied) signifies text supplied by the transcriber or editor for any reason; for example because the original cannot be read due to physical damage, or because of an obvious omission by the author or scribe. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element supplied {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8651,7 +8690,7 @@ Tsupplied =
   }
 Tsurplus =
   
-  ## (surplus) marks text present in the source which the editor believes to be superfluous or redundant. [11.3.3.1. Damage, Illegibility, and Supplied Text]
+  ## (surplus) marks text present in the source which the editor believes to be superfluous or redundant. [12.3.3.1. Damage, Illegibility, and Supplied Text]
   element surplus {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8668,7 +8707,7 @@ Tsurplus =
   }
 Tsecl =
   
-  ## (secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [11.3.1.7. Text Omitted from or Supplied in the Transcription]
+  ## (secluded text) Secluded. Marks text present in the source which the editor believes to be genuine but out of its original place (which is unknown). [12.3.1.7. Text Omitted from or Supplied in the Transcription]
   element secl {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8685,7 +8724,7 @@ Tsecl =
   }
 Tline =
   
-  ## contains the transcription of a topographic line in the source document [11.2.2. Embedded Transcription]
+  ## contains the transcription of a topographic line in the source document [12.2.2. Embedded Transcription]
   element line {
     (text | Tmodel.global | Tmodel.gLike | Tmodel.linePart)*,
     Tatt.typed.attributes,
@@ -8696,11 +8735,11 @@ Tline =
   }
 TlistTranspose =
   
-  ## supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [11.3.4.5. Transpositions]
+  ## supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [12.3.4.5. Transpositions]
   element listTranspose { Tdesc*, Tatt.global.attributes, empty }
 Tmetamark =
   
-  ## contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [11.3.4.2. Metamarks]
+  ## contains or describes any kind of graphic or written signal within a document the function of which is to determine how it should be read rather than forming part of the actual content of the document. [12.3.4.2. Metamarks]
   element metamark {
     Tmacro.specialPara,
     Tatt.spanning.attributes,
@@ -8722,7 +8761,7 @@ Tmetamark =
   }
 Tmod =
   
-  ## represents any kind of modification identified within a single document. [11.3.4.1. Generic Modification]
+  ## represents any kind of modification identified within a single document. [12.3.4.1. Generic Modification]
   element mod {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8734,7 +8773,7 @@ Tmod =
   }
 Tredo =
   
-  ## indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
+  ## indicates one or more cancelled interventions in a document which have subsequently been marked as reaffirmed or repeated. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
   element redo {
     empty,
     Tatt.global.attributes,
@@ -8752,7 +8791,7 @@ Tredo =
   }
 Tretrace =
   
-  ## contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [11.3.4.3. Fixation and Clarification]
+  ## contains a sequence of writing which has been retraced, for example by over-inking, to clarify or fix it. [12.3.4.3. Fixation and Clarification]
   element retrace {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8763,7 +8802,7 @@ Tretrace =
   }
 Tundo =
   
-  ## indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [11.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
+  ## indicates one or more marked-up interventions in a document which have subsequently been marked for cancellation. [12.3.4.4. Confirmation, Cancellation, and Reinstatement of Modifications]
   element undo {
     empty,
     Tatt.global.attributes,
@@ -8807,13 +8846,14 @@ Tatt.tableDecoration.attribute.cols =
   [ a:defaultValue = "1" ] attribute cols { xsd:nonNegativeInteger }?
 Ttable =
   
-  ## (table) contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables]
+  ## (table) contains text displayed in tabular form, in rows and columns. [15.1.1. TEI Tables]
   element table {
     ((Tmodel.headLike | Tmodel.global)*,
      ((Trow, Tmodel.global*)+ | (Tmodel.graphicLike, Tmodel.global*)+),
      (Tmodel.divBottom, Tmodel.global*)*),
     Tatt.global.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     
     ## (rows) indicates the number of rows in the table.
     attribute rows { xsd:nonNegativeInteger }?,
@@ -8824,7 +8864,7 @@ Ttable =
   }
 Trow =
   
-  ## (row) contains one row of a table. [14.1.1. TEI Tables]
+  ## (row) contains one row of a table. [15.1.1. TEI Tables]
   element row {
     Tcell+,
     Tatt.global.attributes,
@@ -8833,7 +8873,7 @@ Trow =
   }
 Tcell =
   
-  ## (cell) contains one cell of a table. [14.1.1. TEI Tables]
+  ## (cell) contains one cell of a table. [15.1.1. TEI Tables]
   element cell {
     Tmacro.specialPara,
     Tatt.global.attributes,
@@ -8842,16 +8882,17 @@ Tcell =
   }
 Tformula =
   
-  ## (formula) contains a mathematical or other formula. [14.2. Formulæ and Mathematical Expressions]
+  ## (formula) contains a mathematical or other formula. [15.2. Formulæ and Mathematical Expressions]
   element formula {
     (text | Tmodel.graphicLike | Tmodel.hiLike)*,
     Tatt.global.attributes,
     Tatt.notated.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TnotatedMusic =
   
-  ## encodes the presence of music notation in a text [14.3. Notated Music in Written Text]
+  ## encodes the presence of music notation in a text [15.3. Notated Music in Written Text]
   element notatedMusic {
     (Tmodel.labelLike
      | Tmodel.ptrLike
@@ -8861,11 +8902,12 @@ TnotatedMusic =
     Tatt.global.attributes,
     Tatt.placement.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tfigure =
   
-  ## (figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [14.4. Specific Elements for Graphic Images]
+  ## (figure) groups elements representing or containing graphic information such as an illustration, formula, or figure. [15.4. Specific Elements for Graphic Images]
   element figure {
     (Tmodel.headLike
      | Tmodel.common
@@ -8877,21 +8919,22 @@ Tfigure =
     Tatt.placement.attributes,
     Tatt.typed.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TfigDesc =
   
-  ## (description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [14.4. Specific Elements for Graphic Images]
+  ## (description of figure) contains a brief prose description of the appearance or content of a graphic figure, for use when documenting an image without displaying it. [15.4. Specific Elements for Graphic Images]
   element figDesc {
     Tmacro.limitedContent, Tatt.global.attributes, empty
   }
 Tlink =
   
-  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]
+  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]
   element link {
     empty
     >> sch:pattern [
-         id = "testbasic-link-linkTargets3-constraint-rule-93"
+         id = "testbasic-link-linkTargets3-constraint-rule-94"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8914,25 +8957,27 @@ Tlink =
     Tatt.global.attributes,
     Tatt.pointing.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TlinkGrp =
   
-  ## (link group) defines a collection of associations or hypertextual links. [16.1. Links]
+  ## (link group) defines a collection of associations or hypertextual links. [17.1. Links]
   element linkGrp {
     (Tmodel.descLike*, (Tlink | Tptr)+),
     Tatt.global.attributes,
     Tatt.pointing.group.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tab =
   
-  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]
+  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]
   element ab {
     Tmacro.abContent
     >> sch:pattern [
          id =
-           "testbasic-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-94"
+           "testbasic-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-95"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8957,17 +9002,22 @@ Tab =
     Tatt.declaring.attributes,
     Tatt.fragmentable.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tanchor =
   
-  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
+  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]
   element anchor {
-    empty, Tatt.global.attributes, Tatt.typed.attributes, empty
+    empty,
+    Tatt.global.attributes,
+    Tatt.typed.attributes,
+    Tatt.cmc.attributes,
+    empty
   }
 Tseg =
   
-  ## (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
+  ## (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
   element seg {
     Tmacro.paraContent,
     Tatt.global.attributes,
@@ -8975,11 +9025,12 @@ Tseg =
     Tatt.typed.attributes,
     Tatt.written.attributes,
     Tatt.notated.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Twhen =
   
-  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]
+  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]
   element when {
     empty,
     Tatt.global.attributes,
@@ -9051,10 +9102,11 @@ Twhen =
   }
 Ttimeline =
   
-  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]
+  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]
   element timeline {
     Twhen+,
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
     attribute origin {
@@ -9104,11 +9156,11 @@ Ttimeline =
   }
 Tjoin =
   
-  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation]
+  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation]
   element join {
     ((Tmodel.descLike | Tmodel.certLike)*)
     >> sch:pattern [
-         id = "testbasic-join-joinTargets3-constraint-rule-95"
+         id = "testbasic-join-joinTargets3-constraint-rule-96"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9132,6 +9184,7 @@ Tjoin =
     Tatt.global.attributes,
     Tatt.pointing.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     
     ## specifies the name of an element which this aggregation may be understood to represent.
     attribute result { xsd:Name }?,
@@ -9163,13 +9216,14 @@ TjoinGrp =
     a:documentation [
       "(join group) groups a collection of "
       ns1:code [ "<join>" ]
-      " elements and possibly pointers. [16.7. Aggregation]"
+      " elements and possibly pointers. [17.7. Aggregation]"
     ]
   ]
   element joinGrp {
     ((Tgloss | Tmodel.descLike)*, (Tjoin | Tptr)+),
     Tatt.global.attributes,
     Tatt.pointing.group.attributes,
+    Tatt.cmc.attributes,
     [
       a:documentation [
         "supplies the default value for the "
@@ -9184,13 +9238,14 @@ TjoinGrp =
   }
 Talt =
   
-  ## (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]
+  ## (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]
   element alt {
     empty,
     Tatt.global.attributes,
     Tatt.pointing.attribute.targetLang,
     Tatt.pointing.attribute.evaluate,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
@@ -9233,13 +9288,14 @@ TaltGrp =
     a:documentation [
       "(alternation group) groups a collection of "
       ns1:code [ "<alt>" ]
-      " elements and possibly pointers. [16.8. Alternation]"
+      " elements and possibly pointers. [17.8. Alternation]"
     ]
   ]
   element altGrp {
     (Tmodel.descLike*, (Talt | Tptr)*),
     Tatt.global.attributes,
     Tatt.pointing.group.attributes,
+    Tatt.cmc.attributes,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
     [ a:defaultValue = "excl" ]
@@ -9255,12 +9311,12 @@ TaltGrp =
   }
 TstandOff =
   
-  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]
+  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]
   element standOff {
     (Tmodel.standOffPart+)
     >> sch:pattern [
          id =
-           "testbasic-standOff-nested_standOff_should_be_typed-constraint-rule-96"
+           "testbasic-standOff-nested_standOff_should_be_typed-constraint-rule-97"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9300,7 +9356,7 @@ TlistAnnotation =
       ns1:code [ "<note>" ]
       ", possibly organized with nested "
       ns1:code [ "<listAnnotation>" ]
-      " elements. [16.10. The standOff Container]"
+      " elements. [17.10. The standOff Container]"
     ]
   ]
   element listAnnotation {
@@ -9322,7 +9378,7 @@ Tannotation =
         "Web\x{a}" ~
         "      Annotation Data Model"
       ]
-      ". [16.10. The standOff Container]"
+      ". [17.10. The standOff Container]"
     ]
   ]
   element annotation {
@@ -9413,7 +9469,7 @@ TTEI =
       ns1:code [ "<TEI>" ]
       " (or "
       ns1:code [ "<teiCorpus>" ]
-      ") element. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      ") element. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element TEI {
@@ -9448,7 +9504,7 @@ TTEI =
   }
 Ttext =
   
-  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element text {
     (Tmodel.global*,
      (Tfront, Tmodel.global*)?,
@@ -9481,7 +9537,7 @@ Tbody =
   }
 Tgroup =
   
-  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]
+  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]
   element group {
     ((Tmodel.divTop | Tmodel.global)*,
      ((Ttext | Tgroup), (Ttext | Tgroup | Tmodel.global)*),
@@ -9503,6 +9559,7 @@ TfloatingText =
     Tatt.global.attributes,
     Tatt.declaring.attributes,
     Tatt.typed.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tdiv =
@@ -9516,7 +9573,7 @@ Tdiv =
       (Tmodel.divBottom, Tmodel.global*)*)?)
     >> sch:pattern [
          id =
-           "testbasic-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-97"
+           "testbasic-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-98"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9538,7 +9595,7 @@ Tdiv =
        ]
     >> sch:pattern [
          id =
-           "testbasic-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-98"
+           "testbasic-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-99"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -9596,6 +9653,7 @@ Ttrailer =
     Tatt.typed.attributes,
     Tatt.placement.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tbyline =
@@ -9604,6 +9662,7 @@ Tbyline =
   element byline {
     (text | Tmodel.gLike | Tmodel.phrase | TdocAuthor | Tmodel.global)*,
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tdateline =
@@ -9612,6 +9671,7 @@ Tdateline =
   element dateline {
     (text | Tmodel.gLike | Tmodel.phrase | Tmodel.global | TdocDate)*,
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Targument =
@@ -9621,13 +9681,17 @@ Targument =
     ((Tmodel.global | Tmodel.headLike)*,
      (Tmodel.common, Tmodel.global*)+),
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tepigraph =
   
   ## (epigraph) contains a quotation, anonymous or attributed, appearing at the start or end of a section or on a title page. [4.2.3. Arguments, Epigraphs, and Postscripts 4.2. Elements Common to All Divisions 4.6. Title Pages]
   element epigraph {
-    (Tmodel.common | Tmodel.global)*, Tatt.global.attributes, empty
+    (Tmodel.common | Tmodel.global)*,
+    Tatt.global.attributes,
+    Tatt.cmc.attributes,
+    empty
   }
 Topener =
   
@@ -9645,6 +9709,7 @@ Topener =
      | Tmodel.global)*,
     Tatt.global.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tcloser =
@@ -9660,6 +9725,7 @@ Tcloser =
      | Tmodel.global)*,
     Tatt.global.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tsalute =
@@ -9669,6 +9735,7 @@ Tsalute =
     Tmacro.paraContent,
     Tatt.global.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tsigned =
@@ -9678,6 +9745,7 @@ Tsigned =
     Tmacro.paraContent,
     Tatt.global.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Tpostscript =
@@ -9690,6 +9758,7 @@ Tpostscript =
      (Tmodel.divBottomPart, Tmodel.global*)*),
     Tatt.global.attributes,
     Tatt.written.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 TtitlePage =
@@ -9726,25 +9795,9 @@ TtitlePart =
     Tatt.typed.attribute.subtype,
     
     ## (type) specifies the role of this subdivision of the title.
-    ## Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)
     [ a:defaultValue = "main" ]
     attribute type {
-      
-      ## (main) main title of the work
-      "main"
-      | 
-        ## (subordinate) subtitle of the work
-        "sub"
-      | 
-        ## (alternate) alternative title of the work
-        "alt"
-      | 
-        ## (short) abbreviated form of title
-        "short"
-      | 
-        ## (descriptive) descriptive paraphrase of the work
-        "desc"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -9755,6 +9808,7 @@ TdocAuthor =
     Tmacro.phraseSeq,
     Tatt.global.attributes,
     Tatt.canonical.attributes,
+    Tatt.cmc.attributes,
     empty
   }
 Timprimatur =
@@ -9789,6 +9843,7 @@ TdocDate =
   element docDate {
     Tmacro.phraseSeq,
     Tatt.global.attributes,
+    Tatt.cmc.attributes,
     Tatt.datable.attributes,
     Tatt.calendarSystem.attributes,
     empty
@@ -9912,7 +9967,7 @@ Tatt.global.attribute.xmlspace =
   }?
 Tsetting =
   
-  ## describes one particular setting in which a language interaction takes place. [15.2.3. The Setting Description]
+  ## describes one particular setting in which a language interaction takes place. [16.2.3. The Setting Description]
   element setting {
     (TpersName | Tplatypus | Tmodel.dateLike | Tmodel.settingPart)+,
     Tatt.global.attributes,
@@ -9921,7 +9976,7 @@ Tsetting =
   }
 TsettingDesc =
   
-  ## (setting description) describes the setting or settings within which a language interaction takes place, or other places otherwise referred to in a text, edition, or metadata. [15.2. Contextual Information 2.4. The Profile Description]
+  ## (setting description) describes the setting or settings within which a language interaction takes place, or other places otherwise referred to in a text, edition, or metadata. [16.2. Contextual Information 2.4. The Profile Description]
   element settingDesc {
     (Tplace | Tsetting)+,
     Tatt.global.attributes,
@@ -9970,7 +10025,7 @@ TMenu =
   }
 start = TTEI | Tdiv
 sch:pattern [
-  id = "testbasic-outerconstraint-constraint-rule-99"
+  id = "testbasic-outerconstraint-constraint-rule-100"
   "\x{a}" ~
   "      "
   sch:rule [
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index f5619bce1..4f7105dd4 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -217,6 +217,48 @@ tei_att.breaking.attribute.break =
   attribute break {
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
+tei_att.cmc.attributes = tei_att.cmc.attribute.generatedBy
+tei_att.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "foo-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 tei_att.cReferencing.attributes = tei_att.cReferencing.attribute.cRef
 tei_att.cReferencing.attribute.cRef =
   [
@@ -299,7 +341,7 @@ tei_att.datable.w3c.attribute.to =
     | xsd:dateTime
   }?
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-when-constraint-rule-1"
+  id = "foo-att.datable.w3c-att-datable-w3c-when-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -318,7 +360,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-from-constraint-rule-2"
+  id = "foo-att.datable.w3c-att-datable-w3c-from-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -337,7 +379,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-to-constraint-rule-3"
+  id = "foo-att.datable.w3c-att-datable-w3c-to-constraint-rule-4"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -608,7 +650,7 @@ tei_att.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-4"
+    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-5"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -897,7 +939,7 @@ tei_att.measurement.attribute.commodity =
     }
   }?
 sch:pattern [
-  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-5"
+  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1003,7 +1045,7 @@ tei_att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "foo-att.typed-subtypeTyped-constraint-rule-6"
+  id = "foo-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1046,7 +1088,7 @@ tei_att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1167,7 +1209,7 @@ tei_att.spanning.attribute.spanTo =
   }?
 sch:pattern [
   id =
-    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1224,7 +1266,7 @@ tei_att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1860,6 +1902,7 @@ tei_model.global =
 tei_model.biblPart =
   tei_model.respLike
   | tei_model.imprintPart
+  | tei_quote
   | tei_series
   | tei_citedRange
   | tei_bibl
@@ -1914,7 +1957,9 @@ tei_model.inter =
   | tei_model.listLike
   | tei_model.stageLike
   | tei_model.attributable
-tei_model.common = tei_model.divPart | tei_model.inter | tei_q
+tei_model.cmc = notAllowed
+tei_model.common =
+  tei_model.divPart | tei_model.inter | tei_model.cmc | tei_q
 tei_model.phrase =
   tei_model.segLike
   | tei_model.highlighted
@@ -1991,6 +2036,7 @@ tei_model.standOffPart =
   | tei_model.biblLike
   | tei_model.listLike
   | tei_model.annotationLike
+  | tei_xenoData
   | tei_listChange
   | tei_seg
   | tei_listAnnotation
@@ -2065,7 +2111,7 @@ tei_att.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2150,7 +2196,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2172,7 +2218,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2196,19 +2242,26 @@ tei_p =
     tei_att.declaring.attributes,
     tei_att.fragmentable.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_foreign =
   
   ## (foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]
   element tei:foreign {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_emph =
   
   ## (emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
   element tei:emph {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_hi =
   
@@ -2217,6 +2270,7 @@ tei_hi =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_distinct =
@@ -2226,6 +2280,7 @@ tei_distinct =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## specifies the sublanguage or register to which the word or phrase is being assigned
     attribute type {
@@ -2249,6 +2304,7 @@ tei_said =
     tei_macro.specialPara,
     tei_att.global.attributes,
     tei_att.ascribed.directed.attributes,
+    tei_att.cmc.attributes,
     
     ## may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.
     attribute aloud {
@@ -2282,6 +2338,7 @@ tei_quote =
     tei_att.global.attributes,
     tei_att.typed.attributes,
     tei_att.notated.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_q =
@@ -2291,6 +2348,7 @@ tei_q =
     tei_macro.specialPara,
     tei_att.global.attributes,
     tei_att.ascribed.directed.attributes,
+    tei_att.cmc.attributes,
     
     ## (type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
     ## Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (written); 4] soCalled (so called); 5] foreign (foreign); 6] distinct (distinct); 7] term; 8] emph (emph); 9] mentioned (mentioned)
@@ -2328,7 +2386,7 @@ tei_q =
   }
 tei_cit =
   
-  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]
+  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]
   element tei:cit {
     (tei_model.biblLike
      | tei_model.egLike
@@ -2340,28 +2398,35 @@ tei_cit =
      | tei_q)+,
     tei_att.global.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_mentioned =
   
   ## marks words or phrases mentioned, not used. [3.3.3. Quotation]
   element tei:mentioned {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_soCalled =
   
   ## (so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]
   element tei:soCalled {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_desc =
   
-  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]
+  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]
   element tei:desc {
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2384,21 +2449,17 @@ tei_desc =
        ],
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Suggested values include: 1] deprecationInfo (deprecation information)
     attribute type {
-      
-      ## (deprecation
-      ##           information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
-      "deprecationInfo"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
 tei_gloss =
   
-  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]
+  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]
   element tei:gloss {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
@@ -2406,6 +2467,7 @@ tei_gloss =
     tei_att.typed.attributes,
     tei_att.pointing.attributes,
     tei_att.cReferencing.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_term =
@@ -2420,6 +2482,7 @@ tei_term =
     tei_att.canonical.attributes,
     tei_att.sortable.attributes,
     tei_att.cReferencing.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ruby =
@@ -2429,6 +2492,7 @@ tei_ruby =
     (tei_rb, tei_rt+),
     tei_att.global.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_rb =
@@ -2455,7 +2519,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-rule-14"
+         id = "foo-rt-target-rt-target-not-span-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2478,7 +2542,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-from-rt-from-constraint-rule-15"
+         id = "foo-rt-from-rt-from-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2503,7 +2567,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-to-rt-to-constraint-rule-16"
+         id = "foo-rt-to-rt-to-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2528,7 +2592,10 @@ tei_sic =
   
   ## (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]
   element tei:sic {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_corr =
   
@@ -2538,6 +2605,7 @@ tei_corr =
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_choice =
@@ -2548,25 +2616,30 @@ tei_choice =
     (tei_model.choicePart | tei_choice),
     (tei_model.choicePart | tei_choice)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_reg =
   
   ## (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element tei:reg {
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_orig =
   
   ## (original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element tei:orig {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_gap =
   
@@ -2577,6 +2650,7 @@ tei_gap =
     tei_att.timed.attributes,
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     
     ## (reason) gives the reason for omission
     ## Suggested values include: 1] cancelled (cancelled); 2] deleted (deleted); 3] editorial (editorial); 4] illegible (illegible); 5] inaudible (inaudible); 6] irrelevant (irrelevant); 7] sampling (sampling)
@@ -2634,6 +2708,7 @@ tei_add =
     tei_att.placement.attributes,
     tei_att.typed.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_del =
@@ -2645,16 +2720,18 @@ tei_del =
     tei_att.transcriptional.attributes,
     tei_att.typed.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_unclear =
   
-  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
+  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
   element tei:unclear {
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates why the material is hard to transcribe.
     ## Suggested values include: 1] illegible (illegible); 2] inaudible (inaudible); 3] faded (faded); 4] background_noise (background noise); 5] eccentric_ductus (eccentric ductus)
@@ -2696,6 +2773,7 @@ tei_name =
     tei_att.datable.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -2704,7 +2782,7 @@ tei_name =
        }
      }?)
     >> sch:pattern [
-         id = "foo-name-calendar-calendar-check-name-constraint-rule-17"
+         id = "foo-name-calendar-calendar-check-name-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2729,19 +2807,23 @@ tei_name =
   }
 tei_rs =
   
-  ## (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]
+  ## (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]
   element tei:rs {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.naming.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_email =
   
   ## (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]
   element tei:email {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_address =
   
@@ -2749,6 +2831,7 @@ tei_address =
   element tei:address {
     (tei_model.global*, (tei_model.addrPart, tei_model.global*)+),
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_addrLine =
@@ -2780,23 +2863,11 @@ tei_num =
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
     tei_att.ranging.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates the type of numeric value.
-    ## Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage
     attribute type {
-      
-      ## absolute number, e.g. 21, 21.5
-      "cardinal"
-      | 
-        ## ordinal number, e.g. 21st
-        "ordinal"
-      | 
-        ## fraction, e.g. one half or three-quarters
-        "fraction"
-      | 
-        ## a percentage
-        "percentage"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     
     ## supplies the value of the number in standard form.
@@ -2816,6 +2887,7 @@ tei_measure =
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
     tei_att.measurement.attributes,
+    tei_att.cmc.attributes,
     tei_att.ranging.attributes,
     
     ## specifies the type of measurement in any convenient typology.
@@ -2826,12 +2898,13 @@ tei_measure =
   }
 tei_measureGrp =
   
-  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]
+  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]
   element tei:measureGrp {
     (text | tei_model.gLike | tei_model.measureLike)*,
     tei_att.global.attributes,
     tei_att.measurement.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_unit =
@@ -2843,11 +2916,12 @@ tei_unit =
     tei_att.global.attributes,
     tei_att.typed.attributes,
     tei_att.measurement.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_date =
   
-  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]
+  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]
   element tei:date {
     (text | tei_model.gLike | tei_model.phrase | tei_model.global)*,
     tei_att.global.attributes,
@@ -2857,6 +2931,7 @@ tei_date =
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_time =
@@ -2871,6 +2946,7 @@ tei_time =
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_abbr =
@@ -2880,9 +2956,9 @@ tei_abbr =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## (type) allows the encoder to classify the abbreviation according to some convenient typology.
-    ## Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -2895,15 +2971,16 @@ tei_expan =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ptr =
   
-  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]
   element tei:ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-rule-18"
+         id = "foo-ptr-ptrAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2928,15 +3005,16 @@ tei_ptr =
     tei_att.internetMedia.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ref =
   
-  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]
   element tei:ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-rule-19"
+         id = "foo-ref-refAtts-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2962,6 +3040,7 @@ tei_ref =
     tei_att.internetMedia.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_list =
@@ -2975,7 +3054,7 @@ tei_list =
          (tei_label, tei_model.global*, tei_item, tei_model.global*)+)),
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-list-gloss-list-must-have-labels-constraint-rule-20"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2995,31 +3074,11 @@ tei_list =
     tei_att.global.attributes,
     tei_att.sortable.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## (type) describes the nature of the items in the list.
-    ## Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)
     attribute type {
-      [
-        a:documentation [
-          "(gloss) each list item glosses some term or concept, which is given by a "
-          ns1:code [ "<label>" ]
-          " element preceding the list item."
-        ]
-      ]
-      "gloss"
-      | 
-        ## (index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.
-        "index"
-      | 
-        ## (instructions) each list item is a step in a sequence of instructions, as in a recipe.
-        "instructions"
-      | 
-        ## (litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.
-        "litany"
-      | 
-        ## (syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.
-        "syllogism"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -3041,6 +3100,7 @@ tei_label =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_head =
@@ -3058,6 +3118,7 @@ tei_head =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_headLabel =
@@ -3074,7 +3135,7 @@ tei_headItem =
   }
 tei_note =
   
-  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]
+  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]
   element tei:note {
     tei_macro.specialPara,
     tei_att.global.attributes,
@@ -3083,6 +3144,7 @@ tei_note =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.anchoring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_noteGrp =
@@ -3096,6 +3158,7 @@ tei_noteGrp =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.anchoring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_index =
@@ -3105,6 +3168,7 @@ tei_index =
     (tei_term, tei_index?)*,
     tei_att.global.attributes,
     tei_att.spanning.attributes,
+    tei_att.cmc.attributes,
     
     ## a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.
     attribute indexName { xsd:Name }?,
@@ -3123,6 +3187,7 @@ tei_media =
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
     tei_att.timed.attributes,
+    tei_att.cmc.attributes,
     
     ## (MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type
     attribute mimeType {
@@ -3134,7 +3199,7 @@ tei_media =
   }
 tei_graphic =
   
-  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]
+  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]
   element tei:graphic {
     tei_model.descLike*,
     tei_att.global.attributes,
@@ -3142,6 +3207,7 @@ tei_graphic =
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_binaryObject =
@@ -3153,6 +3219,7 @@ tei_binaryObject =
     tei_att.media.attributes,
     tei_att.timed.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     [
       a:documentation [
         "The encoding used to encode the binary data. If not specified, this is assumed to be "
@@ -3179,6 +3246,7 @@ tei_milestone =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_gb =
@@ -3192,6 +3260,7 @@ tei_gb =
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
     tei_att.edition.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_pb =
@@ -3205,6 +3274,7 @@ tei_pb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_lb =
@@ -3218,6 +3288,7 @@ tei_lb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_cb =
@@ -3231,6 +3302,7 @@ tei_cb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_analytic =
@@ -3317,7 +3389,7 @@ tei_author =
      }?)
     >> sch:pattern [
          id =
-           "foo-author-calendar-calendar-check-author-constraint-rule-21"
+           "foo-author-calendar-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3357,7 +3429,7 @@ tei_editor =
      }?)
     >> sch:pattern [
          id =
-           "foo-editor-calendar-calendar-check-editor-constraint-rule-22"
+           "foo-editor-calendar-calendar-check-editor-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3407,7 +3479,7 @@ tei_resp =
        }
      }?)
     >> sch:pattern [
-         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-23"
+         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3439,9 +3511,9 @@ tei_title =
     tei_att.typed.attribute.subtype,
     tei_att.canonical.attributes,
     tei_att.datable.attributes,
+    tei_att.cmc.attributes,
     
     ## classifies the title according to some convenient typology.
-    ## Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3454,7 +3526,7 @@ tei_title =
      }?)
     >> sch:pattern [
          id =
-           "foo-title-calendar-calendar-check-title-constraint-rule-24"
+           "foo-title-calendar-calendar-check-title-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3504,6 +3576,7 @@ tei_meeting =
     tei_att.global.attributes,
     tei_att.datable.attributes,
     tei_att.canonical.attributes,
+    tei_att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -3513,7 +3586,7 @@ tei_meeting =
      }?)
     >> sch:pattern [
          id =
-           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-25"
+           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3586,7 +3659,7 @@ tei_pubPlace =
   }
 tei_bibl =
   
-  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:bibl {
     (text
      | tei_model.gLike
@@ -3602,11 +3675,12 @@ tei_bibl =
     tei_att.typed.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_biblStruct =
   
-  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:biblStruct {
     (tei_analytic*,
      (tei_monogr, tei_series*)+,
@@ -3619,11 +3693,12 @@ tei_biblStruct =
     tei_att.typed.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_listBibl =
   
-  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:listBibl {
     (tei_model.headLike*,
      tei_desc*,
@@ -3633,6 +3708,7 @@ tei_listBibl =
     tei_att.sortable.attributes,
     tei_att.declarable.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_relatedItem =
@@ -3641,7 +3717,7 @@ tei_relatedItem =
   element tei:relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-rule-26"
+         id = "foo-relatedItem-targetorcontent1-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3685,7 +3761,7 @@ tei_l =
       | tei_model.inter
       | tei_model.global)*)
     >> sch:pattern [
-         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-27"
+         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3705,6 +3781,7 @@ tei_l =
        ],
     tei_att.global.attributes,
     tei_att.fragmentable.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_lg =
@@ -3725,7 +3802,7 @@ tei_lg =
       | tei_lg)*,
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-lg-atleast1oflggapl-constraint-rule-28"
+         id = "foo-lg-atleast1oflggapl-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3745,7 +3822,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3767,6 +3844,7 @@ tei_lg =
     tei_att.divLike.attributes,
     tei_att.typed.attributes,
     tei_att.declaring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_sp =
@@ -3801,6 +3879,7 @@ tei_stage =
     tei_att.global.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3843,7 +3922,7 @@ tei_teiCorpus =
     a:documentation [
       "(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more "
       ns1:code [ "<TEI>" ]
-      " elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      " elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element tei:teiCorpus {
@@ -3866,7 +3945,6 @@ tei_divGen =
     tei_att.typed.attribute.subtype,
     
     ## specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-    ## Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3874,7 +3952,7 @@ tei_divGen =
   }
 tei_textLang =
   
-  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]
+  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]
   element tei:textLang {
     tei_macro.specialPara,
     tei_att.global.attributes,
@@ -3927,7 +4005,7 @@ tei_att.patternReplacement.attribute.replacementPattern =
   attribute replacementPattern { text }
 tei_teiHeader =
   
-  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]
+  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]
   element tei:teiHeader {
     (tei_fileDesc, tei_model.teiHeaderPart*, tei_revisionDesc?),
     tei_att.global.attributes,
@@ -3970,7 +4048,7 @@ tei_sponsor =
      }?)
     >> sch:pattern [
          id =
-           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
+           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4010,7 +4088,7 @@ tei_funder =
      }?)
     >> sch:pattern [
          id =
-           "foo-funder-calendar-calendar-check-funder-constraint-rule-31"
+           "foo-funder-calendar-calendar-check-funder-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4050,7 +4128,7 @@ tei_principal =
      }?)
     >> sch:pattern [
          id =
-           "foo-principal-calendar-calendar-check-principal-constraint-rule-32"
+           "foo-principal-calendar-calendar-check-principal-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4089,7 +4167,7 @@ tei_edition =
   }
 tei_extent =
   
-  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]
+  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]
   element tei:extent {
     tei_macro.phraseSeq, tei_att.global.attributes, empty
   }
@@ -4123,56 +4201,18 @@ tei_authority =
   }
 tei_idno =
   
-  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
+  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element tei:idno {
     (text | tei_model.gLike | tei_idno)*,
     tei_att.global.attributes,
     tei_att.sortable.attributes,
     tei_att.datable.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## categorizes the identifier, for example as an ISBN, Social Security number, etc.
-    ## Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC
     attribute type {
-      [
-        a:documentation [
-          "International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the "
-          ns1:a [
-            href = "https://www.isbn-international.org"
-            " International ISBN Agency."
-          ]
-          "\x{a}" ~
-          "                  "
-        ]
-      ]
-      "ISBN"
-      | 
-        ## International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.
-        "ISSN"
-      | 
-        ## Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.
-        "DOI"
-      | [
-          a:documentation [
-            "Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of "
-            ns1:a [
-              href = "https://datatracker.ietf.org/doc/html/rfc3986"
-              "RFC 3986"
-            ]
-            "."
-          ]
-        ]
-        "URI"
-      | 
-        ## A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.
-        "VIAF"
-      | 
-        ## English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.
-        "ESTC"
-      | 
-        ## OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.
-        "OCLC"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
@@ -4182,7 +4222,7 @@ tei_idno =
        }
      }?)
     >> sch:pattern [
-         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-33"
+         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4244,7 +4284,7 @@ tei_licence =
      }?)
     >> sch:pattern [
          id =
-           "foo-licence-calendar-calendar-check-licence-constraint-rule-34"
+           "foo-licence-calendar-calendar-check-licence-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4289,7 +4329,7 @@ tei_notesStmt =
   }
 tei_sourceDesc =
   
-  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]
+  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]
   element tei:sourceDesc {
     (tei_model.pLike+
      | (tei_model.biblLike
@@ -4301,7 +4341,7 @@ tei_sourceDesc =
   }
 tei_biblFull =
   
-  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:biblFull {
     (((tei_titleStmt,
        tei_editionStmt?,
@@ -4315,6 +4355,7 @@ tei_biblFull =
     tei_att.declarable.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_encodingDesc =
@@ -4340,7 +4381,7 @@ tei_schemaRef =
   }
 tei_projectDesc =
   
-  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element tei:projectDesc {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4349,7 +4390,7 @@ tei_projectDesc =
   }
 tei_samplingDecl =
   
-  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element tei:samplingDecl {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4358,7 +4399,7 @@ tei_samplingDecl =
   }
 tei_editorialDecl =
   
-  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element tei:editorialDecl {
     (tei_model.pLike | tei_model.editorialDeclPart)+,
     tei_att.global.attributes,
@@ -4367,7 +4408,7 @@ tei_editorialDecl =
   }
 tei_correction =
   
-  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:correction {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4403,7 +4444,7 @@ tei_correction =
   }
 tei_normalization =
   
-  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:normalization {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4423,11 +4464,11 @@ tei_normalization =
   }
 tei_quotation =
   
-  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-rule-35"
+         id = "foo-quotation-quotationContents-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4467,7 +4508,7 @@ tei_quotation =
   }
 tei_hyphenation =
   
-  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:hyphenation {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4493,7 +4534,7 @@ tei_hyphenation =
   }
 tei_segmentation =
   
-  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:segmentation {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4502,7 +4543,7 @@ tei_segmentation =
   }
 tei_stdVals =
   
-  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:stdVals {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4654,7 +4695,7 @@ tei_refsDecl =
   }
 tei_citeStructure =
   
-  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element tei:citeStructure {
     (tei_citeData*, tei_citeStructure*, tei_model.descLike*),
     tei_att.global.attributes,
@@ -4682,7 +4723,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-36"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4703,7 +4744,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-37"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4737,7 +4778,7 @@ tei_citeStructure =
   }
 tei_citeData =
   
-  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element tei:citeData {
     empty,
     tei_att.global.attributes,
@@ -4760,7 +4801,7 @@ tei_cRefPattern =
   }
 tei_prefixDef =
   
-  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element tei:prefixDef {
     tei_model.pLike*,
     tei_att.global.attributes,
@@ -4774,7 +4815,7 @@ tei_prefixDef =
   }
 tei_listPrefixDef =
   
-  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element tei:listPrefixDef {
     (tei_desc*, (tei_prefixDef | tei_listPrefixDef)+),
     tei_att.global.attributes,
@@ -4888,7 +4929,7 @@ tei_unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
+           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4932,7 +4973,7 @@ tei_unitDef =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
+           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4973,7 +5014,7 @@ tei_conversion =
      }?)
     >> sch:pattern [
          id =
-           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-40"
+           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5039,7 +5080,7 @@ tei_application =
      }?)
     >> sch:pattern [
          id =
-           "foo-application-calendar-calendar-check-application-constraint-rule-41"
+           "foo-application-calendar-calendar-check-application-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5102,7 +5143,7 @@ tei_creation =
      }?)
     >> sch:pattern [
          id =
-           "foo-creation-calendar-calendar-check-creation-constraint-rule-42"
+           "foo-creation-calendar-calendar-check-creation-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5127,7 +5168,7 @@ tei_creation =
   }
 tei_langUsage =
   
-  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]
   element tei:langUsage {
     (tei_model.pLike+ | tei_language+),
     tei_att.global.attributes,
@@ -5261,24 +5302,8 @@ tei_correspAction =
     tei_att.sortable.attributes,
     
     ## describes the nature of the action.
-    ## Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded
     attribute type {
-      
-      ## information concerning the sending or dispatch of a message.
-      "sent"
-      | 
-        ## information concerning the receipt of a message.
-        "received"
-      | 
-        ## information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.
-        "transmitted"
-      | 
-        ## information concerning the redirection of an unread message.
-        "redirected"
-      | 
-        ## information concerning the forwarding of a message.
-        "forwarded"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5309,7 +5334,7 @@ tei_revisionDesc =
   }
 tei_change =
   
-  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]
+  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]
   element tei:change {
     tei_macro.specialPara,
     tei_att.ascribed.attributes,
@@ -5326,7 +5351,7 @@ tei_change =
      }?)
     >> sch:pattern [
          id =
-           "foo-change-calendar-calendar-check-change-constraint-rule-43"
+           "foo-change-calendar-calendar-check-change-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5358,7 +5383,7 @@ tei_change =
   }
 tei_listChange =
   
-  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]
+  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]
   element tei:listChange {
     (tei_desc*, (tei_listChange | tei_change)+),
     tei_att.global.attributes,
@@ -5384,7 +5409,7 @@ tei_TEI =
       ns1:code [ "<TEI>" ]
       " (or "
       ns1:code [ "<teiCorpus>" ]
-      ") element. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      ") element. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element tei:TEI {
@@ -5419,7 +5444,7 @@ tei_TEI =
   }
 tei_text =
   
-  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element tei:text {
     (tei_model.global*,
      (tei_front, tei_model.global*)?,
@@ -5455,7 +5480,7 @@ tei_body =
   }
 tei_group =
   
-  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]
+  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]
   element tei:group {
     ((tei_model.divTop | tei_model.global)*,
      ((tei_text | tei_group),
@@ -5478,6 +5503,7 @@ tei_floatingText =
     tei_att.global.attributes,
     tei_att.declaring.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_div =
@@ -5492,7 +5518,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5514,7 +5540,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5665,6 +5691,7 @@ tei_trailer =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_byline =
@@ -5677,6 +5704,7 @@ tei_byline =
      | tei_docAuthor
      | tei_model.global)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_dateline =
@@ -5689,6 +5717,7 @@ tei_dateline =
      | tei_model.global
      | tei_docDate)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_argument =
@@ -5698,6 +5727,7 @@ tei_argument =
     ((tei_model.global | tei_model.headLike)*,
      (tei_model.common, tei_model.global*)+),
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_epigraph =
@@ -5706,6 +5736,7 @@ tei_epigraph =
   element tei:epigraph {
     (tei_model.common | tei_model.global)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_opener =
@@ -5724,6 +5755,7 @@ tei_opener =
      | tei_model.global)*,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_closer =
@@ -5739,6 +5771,7 @@ tei_closer =
      | tei_model.global)*,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_salute =
@@ -5748,6 +5781,7 @@ tei_salute =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_signed =
@@ -5757,6 +5791,7 @@ tei_signed =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_postscript =
@@ -5769,6 +5804,7 @@ tei_postscript =
      (tei_model.divBottomPart, tei_model.global*)*),
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_titlePage =
@@ -5805,25 +5841,9 @@ tei_titlePart =
     tei_att.typed.attribute.subtype,
     
     ## (type) specifies the role of this subdivision of the title.
-    ## Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)
     [ a:defaultValue = "main" ]
     attribute type {
-      
-      ## (main) main title of the work
-      "main"
-      | 
-        ## (subordinate) subtitle of the work
-        "sub"
-      | 
-        ## (alternate) alternative title of the work
-        "alt"
-      | 
-        ## (short) abbreviated form of title
-        "short"
-      | 
-        ## (descriptive) descriptive paraphrase of the work
-        "desc"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5834,6 +5854,7 @@ tei_docAuthor =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.canonical.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_imprimatur =
@@ -5868,6 +5889,7 @@ tei_docDate =
   element tei:docDate {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     tei_att.datable.attributes,
     tei_att.calendarSystem.attributes,
     empty
@@ -5980,11 +6002,11 @@ tei_att.global.linking.attribute.select =
   }?
 tei_link =
   
-  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]
+  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]
   element tei:link {
     empty
     >> sch:pattern [
-         id = "foo-link-linkTargets3-constraint-rule-46"
+         id = "foo-link-linkTargets3-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6007,25 +6029,27 @@ tei_link =
     tei_att.global.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_linkGrp =
   
-  ## (link group) defines a collection of associations or hypertextual links. [16.1. Links]
+  ## (link group) defines a collection of associations or hypertextual links. [17.1. Links]
   element tei:linkGrp {
     (tei_model.descLike*, (tei_link | tei_ptr)+),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ab =
   
-  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]
+  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]
   element tei:ab {
     tei_macro.abContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6050,17 +6074,22 @@ tei_ab =
     tei_att.declaring.attributes,
     tei_att.fragmentable.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_anchor =
   
-  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
+  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]
   element tei:anchor {
-    empty, tei_att.global.attributes, tei_att.typed.attributes, empty
+    empty,
+    tei_att.global.attributes,
+    tei_att.typed.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_seg =
   
-  ## (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
+  ## (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
   element tei:seg {
     tei_macro.paraContent,
     tei_att.global.attributes,
@@ -6068,11 +6097,12 @@ tei_seg =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.notated.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_when =
   
-  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]
+  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]
   element tei:when {
     empty,
     tei_att.global.attributes,
@@ -6144,10 +6174,11 @@ tei_when =
   }
 tei_timeline =
   
-  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]
+  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]
   element tei:timeline {
     tei_when+,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
     attribute origin {
@@ -6197,11 +6228,11 @@ tei_timeline =
   }
 tei_join =
   
-  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation]
+  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation]
   element tei:join {
     ((tei_model.descLike | tei_model.certLike)*)
     >> sch:pattern [
-         id = "foo-join-joinTargets3-constraint-rule-48"
+         id = "foo-join-joinTargets3-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6225,6 +6256,7 @@ tei_join =
     tei_att.global.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     
     ## specifies the name of an element which this aggregation may be understood to represent.
     attribute result { xsd:Name }?,
@@ -6256,13 +6288,14 @@ tei_joinGrp =
     a:documentation [
       "(join group) groups a collection of "
       ns1:code [ "<join>" ]
-      " elements and possibly pointers. [16.7. Aggregation]"
+      " elements and possibly pointers. [17.7. Aggregation]"
     ]
   ]
   element tei:joinGrp {
     ((tei_gloss | tei_model.descLike)*, (tei_join | tei_ptr)+),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     [
       a:documentation [
         "supplies the default value for the "
@@ -6277,13 +6310,14 @@ tei_joinGrp =
   }
 tei_alt =
   
-  ## (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]
+  ## (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]
   element tei:alt {
     empty,
     tei_att.global.attributes,
     tei_att.pointing.attribute.targetLang,
     tei_att.pointing.attribute.evaluate,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
@@ -6326,13 +6360,14 @@ tei_altGrp =
     a:documentation [
       "(alternation group) groups a collection of "
       ns1:code [ "<alt>" ]
-      " elements and possibly pointers. [16.8. Alternation]"
+      " elements and possibly pointers. [17.8. Alternation]"
     ]
   ]
   element tei:altGrp {
     (tei_model.descLike*, (tei_alt | tei_ptr)*),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
     [ a:defaultValue = "excl" ]
@@ -6348,12 +6383,12 @@ tei_altGrp =
   }
 tei_standOff =
   
-  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]
+  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]
   element tei:standOff {
     (tei_model.standOffPart+)
     >> sch:pattern [
          id =
-           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-49"
+           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6393,7 +6428,7 @@ tei_listAnnotation =
       ns1:code [ "<note>" ]
       ", possibly organized with nested "
       ns1:code [ "<listAnnotation>" ]
-      " elements. [16.10. The standOff Container]"
+      " elements. [17.10. The standOff Container]"
     ]
   ]
   element tei:listAnnotation {
@@ -6415,7 +6450,7 @@ tei_annotation =
         "Web\x{a}" ~
         "      Annotation Data Model"
       ]
-      ". [16.10. The standOff Container]"
+      ". [17.10. The standOff Container]"
     ]
   ]
   element tei:annotation {
diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json
index 1b258c20a..25c7122a3 100644
--- a/Test/expected-results/test34.combined.json
+++ b/Test/expected-results/test34.combined.json
@@ -5,6 +5,16 @@
     
     "modules" : 
     [ 
+      { "ident" : "cmc",
+        "id" : "CMC",
+        "desc" : 
+        [  ],
+        "shortDesc" : "",
+        "gloss" : 
+        [  ],
+        "altIdent" : 
+        [  ] },
+      
       { "ident" : "core",
         "id" : "CO",
         "desc" : 
@@ -146,7 +156,8 @@
             "att.typed",
             "att.declaring",
             "att.fragmentable",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -173,7 +184,8 @@
             "model.choicePart" ],
           "atts" : 
           [ "att.global",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -332,7 +344,8 @@
             "att.transcriptional",
             "att.placement",
             "att.typed",
-            "att.dimensions" ],
+            "att.dimensions",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -383,7 +396,8 @@
           [ "model.addressLike",
             "model.publicationStmtPart.detail" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -426,7 +440,8 @@
           "atts" : 
           [ "att.global",
             "att.pointing",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -531,7 +546,8 @@
           [ "model.global.meta" ],
           "atts" : 
           [ "att.global",
-            "att.pointing.group" ],
+            "att.pointing.group",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -667,7 +683,8 @@
           [ "model.milestoneLike" ],
           "atts" : 
           [ "att.global",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -1034,7 +1051,8 @@
             "model.titlepagePart",
             "model.pLike.front" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -1361,7 +1379,8 @@
             "att.declarable",
             "att.typed",
             "att.sortable",
-            "att.docStatus" ],
+            "att.docStatus",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -1417,7 +1436,8 @@
           [ "att.global",
             "att.declarable",
             "att.sortable",
-            "att.docStatus" ],
+            "att.docStatus",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -1516,7 +1536,8 @@
             "att.declarable",
             "att.typed",
             "att.sortable",
-            "att.docStatus" ],
+            "att.docStatus",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -1578,7 +1599,8 @@
           [ "att.global",
             "att.media",
             "att.timed",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -1830,7 +1852,8 @@
             "model.titlepagePart",
             "model.pLike.front" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -2086,7 +2109,8 @@
             "att.typed",
             "att.edition",
             "att.spanning",
-            "att.breaking" ],
+            "att.breaking",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -2179,7 +2203,8 @@
         { "model" : 
           [ "model.pPart.editorial" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -2213,7 +2238,8 @@
           [ "model.quoteLike" ],
           "atts" : 
           [ "att.global",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -2400,8 +2426,8 @@
             "ns" : "",
             "usage" : "req",
             "desc" : 
-            [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2020-02-03\" xml:lang=\"en\">supplies an XPath selection pattern using the\n        syntax defined in <ptr target=\"#XSLT3\"\/> which identifies a set of nodes which are \n        citable structural components. The expression may be absolute (beginning with <code>\/<\/code>) or relative. \n        <att>match<\/att> on a <gi>citeStructure<\/gi> without a <gi>citeStructure<\/gi> parent must be an absolute XPath. If it is\n        relative, its context is set by the <att>match<\/att> of the parent <gi>citeStructure<\/gi>. <\/desc>" ],
-            "shortDesc" : "(match) supplies an XPath selection pattern using the\n        syntax defined in  which identifies a set of nodes which are \n        citable structural components. The expression may be absolute (beginning with \/) or relative. \n        match on a citeStructure without a citeStructure parent must be an absolute XPath. If it is\n        relative, its context is set by the match of the parent citeStructure. ",
+            [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2020-02-03\" xml:lang=\"en\">supplies an XPath selection pattern using the\n        syntax defined in <ptr target=\"#XSLT3\"\/> which identifies a set of nodes which are \n        citable structural components. The expression may be absolute (beginning with <code>\/<\/code>) or relative. \n        <att>match<\/att> on a <gi>citeStructure<\/gi> without a <gi>citeStructure<\/gi> parent must be an absolute XPath. If it is\n        relative, its context is set by the <att>match<\/att> of the parent <gi>citeStructure<\/gi>.<\/desc>" ],
+            "shortDesc" : "(match) supplies an XPath selection pattern using the\n        syntax defined in  which identifies a set of nodes which are \n        citable structural components. The expression may be absolute (beginning with \/) or relative. \n        match on a citeStructure without a citeStructure parent must be an absolute XPath. If it is\n        relative, its context is set by the match of the parent citeStructure.",
             "gloss" : 
             [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2020-02-03\" xml:lang=\"en\">match<\/gloss>" ],
             "altIdent" : 
@@ -2645,7 +2671,8 @@
           [ "model.divBottomPart" ],
           "atts" : 
           [ "att.global",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -2782,7 +2809,8 @@
           "atts" : 
           [ "att.global",
             "att.editLike",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -3158,7 +3186,8 @@
             "att.calendarSystem",
             "att.editLike",
             "att.dimensions",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -3197,7 +3226,8 @@
           [ "model.divWrapper",
             "model.pLike.front" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -3241,7 +3271,8 @@
           [ "att.global",
             "att.transcriptional",
             "att.typed",
-            "att.dimensions" ],
+            "att.dimensions",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -3268,7 +3299,8 @@
             "model.labelLike" ],
           "atts" : 
           [ "att.global",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -3322,7 +3354,8 @@
           [ "model.emphLike" ],
           "atts" : 
           [ "att.global",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -4486,7 +4519,8 @@
             "model.pLike.front" ],
           "atts" : 
           [ "att.global",
-            "att.canonical" ],
+            "att.canonical",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -4514,6 +4548,7 @@
             "model.pLike.front" ],
           "atts" : 
           [ "att.global",
+            "att.cmc",
             "att.datable",
             "att.calendarSystem" ],
           "unknown" : 
@@ -4842,7 +4877,8 @@
         { "model" : 
           [ "model.addressLike" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -4867,7 +4903,8 @@
         { "model" : 
           [ "model.emphLike" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -4927,7 +4964,8 @@
             "model.titlepagePart",
             "model.pLike.front" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -4962,7 +5000,8 @@
             "model.choicePart" ],
           "atts" : 
           [ "att.global",
-            "att.editLike" ],
+            "att.editLike",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5067,7 +5106,8 @@
           "atts" : 
           [ "att.global",
             "att.declaring",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5133,7 +5173,8 @@
         { "model" : 
           [ "model.emphLike" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5326,7 +5367,8 @@
           [ "att.global",
             "att.timed",
             "att.editLike",
-            "att.dimensions" ],
+            "att.dimensions",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5498,7 +5540,8 @@
             "att.typed",
             "att.spanning",
             "att.breaking",
-            "att.edition" ],
+            "att.edition",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5610,7 +5653,8 @@
             "att.declaring",
             "att.typed",
             "att.pointing",
-            "att.cReferencing" ],
+            "att.cReferencing",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5640,7 +5684,8 @@
             "att.media",
             "att.resourced",
             "att.declaring",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5768,7 +5813,8 @@
           [ "att.global",
             "att.typed",
             "att.placement",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5866,7 +5912,8 @@
           [ "model.hiLike" ],
           "atts" : 
           [ "att.global",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -5979,7 +6026,8 @@
           [ "att.global",
             "att.sortable",
             "att.datable",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6030,8 +6078,8 @@
               [ 
                 { "ident" : "ISBN",
                   "desc" : 
-                  [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2016-07-02\" xml:lang=\"en\">International Standard Book Number: a 13- or\n            (if assigned prior to 2007) 10-digit identifying number assigned by the publishing\n            industry to a published book or similar item, registered with the <ref target=\"https:\/\/www.isbn-international.org\"> International ISBN Agency.<\/ref>\n          <\/desc>" ],
-                  "shortDesc" : "International Standard Book Number: a 13- or\n            (if assigned prior to 2007) 10-digit identifying number assigned by the publishing\n            industry to a published book or similar item, registered with the  International ISBN Agency.\n          ",
+                  [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2016-07-02\" xml:lang=\"en\">International Standard Book Number: a 13- or\n            (if assigned prior to 2007) 10-digit identifying number assigned by the publishing\n            industry to a published book or similar item, registered with the <ref target=\"https:\/\/www.isbn-international.org\"> International ISBN Agency.<\/ref><\/desc>" ],
+                  "shortDesc" : "International Standard Book Number: a 13- or\n            (if assigned prior to 2007) 10-digit identifying number assigned by the publishing\n            industry to a published book or similar item, registered with the  International ISBN Agency.",
                   "gloss" : 
                   [  ],
                   "altIdent" : 
@@ -6206,7 +6254,8 @@
           [ "model.global.meta" ],
           "atts" : 
           [ "att.global",
-            "att.spanning" ],
+            "att.spanning",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6312,7 +6361,8 @@
           "atts" : 
           [ "att.global",
             "att.pointing",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6406,7 +6456,8 @@
           [ "model.global.meta" ],
           "atts" : 
           [ "att.global",
-            "att.pointing.group" ],
+            "att.pointing.group",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6530,7 +6581,8 @@
           [ "model.lLike" ],
           "atts" : 
           [ "att.global",
-            "att.fragmentable" ],
+            "att.fragmentable",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6574,7 +6626,8 @@
           [ "att.global",
             "att.typed",
             "att.placement",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6701,7 +6754,8 @@
             "att.typed",
             "att.edition",
             "att.spanning",
-            "att.breaking" ],
+            "att.breaking",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6729,7 +6783,8 @@
           [ "att.global",
             "att.divLike",
             "att.typed",
-            "att.declaring" ],
+            "att.declaring",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6870,7 +6925,8 @@
           "atts" : 
           [ "att.global",
             "att.pointing",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6895,7 +6951,8 @@
           [ "model.global.meta" ],
           "atts" : 
           [ "att.global",
-            "att.pointing.group" ],
+            "att.pointing.group",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -6938,7 +6995,8 @@
           "atts" : 
           [ "att.global",
             "att.sortable",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7152,7 +7210,8 @@
           [ "att.global",
             "att.sortable",
             "att.declarable",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7327,6 +7386,7 @@
           [ "att.global",
             "att.typed",
             "att.measurement",
+            "att.cmc",
             "att.ranging" ],
           "unknown" : 
           [  ] },
@@ -7373,7 +7433,8 @@
           "atts" : 
           [ "att.global",
             "att.measurement",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7413,7 +7474,8 @@
             "att.media",
             "att.resourced",
             "att.declaring",
-            "att.timed" ],
+            "att.timed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7457,7 +7519,8 @@
           "atts" : 
           [ "att.global",
             "att.datable",
-            "att.canonical" ],
+            "att.canonical",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7502,7 +7565,8 @@
         { "model" : 
           [ "model.emphLike" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7532,7 +7596,8 @@
             "att.typed",
             "att.edition",
             "att.spanning",
-            "att.breaking" ],
+            "att.breaking",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7758,7 +7823,8 @@
             "att.personal",
             "att.datable",
             "att.editLike",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7923,7 +7989,8 @@
             "att.pointing",
             "att.typed",
             "att.written",
-            "att.anchoring" ],
+            "att.anchoring",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -7956,7 +8023,8 @@
             "att.pointing",
             "att.typed",
             "att.written",
-            "att.anchoring" ],
+            "att.anchoring",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8032,7 +8100,8 @@
           "atts" : 
           [ "att.global",
             "att.typed",
-            "att.ranging" ],
+            "att.ranging",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8136,7 +8205,8 @@
           [ "model.divTopPart" ],
           "atts" : 
           [ "att.global",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8193,7 +8263,8 @@
           [ "model.pPart.transcriptional",
             "model.choicePart" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8221,7 +8292,8 @@
           [ "att.global",
             "att.declaring",
             "att.fragmentable",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8250,7 +8322,8 @@
             "att.typed",
             "att.edition",
             "att.spanning",
-            "att.breaking" ],
+            "att.breaking",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8323,7 +8396,8 @@
           [ "model.divBottomPart" ],
           "atts" : 
           [ "att.global",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8535,7 +8609,8 @@
             "att.global",
             "att.internetMedia",
             "att.pointing",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8772,7 +8847,8 @@
             "model.common" ],
           "atts" : 
           [ "att.global",
-            "att.ascribed.directed" ],
+            "att.ascribed.directed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -8993,19 +9069,21 @@
         "type" : "elementSpec",
         "module" : "core",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-01-14\" xml:lang=\"en\">contains a phrase or passage attributed by the narrator or author to some agency external\n        to the text.<\/desc>" ],
-        "shortDesc" : "(quotation) contains a phrase or passage attributed by the narrator or author to some agency external\n        to the text.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-01-14\" xml:lang=\"en\">contains a phrase or passage attributed by the narrator or author to some agency external to the text.<\/desc>" ],
+        "shortDesc" : "(quotation) contains a phrase or passage attributed by the narrator or author to some agency external to the text.",
         "gloss" : 
         [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2005-01-14\" xml:lang=\"en\">quotation<\/gloss>" ],
         "altIdent" : 
         [  ],
         "classes" : 
         { "model" : 
-          [ "model.quoteLike" ],
+          [ "model.quoteLike",
+            "model.biblPart" ],
           "atts" : 
           [ "att.global",
             "att.typed",
-            "att.notated" ],
+            "att.notated",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9062,7 +9140,8 @@
             "att.global",
             "att.internetMedia",
             "att.pointing",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9195,7 +9274,8 @@
           "atts" : 
           [ "att.global",
             "att.editLike",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9521,7 +9601,8 @@
           "atts" : 
           [ "att.global",
             "att.naming",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9634,7 +9715,8 @@
           [ "model.phrase" ],
           "atts" : 
           [ "att.global",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9668,7 +9750,8 @@
           [ "model.attributable" ],
           "atts" : 
           [ "att.global",
-            "att.ascribed.directed" ],
+            "att.ascribed.directed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9733,7 +9816,8 @@
           [ "model.divWrapper" ],
           "atts" : 
           [ "att.global",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -9862,7 +9946,8 @@
             "att.segLike",
             "att.typed",
             "att.written",
-            "att.notated" ],
+            "att.notated",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -10034,7 +10119,8 @@
           [ "model.pPart.transcriptional",
             "model.choicePart" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -10061,7 +10147,8 @@
             "model.divTopPart" ],
           "atts" : 
           [ "att.global",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -10086,7 +10173,8 @@
         { "model" : 
           [ "model.emphLike" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -10101,8 +10189,8 @@
         "type" : "elementSpec",
         "module" : "header",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2008-12-09\" xml:lang=\"en\">describes the source(s) from which an electronic text was derived or generated, typically a\n    bibliographic description in the case of a digitized text, or a phrase such as \"born digital\"\n    for a text which has no previous existence.<\/desc>" ],
-        "shortDesc" : "(source description) describes the source(s) from which an electronic text was derived or generated, typically a\n    bibliographic description in the case of a digitized text, or a phrase such as \"born digital\"\n    for a text which has no previous existence.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2008-12-09\" xml:lang=\"en\">describes the source(s) from which an electronic text was derived or generated, typically a\n    bibliographic description in the case of a digitized text, or a phrase such as <q>born digital<\/q>\n    for a text which has no previous existence.<\/desc>" ],
+        "shortDesc" : "(source description) describes the source(s) from which an electronic text was derived or generated, typically a\n    bibliographic description in the case of a digitized text, or a phrase such as born digital\n    for a text which has no previous existence.",
         "gloss" : 
         [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-07-04\" xml:lang=\"en\">source description<\/gloss>" ],
         "altIdent" : 
@@ -10312,7 +10400,8 @@
           [ "att.ascribed.directed",
             "att.global",
             "att.placement",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -10873,7 +10962,8 @@
             "att.typed",
             "att.canonical",
             "att.sortable",
-            "att.cReferencing" ],
+            "att.cReferencing",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -11074,7 +11164,8 @@
             "att.canonical",
             "att.editLike",
             "att.dimensions",
-            "att.typed" ],
+            "att.typed",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -11112,7 +11203,8 @@
         { "model" : 
           [ "model.global.meta" ],
           "atts" : 
-          [ "att.global" ],
+          [ "att.global",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -11247,7 +11339,8 @@
           [ "att.global",
             "att.typed",
             "att.canonical",
-            "att.datable" ],
+            "att.datable",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -11622,7 +11715,8 @@
           [ "att.global",
             "att.typed",
             "att.placement",
-            "att.written" ],
+            "att.written",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -11672,7 +11766,8 @@
           "atts" : 
           [ "att.global",
             "att.editLike",
-            "att.dimensions" ],
+            "att.dimensions",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -11816,7 +11911,8 @@
           "atts" : 
           [ "att.global",
             "att.typed",
-            "att.measurement" ],
+            "att.measurement",
+            "att.cmc" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -12099,7 +12195,8 @@
         [  ],
         "classes" : 
         { "model" : 
-          [ "model.teiHeaderPart" ],
+          [ "model.teiHeaderPart",
+            "model.standOffPart" ],
           "atts" : 
           [ "att.global",
             "att.declarable",
@@ -12304,6 +12401,25 @@
             "unknown" : 
             [  ] } },
         
+        { "ident" : "model.cmc",
+          "ns" : "http:\/\/foo.foo\/foo",
+          "type" : "classSpec",
+          "module" : "tei",
+          "desc" : 
+          [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">includes the CMC-specific element <gi>post<\/gi> and\n        makes it available on the divPart level. This allows for\n        using (and combining) occurrences of <gi>post<\/gi>,\n        <gi>u<\/gi>, <gi>incident<\/gi>, and <gi>kinesic<\/gi> in one\n        and the same <gi>div<\/gi> in order to be able to represent\n        the combined use of written and spoken posts, utterances,\n        and nonverbal acts on the GUI of multimodal CMC\n        environments.<\/desc>" ],
+          "shortDesc" : "includes the CMC-specific element post and\n        makes it available on the divPart level. This allows for\n        using (and combining) occurrences of post,\n        u, incident, and kinesic in one\n        and the same div in order to be able to represent\n        the combined use of written and spoken posts, utterances,\n        and nonverbal acts on the GUI of multimodal CMC\n        environments.",
+          "gloss" : 
+          [  ],
+          "altIdent" : 
+          [  ],
+          "classes" : 
+          { "model" : 
+            [ "model.common" ],
+            "atts" : 
+            [  ],
+            "unknown" : 
+            [  ] } },
+        
         { "ident" : "model.common",
           "ns" : "http:\/\/foo.foo\/foo",
           "type" : "classSpec",
@@ -14058,6 +14174,87 @@
                 "dataRef" : 
                 { "key" : "teidata.word" } } } ] },
         
+        { "ident" : "att.cmc",
+          "ns" : "http:\/\/foo.foo\/foo",
+          "type" : "classSpec",
+          "module" : "tei",
+          "desc" : 
+          [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">provides attributes categorizing how the element content was created in a CMC environment.<\/desc>" ],
+          "shortDesc" : "(computer-mediated communication) provides attributes categorizing how the element content was created in a CMC environment.",
+          "gloss" : 
+          [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2023-11-24\">computer-mediated communication<\/gloss>" ],
+          "altIdent" : 
+          [  ],
+          "attributes" : 
+          [ 
+            { "onElement" : false,
+              "ident" : "generatedBy",
+              "mode" : "add",
+              "ns" : "",
+              "usage" : "opt",
+              "desc" : 
+              [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">categorizes how the content of an element was generated in a CMC environment.<\/desc>" ],
+              "shortDesc" : "(generated by) categorizes how the content of an element was generated in a CMC environment.",
+              "gloss" : 
+              [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">generated by<\/gloss>" ],
+              "altIdent" : 
+              [  ],
+              "valDesc" : 
+              [  ],
+              "datatype" : 
+              { "min" : "1",
+                "max" : "1",
+                "dataRef" : 
+                { "key" : "teidata.enumerated" } },
+              "valList" : 
+              { "type" : "semi",
+                "valItem" : 
+                [ 
+                  { "ident" : "human",
+                    "desc" : 
+                    [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">the content was\n          <soCalled>naturally<\/soCalled> typed or spoken by a human user<\/desc>" ],
+                    "shortDesc" : "the content was\n          naturally typed or spoken by a human user",
+                    "gloss" : 
+                    [  ],
+                    "altIdent" : 
+                    [  ] },
+                  
+                  { "ident" : "template",
+                    "desc" : 
+                    [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">the content was\n          generated after a human user activated a template for its\n          insertion<\/desc>" ],
+                    "shortDesc" : "the content was\n          generated after a human user activated a template for its\n          insertion",
+                    "gloss" : 
+                    [  ],
+                    "altIdent" : 
+                    [  ] },
+                  
+                  { "ident" : "system",
+                    "desc" : 
+                    [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2021-09-07\">the content was\n          generated by the system, i.e. the CMC environment<\/desc>" ],
+                    "shortDesc" : "the content was\n          generated by the system, i.e. the CMC environment",
+                    "gloss" : 
+                    [  ],
+                    "altIdent" : 
+                    [  ] },
+                  
+                  { "ident" : "bot",
+                    "desc" : 
+                    [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2024-05-17\">the content was\n          generated by a bot, i.e. a non-human agent, typically one\n          that is not part of the CMC environment itself<\/desc>" ],
+                    "shortDesc" : "the content was\n          generated by a bot, i.e. a non-human agent, typically one\n          that is not part of the CMC environment itself",
+                    "gloss" : 
+                    [  ],
+                    "altIdent" : 
+                    [  ] },
+                  
+                  { "ident" : "unspecified",
+                    "desc" : 
+                    [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2024-05-17\">the content was\n          generated by an unknown or unspecified process<\/desc>" ],
+                    "shortDesc" : "the content was\n          generated by an unknown or unspecified process",
+                    "gloss" : 
+                    [  ],
+                    "altIdent" : 
+                    [  ] } ] } } ] },
+        
         { "ident" : "att.datable",
           "ns" : "http:\/\/foo.foo\/foo",
           "type" : "classSpec",
@@ -15708,8 +15905,8 @@
               "ns" : "",
               "usage" : "def",
               "desc" : 
-              [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-09-27\" xml:lang=\"en\">describes the tint or type of ink, e.g. <mentioned>brown<\/mentioned>, or other\nwriting medium, e.g. <mentioned>pencil<\/mentioned>\n         <\/desc>" ],
-              "shortDesc" : "describes the tint or type of ink, e.g. brown, or other\nwriting medium, e.g. pencil\n         ",
+              [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2007-09-27\" xml:lang=\"en\">describes the tint or type of ink, e.g. <mentioned>brown<\/mentioned>, or other\nwriting medium, e.g. <mentioned>pencil<\/mentioned><\/desc>" ],
+              "shortDesc" : "describes the tint or type of ink, e.g. brown, or other\nwriting medium, e.g. pencil",
               "gloss" : 
               [  ],
               "altIdent" : 
diff --git a/Test/expected-results/test34.odd.html b/Test/expected-results/test34.odd.html
index a8a48ab62..d0ddbf4f1 100644
--- a/Test/expected-results/test34.odd.html
+++ b/Test/expected-results/test34.odd.html
@@ -134,7 +134,7 @@ <h2>
                           <a class="link_odd_elementSpec" href="#TEI.rb" title="rb (ruby base) contains the base text annotated by a ruby gloss. [3.4.2. Ruby Annotations]">rb</a>
                           <a class="link_odd_elementSpec" href="#TEI.ref" title="ref (reference) defines a reference to another location possibly modified by additional text or comment. [3.7. Simple Links and...">ref</a>
                           <a class="link_odd_elementSpec" href="#TEI.reg" title="reg (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and Norm...">reg</a>
-                          <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
+                          <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
                           <a class="link_odd_elementSpec" href="#TEI.rt" title="rt (ruby text) contains a ruby text an annotation closely associated with a passage of the main text. [3.4.2. Ruby Annotations]">rt</a>
                           <a class="link_odd_elementSpec" href="#TEI.said" title="said (speech or thought) indicates passages thought or spoken aloud whether explicitly indicated in the source or not whether d...">said</a>
                           <a class="link_odd_elementSpec" href="#TEI.sic" title="sic (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]">sic</a>
@@ -165,10 +165,10 @@ <h2>
                           <a class="link_odd_elementSpec" href="#TEI.edition" title="edition (edition) describes the particularities of one edition of a text. [2.2.2. The Edition Statement]">edition</a>
                           <a class="link_odd_elementSpec" href="#TEI.extent" title="extent (extent) describes the approximate size of a text stored on some carrier medium or of some other object digital or nondi...">extent</a>
                           <a class="link_odd_elementSpec" href="#TEI.geoDecl" title="geoDecl (geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as ...">geoDecl</a>
-                          <a class="link_odd_elementSpec" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing Decoration and...">handNote</a>
+                          <a class="link_odd_elementSpec" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing Decoration and...">handNote</a>
                           <a class="link_odd_elementSpec" href="#TEI.licence" title="licence contains information about a licence or other legal agreement applicable to the text. [2.2.4. Publication Distribution ...">licence</a>
                           <a class="link_odd_elementSpec" href="#TEI.rendition" title="rendition (rendition) supplies information about the rendition or appearance of one or more elements in the source text. [2.3.4...">rendition</a>
-                          <a class="link_odd_elementSpec" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Wri...">scriptNote</a>
+                          <a class="link_odd_elementSpec" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Wri...">scriptNote</a>
                           <a class="link_odd_elementSpec" href="#TEI.tagUsage" title="tagUsage (element usage) documents the usage of a specific element within a specified document. [2.3.4. The Tagging Declaration...">tagUsage</a>
                         </span>
                       </div>
@@ -176,7 +176,7 @@ <h2>
                         <span class="specChildModule">linking:</span>
                         <span class="specChildElements">
                           <a class="link_odd_elementSpec" href="#TEI.ab" title="ab (anonymous block) contains any componentlevel unit of text acting as a container for phrase or inter level elements analogou...">ab</a>
-                          <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
+                          <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
                         </span>
                       </div>
                       <div class="specChild">
@@ -260,12 +260,12 @@ <h2>
                         <a class="link_odd_elementSpec" href="#TEI.orig" title="orig (original form) contains a reading which is marked as following the original rather than being normalized or corrected. [3...">orig</a>
                         <a class="link_odd_elementSpec" href="#TEI.p" title="p (paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]">p</a>
                         <a class="link_odd_elementSpec" href="#TEI.pb" title="pb (page beginning) marks the beginning of a new page in a paginated document. [3.11.3. Milestone Elements]">pb</a>
-                        <a class="link_odd_elementSpec" href="#TEI.ptr" title="ptr (pointer) defines a pointer to another location. [3.7. Simple Links and CrossReferences 16.1. Links]">ptr</a>
+                        <a class="link_odd_elementSpec" href="#TEI.ptr" title="ptr (pointer) defines a pointer to another location. [3.7. Simple Links and CrossReferences 17.1. Links]">ptr</a>
                         <a class="link_odd_elementSpec" href="#TEI.q" title="q (quoted) contains material which is distinguished from the surrounding text using quotation marks or a similar method for any...">q</a>
                         <a class="link_odd_elementSpec" href="#TEI.quote" title="quote (quotation) contains a phrase or passage attributed by the narrator or author to some agency external to the text. [3.3.3...">quote</a>
                         <a class="link_odd_elementSpec" href="#TEI.ref" title="ref (reference) defines a reference to another location possibly modified by additional text or comment. [3.7. Simple Links and...">ref</a>
                         <a class="link_odd_elementSpec" href="#TEI.reg" title="reg (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and Norm...">reg</a>
-                        <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
+                        <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
                         <a class="link_odd_elementSpec" href="#TEI.ruby" title="ruby (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]">ruby</a>
                         <a class="link_odd_elementSpec" href="#TEI.said" title="said (speech or thought) indicates passages thought or spoken aloud whether explicitly indicated in the source or not whether d...">said</a>
                         <a class="link_odd_elementSpec" href="#TEI.sic" title="sic (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]">sic</a>
@@ -297,14 +297,14 @@ <h2>
                       <span class="specChildModule">linking:</span>
                       <span class="specChildElements">
                         <a class="link_odd_elementSpec" href="#TEI.ab" title="ab (anonymous block) contains any componentlevel unit of text acting as a container for phrase or inter level elements analogou...">ab</a>
-                        <a class="link_odd_elementSpec" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]">alt</a>
-                        <a class="link_odd_elementSpec" href="#TEI.altGrp" title="altGrp (alternation group) groups a collection of &lt;alt&gt; elements and possibly pointers. [16.8. Alternation]">altGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]">alt</a>
+                        <a class="link_odd_elementSpec" href="#TEI.altGrp" title="altGrp (alternation group) groups a collection of &lt;alt&gt; elements and possibly pointers. [17.8. Alternation]">altGrp</a>
                         <a class="link_odd_elementSpec" href="#TEI.anchor" title="anchor (anchor point) attaches an identifier to a point within a text whether or not it corresponds with a textual element. [8....">anchor</a>
                         <a class="link_odd_elementSpec" href="#TEI.join" title="join (join) identifies a possibly fragmented segment of text by pointing at the possibly discontiguous elements which compose i...">join</a>
-                        <a class="link_odd_elementSpec" href="#TEI.joinGrp" title="joinGrp (join group) groups a collection of &lt;join&gt; elements and possibly pointers. [16.7. Aggregation]">joinGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.joinGrp" title="joinGrp (join group) groups a collection of &lt;join&gt; elements and possibly pointers. [17.7. Aggregation]">joinGrp</a>
                         <a class="link_odd_elementSpec" href="#TEI.link" title="link (link) defines an association or hypertextual link among elements or passages of some type not more precisely specifiable ...">link</a>
-                        <a class="link_odd_elementSpec" href="#TEI.linkGrp" title="linkGrp (link group) defines a collection of associations or hypertextual links. [16.1. Links]">linkGrp</a>
-                        <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
+                        <a class="link_odd_elementSpec" href="#TEI.linkGrp" title="linkGrp (link group) defines a collection of associations or hypertextual links. [17.1. Links]">linkGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
                         <a class="link_odd_elementSpec" href="#TEI.timeline" title="timeline (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a tempo...">timeline</a>
                       </span>
                     </div>
@@ -430,7 +430,7 @@ <h2>
                           <a class="link_odd_elementSpec" href="#TEI.rb" title="rb (ruby base) contains the base text annotated by a ruby gloss. [3.4.2. Ruby Annotations]">rb</a>
                           <a class="link_odd_elementSpec" href="#TEI.ref" title="ref (reference) defines a reference to another location possibly modified by additional text or comment. [3.7. Simple Links and...">ref</a>
                           <a class="link_odd_elementSpec" href="#TEI.reg" title="reg (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and Norm...">reg</a>
-                          <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
+                          <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
                           <a class="link_odd_elementSpec" href="#TEI.rt" title="rt (ruby text) contains a ruby text an annotation closely associated with a passage of the main text. [3.4.2. Ruby Annotations]">rt</a>
                           <a class="link_odd_elementSpec" href="#TEI.said" title="said (speech or thought) indicates passages thought or spoken aloud whether explicitly indicated in the source or not whether d...">said</a>
                           <a class="link_odd_elementSpec" href="#TEI.sic" title="sic (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]">sic</a>
@@ -461,10 +461,10 @@ <h2>
                           <a class="link_odd_elementSpec" href="#TEI.edition" title="edition (edition) describes the particularities of one edition of a text. [2.2.2. The Edition Statement]">edition</a>
                           <a class="link_odd_elementSpec" href="#TEI.extent" title="extent (extent) describes the approximate size of a text stored on some carrier medium or of some other object digital or nondi...">extent</a>
                           <a class="link_odd_elementSpec" href="#TEI.geoDecl" title="geoDecl (geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as ...">geoDecl</a>
-                          <a class="link_odd_elementSpec" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing Decoration and...">handNote</a>
+                          <a class="link_odd_elementSpec" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing Decoration and...">handNote</a>
                           <a class="link_odd_elementSpec" href="#TEI.licence" title="licence contains information about a licence or other legal agreement applicable to the text. [2.2.4. Publication Distribution ...">licence</a>
                           <a class="link_odd_elementSpec" href="#TEI.rendition" title="rendition (rendition) supplies information about the rendition or appearance of one or more elements in the source text. [2.3.4...">rendition</a>
-                          <a class="link_odd_elementSpec" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Wri...">scriptNote</a>
+                          <a class="link_odd_elementSpec" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Wri...">scriptNote</a>
                           <a class="link_odd_elementSpec" href="#TEI.tagUsage" title="tagUsage (element usage) documents the usage of a specific element within a specified document. [2.3.4. The Tagging Declaration...">tagUsage</a>
                         </span>
                       </div>
@@ -472,7 +472,7 @@ <h2>
                         <span class="specChildModule">linking:</span>
                         <span class="specChildElements">
                           <a class="link_odd_elementSpec" href="#TEI.ab" title="ab (anonymous block) contains any componentlevel unit of text acting as a container for phrase or inter level elements analogou...">ab</a>
-                          <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
+                          <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
                         </span>
                       </div>
                       <div class="specChild">
@@ -556,12 +556,12 @@ <h2>
                         <a class="link_odd_elementSpec" href="#TEI.orig" title="orig (original form) contains a reading which is marked as following the original rather than being normalized or corrected. [3...">orig</a>
                         <a class="link_odd_elementSpec" href="#TEI.p" title="p (paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]">p</a>
                         <a class="link_odd_elementSpec" href="#TEI.pb" title="pb (page beginning) marks the beginning of a new page in a paginated document. [3.11.3. Milestone Elements]">pb</a>
-                        <a class="link_odd_elementSpec" href="#TEI.ptr" title="ptr (pointer) defines a pointer to another location. [3.7. Simple Links and CrossReferences 16.1. Links]">ptr</a>
+                        <a class="link_odd_elementSpec" href="#TEI.ptr" title="ptr (pointer) defines a pointer to another location. [3.7. Simple Links and CrossReferences 17.1. Links]">ptr</a>
                         <a class="link_odd_elementSpec" href="#TEI.q" title="q (quoted) contains material which is distinguished from the surrounding text using quotation marks or a similar method for any...">q</a>
                         <a class="link_odd_elementSpec" href="#TEI.quote" title="quote (quotation) contains a phrase or passage attributed by the narrator or author to some agency external to the text. [3.3.3...">quote</a>
                         <a class="link_odd_elementSpec" href="#TEI.ref" title="ref (reference) defines a reference to another location possibly modified by additional text or comment. [3.7. Simple Links and...">ref</a>
                         <a class="link_odd_elementSpec" href="#TEI.reg" title="reg (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and Norm...">reg</a>
-                        <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
+                        <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
                         <a class="link_odd_elementSpec" href="#TEI.ruby" title="ruby (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]">ruby</a>
                         <a class="link_odd_elementSpec" href="#TEI.said" title="said (speech or thought) indicates passages thought or spoken aloud whether explicitly indicated in the source or not whether d...">said</a>
                         <a class="link_odd_elementSpec" href="#TEI.sic" title="sic (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]">sic</a>
@@ -593,14 +593,14 @@ <h2>
                       <span class="specChildModule">linking:</span>
                       <span class="specChildElements">
                         <a class="link_odd_elementSpec" href="#TEI.ab" title="ab (anonymous block) contains any componentlevel unit of text acting as a container for phrase or inter level elements analogou...">ab</a>
-                        <a class="link_odd_elementSpec" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]">alt</a>
-                        <a class="link_odd_elementSpec" href="#TEI.altGrp" title="altGrp (alternation group) groups a collection of &lt;alt&gt; elements and possibly pointers. [16.8. Alternation]">altGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]">alt</a>
+                        <a class="link_odd_elementSpec" href="#TEI.altGrp" title="altGrp (alternation group) groups a collection of &lt;alt&gt; elements and possibly pointers. [17.8. Alternation]">altGrp</a>
                         <a class="link_odd_elementSpec" href="#TEI.anchor" title="anchor (anchor point) attaches an identifier to a point within a text whether or not it corresponds with a textual element. [8....">anchor</a>
                         <a class="link_odd_elementSpec" href="#TEI.join" title="join (join) identifies a possibly fragmented segment of text by pointing at the possibly discontiguous elements which compose i...">join</a>
-                        <a class="link_odd_elementSpec" href="#TEI.joinGrp" title="joinGrp (join group) groups a collection of &lt;join&gt; elements and possibly pointers. [16.7. Aggregation]">joinGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.joinGrp" title="joinGrp (join group) groups a collection of &lt;join&gt; elements and possibly pointers. [17.7. Aggregation]">joinGrp</a>
                         <a class="link_odd_elementSpec" href="#TEI.link" title="link (link) defines an association or hypertextual link among elements or passages of some type not more precisely specifiable ...">link</a>
-                        <a class="link_odd_elementSpec" href="#TEI.linkGrp" title="linkGrp (link group) defines a collection of associations or hypertextual links. [16.1. Links]">linkGrp</a>
-                        <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
+                        <a class="link_odd_elementSpec" href="#TEI.linkGrp" title="linkGrp (link group) defines a collection of associations or hypertextual links. [17.1. Links]">linkGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
                         <a class="link_odd_elementSpec" href="#TEI.timeline" title="timeline (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a tempo...">timeline</a>
                       </span>
                     </div>
@@ -726,7 +726,7 @@ <h2>
                           <a class="link_odd_elementSpec" href="#TEI.rb" title="rb (ruby base) contains the base text annotated by a ruby gloss. [3.4.2. Ruby Annotations]">rb</a>
                           <a class="link_odd_elementSpec" href="#TEI.ref" title="ref (reference) defines a reference to another location possibly modified by additional text or comment. [3.7. Simple Links and...">ref</a>
                           <a class="link_odd_elementSpec" href="#TEI.reg" title="reg (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and Norm...">reg</a>
-                          <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
+                          <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
                           <a class="link_odd_elementSpec" href="#TEI.rt" title="rt (ruby text) contains a ruby text an annotation closely associated with a passage of the main text. [3.4.2. Ruby Annotations]">rt</a>
                           <a class="link_odd_elementSpec" href="#TEI.said" title="said (speech or thought) indicates passages thought or spoken aloud whether explicitly indicated in the source or not whether d...">said</a>
                           <a class="link_odd_elementSpec" href="#TEI.sic" title="sic (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]">sic</a>
@@ -757,10 +757,10 @@ <h2>
                           <a class="link_odd_elementSpec" href="#TEI.edition" title="edition (edition) describes the particularities of one edition of a text. [2.2.2. The Edition Statement]">edition</a>
                           <a class="link_odd_elementSpec" href="#TEI.extent" title="extent (extent) describes the approximate size of a text stored on some carrier medium or of some other object digital or nondi...">extent</a>
                           <a class="link_odd_elementSpec" href="#TEI.geoDecl" title="geoDecl (geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as ...">geoDecl</a>
-                          <a class="link_odd_elementSpec" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [10.7.2. Writing Decoration and...">handNote</a>
+                          <a class="link_odd_elementSpec" href="#TEI.handNote" title="handNote (note on hand) describes a particular style or hand distinguished within a manuscript. [11.7.2. Writing Decoration and...">handNote</a>
                           <a class="link_odd_elementSpec" href="#TEI.licence" title="licence contains information about a licence or other legal agreement applicable to the text. [2.2.4. Publication Distribution ...">licence</a>
                           <a class="link_odd_elementSpec" href="#TEI.rendition" title="rendition (rendition) supplies information about the rendition or appearance of one or more elements in the source text. [2.3.4...">rendition</a>
-                          <a class="link_odd_elementSpec" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Wri...">scriptNote</a>
+                          <a class="link_odd_elementSpec" href="#TEI.scriptNote" title="scriptNote describes a particular script distinguished within the description of a manuscript or similar resource. [11.7.2. Wri...">scriptNote</a>
                           <a class="link_odd_elementSpec" href="#TEI.tagUsage" title="tagUsage (element usage) documents the usage of a specific element within a specified document. [2.3.4. The Tagging Declaration...">tagUsage</a>
                         </span>
                       </div>
@@ -768,7 +768,7 @@ <h2>
                         <span class="specChildModule">linking:</span>
                         <span class="specChildElements">
                           <a class="link_odd_elementSpec" href="#TEI.ab" title="ab (anonymous block) contains any componentlevel unit of text acting as a container for phrase or inter level elements analogou...">ab</a>
-                          <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
+                          <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
                         </span>
                       </div>
                       <div class="specChild">
@@ -852,12 +852,12 @@ <h2>
                         <a class="link_odd_elementSpec" href="#TEI.orig" title="orig (original form) contains a reading which is marked as following the original rather than being normalized or corrected. [3...">orig</a>
                         <a class="link_odd_elementSpec" href="#TEI.p" title="p (paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]">p</a>
                         <a class="link_odd_elementSpec" href="#TEI.pb" title="pb (page beginning) marks the beginning of a new page in a paginated document. [3.11.3. Milestone Elements]">pb</a>
-                        <a class="link_odd_elementSpec" href="#TEI.ptr" title="ptr (pointer) defines a pointer to another location. [3.7. Simple Links and CrossReferences 16.1. Links]">ptr</a>
+                        <a class="link_odd_elementSpec" href="#TEI.ptr" title="ptr (pointer) defines a pointer to another location. [3.7. Simple Links and CrossReferences 17.1. Links]">ptr</a>
                         <a class="link_odd_elementSpec" href="#TEI.q" title="q (quoted) contains material which is distinguished from the surrounding text using quotation marks or a similar method for any...">q</a>
                         <a class="link_odd_elementSpec" href="#TEI.quote" title="quote (quotation) contains a phrase or passage attributed by the narrator or author to some agency external to the text. [3.3.3...">quote</a>
                         <a class="link_odd_elementSpec" href="#TEI.ref" title="ref (reference) defines a reference to another location possibly modified by additional text or comment. [3.7. Simple Links and...">ref</a>
                         <a class="link_odd_elementSpec" href="#TEI.reg" title="reg (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and Norm...">reg</a>
-                        <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
+                        <a class="link_odd_elementSpec" href="#TEI.rs" title="rs (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]">rs</a>
                         <a class="link_odd_elementSpec" href="#TEI.ruby" title="ruby (ruby container) contains a passage of base text along with its associated ruby gloss(es). [3.4.2. Ruby Annotations]">ruby</a>
                         <a class="link_odd_elementSpec" href="#TEI.said" title="said (speech or thought) indicates passages thought or spoken aloud whether explicitly indicated in the source or not whether d...">said</a>
                         <a class="link_odd_elementSpec" href="#TEI.sic" title="sic (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]">sic</a>
@@ -889,14 +889,14 @@ <h2>
                       <span class="specChildModule">linking:</span>
                       <span class="specChildElements">
                         <a class="link_odd_elementSpec" href="#TEI.ab" title="ab (anonymous block) contains any componentlevel unit of text acting as a container for phrase or inter level elements analogou...">ab</a>
-                        <a class="link_odd_elementSpec" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]">alt</a>
-                        <a class="link_odd_elementSpec" href="#TEI.altGrp" title="altGrp (alternation group) groups a collection of &lt;alt&gt; elements and possibly pointers. [16.8. Alternation]">altGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]">alt</a>
+                        <a class="link_odd_elementSpec" href="#TEI.altGrp" title="altGrp (alternation group) groups a collection of &lt;alt&gt; elements and possibly pointers. [17.8. Alternation]">altGrp</a>
                         <a class="link_odd_elementSpec" href="#TEI.anchor" title="anchor (anchor point) attaches an identifier to a point within a text whether or not it corresponds with a textual element. [8....">anchor</a>
                         <a class="link_odd_elementSpec" href="#TEI.join" title="join (join) identifies a possibly fragmented segment of text by pointing at the possibly discontiguous elements which compose i...">join</a>
-                        <a class="link_odd_elementSpec" href="#TEI.joinGrp" title="joinGrp (join group) groups a collection of &lt;join&gt; elements and possibly pointers. [16.7. Aggregation]">joinGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.joinGrp" title="joinGrp (join group) groups a collection of &lt;join&gt; elements and possibly pointers. [17.7. Aggregation]">joinGrp</a>
                         <a class="link_odd_elementSpec" href="#TEI.link" title="link (link) defines an association or hypertextual link among elements or passages of some type not more precisely specifiable ...">link</a>
-                        <a class="link_odd_elementSpec" href="#TEI.linkGrp" title="linkGrp (link group) defines a collection of associations or hypertextual links. [16.1. Links]">linkGrp</a>
-                        <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
+                        <a class="link_odd_elementSpec" href="#TEI.linkGrp" title="linkGrp (link group) defines a collection of associations or hypertextual links. [17.1. Links]">linkGrp</a>
+                        <a class="link_odd_elementSpec" href="#TEI.seg" title="seg (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks Segments and Anchors 6.2. Comp...">seg</a>
                         <a class="link_odd_elementSpec" href="#TEI.timeline" title="timeline (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a tempo...">timeline</a>
                       </span>
                     </div>
@@ -968,7 +968,7 @@ <h1>
               <a class="link_ref" href="#TEI.TEI" title="TEI (TEI document) contains a single TEIconformant document combining a single TEI header with one or more members of the model...">&lt;TEI&gt;</a>(or 
               <a class="link_ref" href="#TEI.teiCorpus" title="teiCorpus (TEI corpus) contains the whole of a TEI encoded corpus comprising a single corpus header and one or more &lt;TEI&gt; eleme...">&lt;teiCorpus&gt;</a>) element.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ab">
@@ -977,7 +977,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">anonymous block</span>) 
               <span xml:lang="en" lang="en">contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>]</td>
             </tr>
             <tr>
               <td id="TEI.abbr">
@@ -1034,7 +1034,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">alternation</span>) 
               <span xml:lang="en" lang="en">identifies an alternation or a set of choices among elements or passages.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.altGrp">
@@ -1043,8 +1043,8 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">alternation group</span>) 
               <span xml:lang="en" lang="en">groups a collection of 
-              <a class="link_ref" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]">&lt;alt&gt;</a>elements and possibly pointers.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</a>]</td>
+              <a class="link_ref" href="#TEI.alt" title="alt (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]">&lt;alt&gt;</a>elements and possibly pointers.</span>[
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.analytic">
@@ -1063,7 +1063,7 @@ <h1>
               <span xml:lang="en" lang="en">anchor point</span>) 
               <span xml:lang="en" lang="en">attaches an identifier to a point within a text, whether or not it corresponds with a textual element.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSSAPA">8.4.2. Synchronization and Overlap</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">16.5. Correspondence and Alignment</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">17.5. Correspondence and Alignment</a>]</td>
             </tr>
             <tr>
               <td id="TEI.annotation">
@@ -1071,7 +1071,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-annotation.html">annotation</a>
               </span>: 
               <span xml:lang="en" lang="en">represents an annotation following the Web Annotation Data Model.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.appInfo">
@@ -1149,7 +1149,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for indicating calendar systems to which a date belongs.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.canonical">
@@ -1157,7 +1157,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.canonical.html">att.canonical</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.citeStructurePart">
@@ -1174,6 +1174,14 @@ <h1>
               <span xml:lang="en" lang="en">provides attributes for specifying the specific part of a bibliographic item being cited.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
+            <tr>
+              <td id="TEI.att.cmc">
+              <span class="hi">
+                <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.cmc.html">att.cmc</a>
+              </span>: (
+              <span xml:lang="en" lang="en">computer-mediated communication</span>) 
+              <span xml:lang="en" lang="en">provides attributes categorizing how the element content was created in a CMC environment.</span></td>
+            </tr>
             <tr>
               <td id="TEI.att.datable">
               <span class="hi">
@@ -1181,7 +1189,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for normalization of elements that contain dates, times, or datable events.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.datable.w3c">
@@ -1190,7 +1198,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for normalization of elements that contain datable events conforming to the W3C XML Schema Part 2: Datatypes Second Edition.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.datcat">
@@ -1198,8 +1206,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.datcat.html">att.datcat</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by an external taxonomy, in this way establishing the identity of information containers and values, and providing means of interpreting them.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">9.5.2. Lexical View</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">18.3. Other Atomic Feature Values</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">10.5.2. Lexical View</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">19.3. Other Atomic Feature Values</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.declarable">
@@ -1208,7 +1216,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for those elements in the TEI header which may be independently selected by means of the special purpose 
               <span class="att">decls</span>attribute.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual Information with a Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual Information with a Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.declaring">
@@ -1216,7 +1224,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.declaring.html">att.declaring</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements which may be independently associated with a particular declarable element within the header, thus overriding the inherited default for that element.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual Information with a Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual Information with a Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.dimensions">
@@ -1247,9 +1255,9 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes describing the nature of an encoded scholarly intervention or interpretation of any kind.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">10.3.1. Origination</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">11.3.1. Origination</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.edition">
@@ -1287,7 +1295,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.global.linking.html">att.global.linking</a>
               </span>: 
               <span xml:lang="en" lang="en">provides a set of attributes for hypertextual linking.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.global.rendition">
@@ -1305,9 +1313,9 @@ <h1>
               <span xml:lang="en" lang="en">provides attributes indicating the agent responsible for some aspect of the text, the markup or something asserted by the markup, and the degree of certainty associated with it.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STGAso">1.3.1.1.4. Sources, certainty, and responsibility</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">11.3.2.2. Hand, Responsibility, and Certainty Attributes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">17.3. Spans and Interpretations</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">12.3.2.2. Hand, Responsibility, and Certainty Attributes</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">18.3. Spans and Interpretations</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.global.source">
@@ -1325,7 +1333,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.handFeatures.html">att.handFeatures</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes describing aspects of the hand in which a manuscript is written.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.internetMedia">
@@ -1341,7 +1349,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for referencing locations by pointing to entries in a canonical list of places.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HDUDECL">2.3.9. The Unit Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.measurement">
@@ -1374,7 +1382,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes common to elements which refer to named persons, places, organizations etc.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">13.3.7. Names and Nyms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">14.3.7. Names and Nyms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.notated">
@@ -1389,7 +1397,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.patternReplacement.html">att.patternReplacement</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for regular-expression matching and replacement.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54M">2.3.6.3. Milestone Method</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54">2.3.6. The Reference System Declaration</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54S">2.3.6.2. Search-and-Replace Method</a>]</td>
@@ -1401,7 +1409,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">attributes for components of names usually, but not necessarily, personal names</span>) 
               <span xml:lang="en" lang="en">common attributes for those elements which form part of a name usually, but not necessarily, a personal name.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.placement">
@@ -1410,7 +1418,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for describing where on the source page or object a textual element appears.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.pointing">
@@ -1427,7 +1435,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.pointing.group.html">att.pointing.group</a>
               </span>: 
               <span xml:lang="en" lang="en">provides a set of attributes common to all elements which enclose groups of pointer elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.ranging">
@@ -1449,8 +1457,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.segLike.html">att.segLike</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements used for arbitrary segmentation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.sortable">
@@ -1458,7 +1466,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.sortable.html">att.sortable</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements in lists or groups that are sortable, but whose sorting key cannot be derived mechanically from the element content.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.spanning">
@@ -1466,7 +1474,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.spanning.html">att.spanning</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes for elements which delimit a span of text by pointing mechanisms rather than by enclosing it.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>]</td>
             </tr>
             <tr>
@@ -1490,7 +1498,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-att.transcriptional.html">att.transcriptional</a>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes specific to elements encoding authorial or scribal intervention in a text when transcribing manuscript or similar sources.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.typed">
@@ -1499,7 +1507,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">provides attributes that can be used to classify or subclassify elements in any way.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">17.1.1. Words and Above</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">18.1.1. Words and Above</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAB">3.6.5. Abbreviations and Their Expansions</a>
@@ -1509,14 +1517,14 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSDIV2">4.1.2. Numbered Divisions</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSHD">4.2.1. Headings and Trailers</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSVIRT">4.4. Virtual Divisions</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">13.3.2.3. Personal Relationships</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">16.1.1. Pointers and Links</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">12.2. Linking the Apparatus to the Text</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">22.5.1.2. Defining Content Models: RELAX NG</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">14.3.2.3. Personal Relationships</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">17.1.1. Pointers and Links</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">13.2. Linking the Apparatus to the Text</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">23.5.1.2. Defining Content Models: RELAX NG</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSBA">8.3. Elements Unique to Spoken Texts</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">23.3.1.3. Modification of Attribute and Attribute Value Lists</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">24.3.1.3. Modification of Attribute and Attribute Value Lists</a>]</td>
             </tr>
             <tr>
               <td id="TEI.att.written">
@@ -1573,7 +1581,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.biblFull">
@@ -1585,7 +1593,7 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.biblScope">
@@ -1605,7 +1613,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.binaryObject">
@@ -1710,7 +1718,7 @@ <h1>
               <span xml:lang="en" lang="en">documents a change or set of changes made during the production of a source document, or during the revision of an electronic file.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4C">2.4.1. Creation</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.choice">
@@ -1730,7 +1738,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHQQ">3.3.3. Quotation</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">9.3.5.1. Examples</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">10.3.5.1. Examples</a>]</td>
             </tr>
             <tr>
               <td id="TEI.citeData">
@@ -1740,7 +1748,7 @@ <h1>
               <span xml:lang="en" lang="en">citation data</span>) 
               <span xml:lang="en" lang="en">specifies how information may be extracted from citation structures.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</a>]</td>
             </tr>
             <tr>
               <td id="TEI.citeStructure">
@@ -1750,7 +1758,7 @@ <h1>
               <span xml:lang="en" lang="en">citation structure</span>) 
               <span xml:lang="en" lang="en">declares a structure and method for citing the current document.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</a>]</td>
             </tr>
             <tr>
               <td id="TEI.citedRange">
@@ -1815,7 +1823,7 @@ <h1>
               <span xml:lang="en" lang="en">correction principles</span>) 
               <span xml:lang="en" lang="en">states how and under what circumstances corrections have been made in the text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.correspAction">
@@ -1865,8 +1873,8 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">15.2.3. The Setting Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">16.2.3. The Setting Description</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.dateline">
@@ -1893,7 +1901,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">description</span>) 
               <span xml:lang="en" lang="en">contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</a>]</td>
             </tr>
             <tr>
               <td id="TEI.distinct">
@@ -2074,7 +2082,7 @@ <h1>
               <span xml:lang="en" lang="en">provides details of editorial principles and practices applied during the encoding of a text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ellipsis">
@@ -2144,7 +2152,7 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD23">2.2.3. Type and Extent of File</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">10.7.1. Object Description</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">11.7.1. Object Description</a>]</td>
             </tr>
             <tr>
               <td id="TEI.fileDesc">
@@ -2229,7 +2237,7 @@ <h1>
               <span xml:lang="en" lang="en">gloss</span>) 
               <span xml:lang="en" lang="en">identifies a phrase or word used to provide a gloss or definition for some other word or phrase.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHTG">3.4.1. Terms and Glosses</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</a>]</td>
             </tr>
             <tr>
               <td id="TEI.graphic">
@@ -2239,7 +2247,7 @@ <h1>
               <span xml:lang="en" lang="en">graphic</span>) 
               <span xml:lang="en" lang="en">indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COGR">3.10. Graphics and Other Non-textual Components</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</a>]</td>
             </tr>
             <tr>
               <td id="TEI.group">
@@ -2250,7 +2258,7 @@ <h1>
               <span xml:lang="en" lang="en">contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.handNote">
@@ -2259,7 +2267,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">note on hand</span>) 
               <span xml:lang="en" lang="en">describes a particular style or hand distinguished within a manuscript.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</a>]</td>
             </tr>
             <tr>
               <td id="TEI.head">
@@ -2306,7 +2314,7 @@ <h1>
               <span xml:lang="en" lang="en">hyphenation</span>) 
               <span xml:lang="en" lang="en">summarizes the way in which hyphenation in a source text has been treated in an encoded version of it.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.idno">
@@ -2315,7 +2323,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">identifier</span>) 
               <span xml:lang="en" lang="en">supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD26">2.2.5. The Series Statement</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>]</td>
@@ -2372,7 +2380,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">join</span>) 
               <span xml:lang="en" lang="en">identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.joinGrp">
@@ -2382,7 +2390,7 @@ <h1>
               <span xml:lang="en" lang="en">join group</span>) 
               <span xml:lang="en" lang="en">groups a collection of 
               <a class="link_ref" href="#TEI.join" title="join (join) identifies a possibly fragmented segment of text by pointing at the possibly discontiguous elements which compose i...">&lt;join&gt;</a>elements and possibly pointers.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</a>]</td>
             </tr>
             <tr>
               <td id="TEI.keywords">
@@ -2422,7 +2430,7 @@ <h1>
               <span xml:lang="en" lang="en">describes the languages, sublanguages, registers, dialects, etc. represented within a text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD41">2.4.2. Language Usage</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4">2.4. The Profile Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.language">
@@ -2469,7 +2477,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">link</span>) 
               <span xml:lang="en" lang="en">defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.linkGrp">
@@ -2478,7 +2486,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">link group</span>) 
               <span xml:lang="en" lang="en">defines a collection of associations or hypertextual links.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.list">
@@ -2495,11 +2503,11 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-listAnnotation.html">listAnnotation</a>
               </span>: 
               <span xml:lang="en" lang="en">contains a list of annotations, typically encoded as 
-              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container]">&lt;annotation&gt;</a>, 
+              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container]">&lt;annotation&gt;</a>, 
               <span class="gi">&lt;annotationBlock&gt;</span>, or 
               <a class="link_ref" href="#TEI.note" title="note (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and S...">&lt;note&gt;</a>, possibly organized with nested 
               <a class="link_ref" href="#TEI.listAnnotation" title="listAnnotation contains a list of annotations typically encoded as &lt;annotation&gt; annotationBlock or &lt;note&gt; possibly organized wi...">&lt;listAnnotation&gt;</a>elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listBibl">
@@ -2510,7 +2518,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a list of bibliographic citations of any kind.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listChange">
@@ -2519,7 +2527,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.listPrefixDef">
@@ -2529,7 +2537,7 @@ <h1>
               <span xml:lang="en" lang="en">list of prefix definitions</span>) 
               <span xml:lang="en" lang="en">contains a list of definitions of prefixing schemes used in 
               <span class="ident-datatype">teidata.pointer</span>values, showing how abbreviated URIs using each scheme may be expanded into full URIs.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>]</td>
             </tr>
             <tr>
               <td id="TEI.macro.abContent">
@@ -2601,7 +2609,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">measure group</span>) 
               <span xml:lang="en" lang="en">contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">10.3.4. Dimensions</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">11.3.4. Dimensions</a>]</td>
             </tr>
             <tr>
               <td id="TEI.media">
@@ -2658,7 +2666,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.annotationLike.html">model.annotationLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements used to represent annotations.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.annotationPart.body">
@@ -2666,7 +2674,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.annotationPart.body.html">model.annotationPart.body</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which may be used as an 
-              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [16.10. The standOff Container]">&lt;annotation&gt;</a>body.</span></td>
+              <a class="link_ref" href="#TEI.annotation" title="annotation represents an annotation following the Web Annotation Data Model. [17.10. The standOff Container]">&lt;annotation&gt;</a>body.</span></td>
             </tr>
             <tr>
               <td id="TEI.model.applicationLike">
@@ -2732,6 +2740,19 @@ <h1>
               <a class="link_ref" href="#TEI.choice" title="choice (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]">&lt;choice&gt;</a>alternation.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</a>]</td>
             </tr>
+            <tr>
+              <td id="TEI.model.cmc">
+              <span class="hi">
+                <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.cmc.html">model.cmc</a>
+              </span>: 
+              <span xml:lang="en" lang="en">includes the CMC-specific element 
+              <span class="gi">&lt;post&gt;</span>and makes it available on the divPart level. This allows for using (and combining) occurrences of 
+              <span class="gi">&lt;post&gt;</span>, 
+              <span class="gi">&lt;u&gt;</span>, 
+              <span class="gi">&lt;incident&gt;</span>, and 
+              <span class="gi">&lt;kinesic&gt;</span>in one and the same 
+              <a class="link_ref" href="#TEI.div" title="div (text division) contains a subdivision of the front body or back of a text. [4.1. Divisions of the Body]">&lt;div&gt;</a>in order to be able to represent the combined use of written and spoken posts, utterances, and nonverbal acts on the GUI of multimodal CMC environments.</span></td>
+            </tr>
             <tr>
               <td id="TEI.model.common">
               <span class="hi">
@@ -2768,7 +2789,7 @@ <h1>
               </span>: 
               <span xml:lang="en" lang="en">groups elements containing temporal expressions.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.descLike">
@@ -2910,7 +2931,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.egLike.html">model.egLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements containing examples or illustrations.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">22.1.1. Phrase Level Terms</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">23.1.1. Phrase Level Terms</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.emphLike">
@@ -2934,7 +2955,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.entryPart.html">model.entryPart</a>
               </span>: 
               <span xml:lang="en" lang="en">groups non-morphological elements appearing within a dictionary entry.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.frontPart">
@@ -3121,7 +3142,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.offsetLike.html">model.offsetLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which can appear only as part of a place name.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.pLike">
@@ -3168,7 +3189,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.pPart.msdesc.html">model.pPart.msdesc</a>
               </span>: 
               <span xml:lang="en" lang="en">groups phrase-level elements used in manuscript description.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">10. Manuscript Description</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">11. Manuscript Description</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.pPart.transcriptional">
@@ -3200,7 +3221,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.phrase.xml.html">model.phrase.xml</a>
               </span>: 
               <span xml:lang="en" lang="en">groups phrase-level elements used to encode XML constructs such as element names, attribute names, and attribute values</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.placeNamePart">
@@ -3208,7 +3229,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.placeNamePart.html">model.placeNamePart</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements which form part of a place name.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.placeStateLike">
@@ -3279,8 +3300,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.segLike.html">model.segLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements used for arbitrary segmentation.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.sourceDescPart">
@@ -3296,7 +3317,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-model.specDescLike.html">model.specDescLike</a>
               </span>: 
               <span xml:lang="en" lang="en">groups elements for referring to specification elements.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.model.stageLike">
@@ -3368,7 +3389,7 @@ <h1>
               <span xml:lang="en" lang="en">normalization</span>) 
               <span xml:lang="en" lang="en">indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.note">
@@ -3380,7 +3401,7 @@ <h1>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONONO">3.9.1. Notes and Simple Annotation</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD27">2.2.6. The Notes Statement</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICON">3.12.2.8. Notes and Statement of Language</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">9.3.5.4. Notes within Entries</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">10.3.5.4. Notes within Entries</a>]</td>
             </tr>
             <tr>
               <td id="TEI.noteGrp">
@@ -3427,7 +3448,7 @@ <h1>
               <span xml:lang="en" lang="en">original form</span>) 
               <span xml:lang="en" lang="en">contains a reading which is marked as following the original, rather than being normalized or corrected.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and Normalization</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</a>]</td>
             </tr>
             <tr>
               <td id="TEI.p">
@@ -3482,7 +3503,7 @@ <h1>
               <span xml:lang="en" lang="en">prefix definition</span>) 
               <span xml:lang="en" lang="en">defines a prefixing scheme used in 
               <span class="ident-datatype">teidata.pointer</span>values, showing how abbreviated URIs using the scheme may be expanded into full URIs.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</a>]</td>
             </tr>
             <tr>
               <td id="TEI.principal">
@@ -3512,7 +3533,7 @@ <h1>
               <span xml:lang="en" lang="en">describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD51">2.3.1. The Project Description</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.ptr">
@@ -3522,7 +3543,7 @@ <h1>
               <span xml:lang="en" lang="en">pointer</span>) 
               <span xml:lang="en" lang="en">defines a pointer to another location.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.pubPlace">
@@ -3579,7 +3600,7 @@ <h1>
               <span xml:lang="en" lang="en">quotation</span>) 
               <span xml:lang="en" lang="en">specifies editorial practice adopted with respect to quotation marks in the original.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.quote">
@@ -3608,7 +3629,7 @@ <h1>
               <span xml:lang="en" lang="en">reference</span>) 
               <span xml:lang="en" lang="en">defines a reference to another location, possibly modified by additional text or comment.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</a>]</td>
             </tr>
             <tr>
               <td id="TEI.refState">
@@ -3639,7 +3660,7 @@ <h1>
               <span xml:lang="en" lang="en">regularization</span>) 
               <span xml:lang="en" lang="en">contains a reading which has been regularized or normalized in some sense.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and Normalization</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</a>]</td>
             </tr>
             <tr>
               <td id="TEI.relatedItem">
@@ -3699,7 +3720,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">referencing string</span>) 
               <span xml:lang="en" lang="en">contains a general purpose name or referring string.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</a>]</td>
             </tr>
             <tr>
@@ -3747,7 +3768,7 @@ <h1>
               <span xml:lang="en" lang="en">contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD52">2.3.2. The Sampling Declaration</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.schemaRef">
@@ -3764,7 +3785,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-scriptNote.html">scriptNote</a>
               </span>: 
               <span xml:lang="en" lang="en">describes a particular script distinguished within the description of a manuscript or similar resource.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</a>]</td>
             </tr>
             <tr>
               <td id="TEI.seg">
@@ -3773,7 +3794,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">arbitrary segment</span>) 
               <span xml:lang="en" lang="en">represents any segmentation of text below the ‘chunk’ level.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/VE.html#VESE">6.2. Components of the Verse Line</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DR.html#DRPAL">7.2.5. Speech Contents</a>]</td>
             </tr>
@@ -3785,7 +3806,7 @@ <h1>
               <span xml:lang="en" lang="en">segmentation</span>) 
               <span xml:lang="en" lang="en">describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.series">
@@ -3839,7 +3860,8 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-sourceDesc.html">sourceDesc</a>
               </span>: (
               <span xml:lang="en" lang="en">source description</span>) 
-              <span xml:lang="en" lang="en">describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence.</span>[
+              <span xml:lang="en" lang="en">describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as 
+              <span class="q">‘born digital’</span>for a text which has no previous existence.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</a>]</td>
             </tr>
             <tr>
@@ -3887,7 +3909,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-standOff.html">standOff</a>
               </span>: 
               <span xml:lang="en" lang="en">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</a>]</td>
             </tr>
             <tr>
               <td id="TEI.stdVals">
@@ -3897,7 +3919,7 @@ <h1>
               <span xml:lang="en" lang="en">standard values</span>) 
               <span xml:lang="en" lang="en">specifies the format used when standardized date or number values are supplied.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</a>]</td>
             </tr>
             <tr>
               <td id="TEI.street">
@@ -3953,7 +3975,7 @@ <h1>
               <span xml:lang="en" lang="en">contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more 
               <a class="link_ref" href="#TEI.TEI" title="TEI (TEI document) contains a single TEIconformant document combining a single TEI header with one or more members of the model...">&lt;TEI&gt;</a>elements, each containing a single text header and a text.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.teiHeader">
@@ -3963,7 +3985,7 @@ <h1>
               <span xml:lang="en" lang="en">TEI header</span>) 
               <span xml:lang="en" lang="en">supplies descriptive and declarative metadata associated with a digital resource or set of resources.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD11">2.1.1. The TEI Header and Its Components</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.teidata.certainty">
@@ -4167,7 +4189,7 @@ <h1>
               <span xml:lang="en" lang="en">text</span>) 
               <span xml:lang="en" lang="en">contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</a>]</td>
             </tr>
             <tr>
               <td id="TEI.textClass">
@@ -4186,7 +4208,7 @@ <h1>
               <span xml:lang="en" lang="en">text language</span>) 
               <span xml:lang="en" lang="en">describes the languages and writing systems identified within the bibliographic work being described, rather than its description.</span>[
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</a>
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">10.6.6. Languages and Writing Systems</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">11.6.6. Languages and Writing Systems</a>]</td>
             </tr>
             <tr>
               <td id="TEI.time">
@@ -4204,7 +4226,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">timeline</span>) 
               <span xml:lang="en" lang="en">provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</a>]</td>
             </tr>
             <tr>
               <td id="TEI.title">
@@ -4261,7 +4283,7 @@ <h1>
               </span>: (
               <span xml:lang="en" lang="en">unclear</span>) 
               <span xml:lang="en" lang="en">contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</a>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</a>
               <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</a>]</td>
             </tr>
             <tr>
@@ -4296,7 +4318,7 @@ <h1>
                 <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-when.html">when</a>
               </span>: 
               <span xml:lang="en" lang="en">indicates a point in time either relative to other elements in the same timeline tag, or absolutely.</span>[
-              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</a>]</td>
+              <a class="link_ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</a>]</td>
             </tr>
             <tr>
               <td id="TEI.xenoData">
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 307da35c1..3c0c85a19 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -218,6 +218,48 @@ tei_att.breaking.attribute.break =
   attribute break {
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
+tei_att.cmc.attributes = tei_att.cmc.attribute.generatedBy
+tei_att.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "foo-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 tei_att.cReferencing.attributes = tei_att.cReferencing.attribute.cRef
 tei_att.cReferencing.attribute.cRef =
   [
@@ -300,7 +342,7 @@ tei_att.datable.w3c.attribute.to =
     | xsd:dateTime
   }?
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-when-constraint-rule-1"
+  id = "foo-att.datable.w3c-att-datable-w3c-when-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -319,7 +361,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-from-constraint-rule-2"
+  id = "foo-att.datable.w3c-att-datable-w3c-from-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -338,7 +380,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-to-constraint-rule-3"
+  id = "foo-att.datable.w3c-att-datable-w3c-to-constraint-rule-4"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -609,7 +651,7 @@ tei_att.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-4"
+    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-5"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -898,7 +940,7 @@ tei_att.measurement.attribute.commodity =
     }
   }?
 sch:pattern [
-  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-5"
+  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1004,7 +1046,7 @@ tei_att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "foo-att.typed-subtypeTyped-constraint-rule-6"
+  id = "foo-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1047,7 +1089,7 @@ tei_att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1168,7 +1210,7 @@ tei_att.spanning.attribute.spanTo =
   }?
 sch:pattern [
   id =
-    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1225,7 +1267,7 @@ tei_att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1865,6 +1907,7 @@ tei_model.global =
 tei_model.biblPart =
   tei_model.respLike
   | tei_model.imprintPart
+  | tei_quote
   | tei_series
   | tei_citedRange
   | tei_bibl
@@ -1919,7 +1962,9 @@ tei_model.inter =
   | tei_model.listLike
   | tei_model.stageLike
   | tei_model.attributable
-tei_model.common = tei_model.divPart | tei_model.inter | tei_q
+tei_model.cmc = notAllowed
+tei_model.common =
+  tei_model.divPart | tei_model.inter | tei_model.cmc | tei_q
 tei_model.phrase =
   tei_model.segLike
   | tei_model.highlighted
@@ -1996,6 +2041,7 @@ tei_model.standOffPart =
   | tei_model.biblLike
   | tei_model.listLike
   | tei_model.annotationLike
+  | tei_xenoData
   | tei_listChange
   | tei_seg
   | tei_listAnnotation
@@ -2070,7 +2116,7 @@ tei_att.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2155,7 +2201,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2177,7 +2223,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2201,19 +2247,26 @@ tei_p =
     tei_att.declaring.attributes,
     tei_att.fragmentable.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_foreign =
   
   ## (foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]
   element foreign {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_emph =
   
   ## (emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
   element emph {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_hi =
   
@@ -2222,6 +2275,7 @@ tei_hi =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_distinct =
@@ -2231,6 +2285,7 @@ tei_distinct =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## specifies the sublanguage or register to which the word or phrase is being assigned
     attribute type {
@@ -2254,6 +2309,7 @@ tei_said =
     tei_macro.specialPara,
     tei_att.global.attributes,
     tei_att.ascribed.directed.attributes,
+    tei_att.cmc.attributes,
     
     ## may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.
     attribute aloud {
@@ -2287,6 +2343,7 @@ tei_quote =
     tei_att.global.attributes,
     tei_att.typed.attributes,
     tei_att.notated.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_q =
@@ -2296,6 +2353,7 @@ tei_q =
     tei_macro.specialPara,
     tei_att.global.attributes,
     tei_att.ascribed.directed.attributes,
+    tei_att.cmc.attributes,
     
     ## (type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
     ## Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (written); 4] soCalled (so called); 5] foreign (foreign); 6] distinct (distinct); 7] term; 8] emph (emph); 9] mentioned (mentioned)
@@ -2333,7 +2391,7 @@ tei_q =
   }
 tei_cit =
   
-  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]
+  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]
   element cit {
     (tei_model.biblLike
      | tei_model.egLike
@@ -2345,28 +2403,35 @@ tei_cit =
      | tei_q)+,
     tei_att.global.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_mentioned =
   
   ## marks words or phrases mentioned, not used. [3.3.3. Quotation]
   element mentioned {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_soCalled =
   
   ## (so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]
   element soCalled {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_desc =
   
-  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]
+  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]
   element desc {
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2389,21 +2454,17 @@ tei_desc =
        ],
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Suggested values include: 1] deprecationInfo (deprecation information)
     attribute type {
-      
-      ## (deprecation
-      ##           information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
-      "deprecationInfo"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
 tei_gloss =
   
-  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]
+  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]
   element gloss {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
@@ -2411,6 +2472,7 @@ tei_gloss =
     tei_att.typed.attributes,
     tei_att.pointing.attributes,
     tei_att.cReferencing.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_term =
@@ -2425,6 +2487,7 @@ tei_term =
     tei_att.canonical.attributes,
     tei_att.sortable.attributes,
     tei_att.cReferencing.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ruby =
@@ -2434,6 +2497,7 @@ tei_ruby =
     (tei_rb, tei_rt+),
     tei_att.global.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_rb =
@@ -2460,7 +2524,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-rule-14"
+         id = "foo-rt-target-rt-target-not-span-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2483,7 +2547,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-from-rt-from-constraint-rule-15"
+         id = "foo-rt-from-rt-from-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2508,7 +2572,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-to-rt-to-constraint-rule-16"
+         id = "foo-rt-to-rt-to-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2533,7 +2597,10 @@ tei_sic =
   
   ## (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]
   element sic {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_corr =
   
@@ -2543,6 +2610,7 @@ tei_corr =
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_choice =
@@ -2553,25 +2621,30 @@ tei_choice =
     (tei_model.choicePart | tei_choice),
     (tei_model.choicePart | tei_choice)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_reg =
   
   ## (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element reg {
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_orig =
   
   ## (original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element orig {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_gap =
   
@@ -2582,6 +2655,7 @@ tei_gap =
     tei_att.timed.attributes,
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     
     ## (reason) gives the reason for omission
     ## Suggested values include: 1] cancelled (cancelled); 2] deleted (deleted); 3] editorial (editorial); 4] illegible (illegible); 5] inaudible (inaudible); 6] irrelevant (irrelevant); 7] sampling (sampling)
@@ -2639,6 +2713,7 @@ tei_add =
     tei_att.placement.attributes,
     tei_att.typed.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_del =
@@ -2650,16 +2725,18 @@ tei_del =
     tei_att.transcriptional.attributes,
     tei_att.typed.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_unclear =
   
-  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
+  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
   element unclear {
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates why the material is hard to transcribe.
     ## Suggested values include: 1] illegible (illegible); 2] inaudible (inaudible); 3] faded (faded); 4] background_noise (background noise); 5] eccentric_ductus (eccentric ductus)
@@ -2701,6 +2778,7 @@ tei_name =
     tei_att.datable.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -2709,7 +2787,7 @@ tei_name =
        }
      }?)
     >> sch:pattern [
-         id = "foo-name-calendar-calendar-check-name-constraint-rule-17"
+         id = "foo-name-calendar-calendar-check-name-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2734,19 +2812,23 @@ tei_name =
   }
 tei_rs =
   
-  ## (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]
+  ## (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]
   element rs {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.naming.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_email =
   
   ## (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]
   element email {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_address =
   
@@ -2754,6 +2836,7 @@ tei_address =
   element address {
     (tei_model.global*, (tei_model.addrPart, tei_model.global*)+),
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_addrLine =
@@ -2785,23 +2868,11 @@ tei_num =
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
     tei_att.ranging.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates the type of numeric value.
-    ## Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage
     attribute type {
-      
-      ## absolute number, e.g. 21, 21.5
-      "cardinal"
-      | 
-        ## ordinal number, e.g. 21st
-        "ordinal"
-      | 
-        ## fraction, e.g. one half or three-quarters
-        "fraction"
-      | 
-        ## a percentage
-        "percentage"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     
     ## supplies the value of the number in standard form.
@@ -2821,6 +2892,7 @@ tei_measure =
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
     tei_att.measurement.attributes,
+    tei_att.cmc.attributes,
     tei_att.ranging.attributes,
     
     ## specifies the type of measurement in any convenient typology.
@@ -2831,12 +2903,13 @@ tei_measure =
   }
 tei_measureGrp =
   
-  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]
+  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]
   element measureGrp {
     (text | tei_model.gLike | tei_model.measureLike)*,
     tei_att.global.attributes,
     tei_att.measurement.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_unit =
@@ -2848,11 +2921,12 @@ tei_unit =
     tei_att.global.attributes,
     tei_att.typed.attributes,
     tei_att.measurement.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_date =
   
-  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]
+  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]
   element date {
     (text | tei_model.gLike | tei_model.phrase | tei_model.global)*,
     tei_att.global.attributes,
@@ -2862,6 +2936,7 @@ tei_date =
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_time =
@@ -2876,6 +2951,7 @@ tei_time =
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_abbr =
@@ -2885,9 +2961,9 @@ tei_abbr =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## (type) allows the encoder to classify the abbreviation according to some convenient typology.
-    ## Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -2900,15 +2976,16 @@ tei_expan =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ptr =
   
-  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]
   element ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-rule-18"
+         id = "foo-ptr-ptrAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2933,15 +3010,16 @@ tei_ptr =
     tei_att.internetMedia.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ref =
   
-  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]
   element ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-rule-19"
+         id = "foo-ref-refAtts-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2967,6 +3045,7 @@ tei_ref =
     tei_att.internetMedia.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_list =
@@ -2980,7 +3059,7 @@ tei_list =
          (tei_label, tei_model.global*, tei_item, tei_model.global*)+)),
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-list-gloss-list-must-have-labels-constraint-rule-20"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3000,31 +3079,11 @@ tei_list =
     tei_att.global.attributes,
     tei_att.sortable.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## (type) describes the nature of the items in the list.
-    ## Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)
     attribute type {
-      [
-        a:documentation [
-          "(gloss) each list item glosses some term or concept, which is given by a "
-          ns1:code [ "<label>" ]
-          " element preceding the list item."
-        ]
-      ]
-      "gloss"
-      | 
-        ## (index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.
-        "index"
-      | 
-        ## (instructions) each list item is a step in a sequence of instructions, as in a recipe.
-        "instructions"
-      | 
-        ## (litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.
-        "litany"
-      | 
-        ## (syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.
-        "syllogism"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -3046,6 +3105,7 @@ tei_label =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_head =
@@ -3063,6 +3123,7 @@ tei_head =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_headLabel =
@@ -3079,7 +3140,7 @@ tei_headItem =
   }
 tei_note =
   
-  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]
+  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]
   element note {
     tei_macro.specialPara,
     tei_att.global.attributes,
@@ -3088,6 +3149,7 @@ tei_note =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.anchoring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_noteGrp =
@@ -3101,6 +3163,7 @@ tei_noteGrp =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.anchoring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_index =
@@ -3110,6 +3173,7 @@ tei_index =
     (tei_term, tei_index?)*,
     tei_att.global.attributes,
     tei_att.spanning.attributes,
+    tei_att.cmc.attributes,
     
     ## a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.
     attribute indexName { xsd:Name }?,
@@ -3128,6 +3192,7 @@ tei_media =
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
     tei_att.timed.attributes,
+    tei_att.cmc.attributes,
     
     ## (MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type
     attribute mimeType {
@@ -3139,7 +3204,7 @@ tei_media =
   }
 tei_graphic =
   
-  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]
+  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]
   element graphic {
     tei_model.descLike*,
     tei_att.global.attributes,
@@ -3147,6 +3212,7 @@ tei_graphic =
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_binaryObject =
@@ -3158,6 +3224,7 @@ tei_binaryObject =
     tei_att.media.attributes,
     tei_att.timed.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     [
       a:documentation [
         "The encoding used to encode the binary data. If not specified, this is assumed to be "
@@ -3184,6 +3251,7 @@ tei_milestone =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_gb =
@@ -3197,6 +3265,7 @@ tei_gb =
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
     tei_att.edition.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_pb =
@@ -3210,6 +3279,7 @@ tei_pb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_lb =
@@ -3223,6 +3293,7 @@ tei_lb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_cb =
@@ -3236,6 +3307,7 @@ tei_cb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_analytic =
@@ -3322,7 +3394,7 @@ tei_author =
      }?)
     >> sch:pattern [
          id =
-           "foo-author-calendar-calendar-check-author-constraint-rule-21"
+           "foo-author-calendar-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3362,7 +3434,7 @@ tei_editor =
      }?)
     >> sch:pattern [
          id =
-           "foo-editor-calendar-calendar-check-editor-constraint-rule-22"
+           "foo-editor-calendar-calendar-check-editor-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3412,7 +3484,7 @@ tei_resp =
        }
      }?)
     >> sch:pattern [
-         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-23"
+         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3444,9 +3516,9 @@ tei_title =
     tei_att.typed.attribute.subtype,
     tei_att.canonical.attributes,
     tei_att.datable.attributes,
+    tei_att.cmc.attributes,
     
     ## classifies the title according to some convenient typology.
-    ## Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3459,7 +3531,7 @@ tei_title =
      }?)
     >> sch:pattern [
          id =
-           "foo-title-calendar-calendar-check-title-constraint-rule-24"
+           "foo-title-calendar-calendar-check-title-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3509,6 +3581,7 @@ tei_meeting =
     tei_att.global.attributes,
     tei_att.datable.attributes,
     tei_att.canonical.attributes,
+    tei_att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -3518,7 +3591,7 @@ tei_meeting =
      }?)
     >> sch:pattern [
          id =
-           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-25"
+           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3591,7 +3664,7 @@ tei_pubPlace =
   }
 tei_bibl =
   
-  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element bibl {
     (text
      | tei_model.gLike
@@ -3607,11 +3680,12 @@ tei_bibl =
     tei_att.typed.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_biblStruct =
   
-  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblStruct {
     (tei_analytic*,
      (tei_monogr, tei_series*)+,
@@ -3624,11 +3698,12 @@ tei_biblStruct =
     tei_att.typed.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_listBibl =
   
-  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element listBibl {
     (tei_model.headLike*,
      tei_desc*,
@@ -3638,6 +3713,7 @@ tei_listBibl =
     tei_att.sortable.attributes,
     tei_att.declarable.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_relatedItem =
@@ -3646,7 +3722,7 @@ tei_relatedItem =
   element relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-rule-26"
+         id = "foo-relatedItem-targetorcontent1-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3690,7 +3766,7 @@ tei_l =
       | tei_model.inter
       | tei_model.global)*)
     >> sch:pattern [
-         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-27"
+         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3710,6 +3786,7 @@ tei_l =
        ],
     tei_att.global.attributes,
     tei_att.fragmentable.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_lg =
@@ -3730,7 +3807,7 @@ tei_lg =
       | tei_lg)*,
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-lg-atleast1oflggapl-constraint-rule-28"
+         id = "foo-lg-atleast1oflggapl-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3750,7 +3827,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3772,6 +3849,7 @@ tei_lg =
     tei_att.divLike.attributes,
     tei_att.typed.attributes,
     tei_att.declaring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_sp =
@@ -3806,6 +3884,7 @@ tei_stage =
     tei_att.global.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3848,7 +3927,7 @@ tei_teiCorpus =
     a:documentation [
       "(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more "
       ns1:code [ "<TEI>" ]
-      " elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      " elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element teiCorpus {
@@ -3871,7 +3950,6 @@ tei_divGen =
     tei_att.typed.attribute.subtype,
     
     ## specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-    ## Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3879,7 +3957,7 @@ tei_divGen =
   }
 tei_textLang =
   
-  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]
+  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]
   element textLang {
     tei_macro.specialPara,
     tei_att.global.attributes,
@@ -3932,7 +4010,7 @@ tei_att.patternReplacement.attribute.replacementPattern =
   attribute replacementPattern { text }
 tei_teiHeader =
   
-  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]
+  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]
   element teiHeader {
     (tei_fileDesc, tei_model.teiHeaderPart*, tei_revisionDesc?),
     tei_att.global.attributes,
@@ -3975,7 +4053,7 @@ tei_sponsor =
      }?)
     >> sch:pattern [
          id =
-           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
+           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4015,7 +4093,7 @@ tei_funder =
      }?)
     >> sch:pattern [
          id =
-           "foo-funder-calendar-calendar-check-funder-constraint-rule-31"
+           "foo-funder-calendar-calendar-check-funder-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4055,7 +4133,7 @@ tei_principal =
      }?)
     >> sch:pattern [
          id =
-           "foo-principal-calendar-calendar-check-principal-constraint-rule-32"
+           "foo-principal-calendar-calendar-check-principal-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4094,7 +4172,7 @@ tei_edition =
   }
 tei_extent =
   
-  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]
+  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]
   element extent {
     tei_macro.phraseSeq, tei_att.global.attributes, empty
   }
@@ -4128,56 +4206,18 @@ tei_authority =
   }
 tei_idno =
   
-  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
+  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element idno {
     (text | tei_model.gLike | tei_idno)*,
     tei_att.global.attributes,
     tei_att.sortable.attributes,
     tei_att.datable.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## categorizes the identifier, for example as an ISBN, Social Security number, etc.
-    ## Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC
     attribute type {
-      [
-        a:documentation [
-          "International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the "
-          ns1:a [
-            href = "https://www.isbn-international.org"
-            " International ISBN Agency."
-          ]
-          "\x{a}" ~
-          "                  "
-        ]
-      ]
-      "ISBN"
-      | 
-        ## International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.
-        "ISSN"
-      | 
-        ## Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.
-        "DOI"
-      | [
-          a:documentation [
-            "Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of "
-            ns1:a [
-              href = "https://datatracker.ietf.org/doc/html/rfc3986"
-              "RFC 3986"
-            ]
-            "."
-          ]
-        ]
-        "URI"
-      | 
-        ## A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.
-        "VIAF"
-      | 
-        ## English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.
-        "ESTC"
-      | 
-        ## OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.
-        "OCLC"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
@@ -4187,7 +4227,7 @@ tei_idno =
        }
      }?)
     >> sch:pattern [
-         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-33"
+         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4249,7 +4289,7 @@ tei_licence =
      }?)
     >> sch:pattern [
          id =
-           "foo-licence-calendar-calendar-check-licence-constraint-rule-34"
+           "foo-licence-calendar-calendar-check-licence-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4294,7 +4334,7 @@ tei_notesStmt =
   }
 tei_sourceDesc =
   
-  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]
+  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]
   element sourceDesc {
     (tei_model.pLike+
      | (tei_model.biblLike
@@ -4306,7 +4346,7 @@ tei_sourceDesc =
   }
 tei_biblFull =
   
-  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element biblFull {
     (((tei_titleStmt,
        tei_editionStmt?,
@@ -4320,6 +4360,7 @@ tei_biblFull =
     tei_att.declarable.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_encodingDesc =
@@ -4345,7 +4386,7 @@ tei_schemaRef =
   }
 tei_projectDesc =
   
-  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element projectDesc {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4354,7 +4395,7 @@ tei_projectDesc =
   }
 tei_samplingDecl =
   
-  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element samplingDecl {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4363,7 +4404,7 @@ tei_samplingDecl =
   }
 tei_editorialDecl =
   
-  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element editorialDecl {
     (tei_model.pLike | tei_model.editorialDeclPart)+,
     tei_att.global.attributes,
@@ -4372,7 +4413,7 @@ tei_editorialDecl =
   }
 tei_correction =
   
-  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element correction {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4408,7 +4449,7 @@ tei_correction =
   }
 tei_normalization =
   
-  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element normalization {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4428,11 +4469,11 @@ tei_normalization =
   }
 tei_quotation =
   
-  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-rule-35"
+         id = "foo-quotation-quotationContents-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4472,7 +4513,7 @@ tei_quotation =
   }
 tei_hyphenation =
   
-  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element hyphenation {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4498,7 +4539,7 @@ tei_hyphenation =
   }
 tei_segmentation =
   
-  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element segmentation {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4507,7 +4548,7 @@ tei_segmentation =
   }
 tei_stdVals =
   
-  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element stdVals {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4659,7 +4700,7 @@ tei_refsDecl =
   }
 tei_citeStructure =
   
-  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeStructure {
     (tei_citeData*, tei_citeStructure*, tei_model.descLike*),
     tei_att.global.attributes,
@@ -4687,7 +4728,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-36"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4708,7 +4749,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-37"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4742,7 +4783,7 @@ tei_citeStructure =
   }
 tei_citeData =
   
-  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element citeData {
     empty,
     tei_att.global.attributes,
@@ -4765,7 +4806,7 @@ tei_cRefPattern =
   }
 tei_prefixDef =
   
-  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element prefixDef {
     tei_model.pLike*,
     tei_att.global.attributes,
@@ -4779,7 +4820,7 @@ tei_prefixDef =
   }
 tei_listPrefixDef =
   
-  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element listPrefixDef {
     (tei_desc*, (tei_prefixDef | tei_listPrefixDef)+),
     tei_att.global.attributes,
@@ -4891,7 +4932,7 @@ tei_unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
+           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4935,7 +4976,7 @@ tei_unitDef =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
+           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4976,7 +5017,7 @@ tei_conversion =
      }?)
     >> sch:pattern [
          id =
-           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-40"
+           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5042,7 +5083,7 @@ tei_application =
      }?)
     >> sch:pattern [
          id =
-           "foo-application-calendar-calendar-check-application-constraint-rule-41"
+           "foo-application-calendar-calendar-check-application-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5105,7 +5146,7 @@ tei_creation =
      }?)
     >> sch:pattern [
          id =
-           "foo-creation-calendar-calendar-check-creation-constraint-rule-42"
+           "foo-creation-calendar-calendar-check-creation-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5130,7 +5171,7 @@ tei_creation =
   }
 tei_langUsage =
   
-  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]
   element langUsage {
     (tei_model.pLike+ | tei_language+),
     tei_att.global.attributes,
@@ -5264,24 +5305,8 @@ tei_correspAction =
     tei_att.sortable.attributes,
     
     ## describes the nature of the action.
-    ## Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded
     attribute type {
-      
-      ## information concerning the sending or dispatch of a message.
-      "sent"
-      | 
-        ## information concerning the receipt of a message.
-        "received"
-      | 
-        ## information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.
-        "transmitted"
-      | 
-        ## information concerning the redirection of an unread message.
-        "redirected"
-      | 
-        ## information concerning the forwarding of a message.
-        "forwarded"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5312,7 +5337,7 @@ tei_revisionDesc =
   }
 tei_change =
   
-  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]
+  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]
   element change {
     tei_macro.specialPara,
     tei_att.ascribed.attributes,
@@ -5329,7 +5354,7 @@ tei_change =
      }?)
     >> sch:pattern [
          id =
-           "foo-change-calendar-calendar-check-change-constraint-rule-43"
+           "foo-change-calendar-calendar-check-change-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5361,7 +5386,7 @@ tei_change =
   }
 tei_listChange =
   
-  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]
+  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]
   element listChange {
     (tei_desc*, (tei_listChange | tei_change)+),
     tei_att.global.attributes,
@@ -5387,7 +5412,7 @@ tei_TEI =
       ns1:code [ "<TEI>" ]
       " (or "
       ns1:code [ "<teiCorpus>" ]
-      ") element. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      ") element. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element TEI {
@@ -5422,7 +5447,7 @@ tei_TEI =
   }
 tei_text =
   
-  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element text {
     (tei_model.global*,
      (tei_front, tei_model.global*)?,
@@ -5458,7 +5483,7 @@ tei_body =
   }
 tei_group =
   
-  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]
+  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]
   element group {
     ((tei_model.divTop | tei_model.global)*,
      ((tei_text | tei_group),
@@ -5481,6 +5506,7 @@ tei_floatingText =
     tei_att.global.attributes,
     tei_att.declaring.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_div =
@@ -5495,7 +5521,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5517,7 +5543,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5668,6 +5694,7 @@ tei_trailer =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_byline =
@@ -5680,6 +5707,7 @@ tei_byline =
      | tei_docAuthor
      | tei_model.global)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_dateline =
@@ -5692,6 +5720,7 @@ tei_dateline =
      | tei_model.global
      | tei_docDate)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_argument =
@@ -5701,6 +5730,7 @@ tei_argument =
     ((tei_model.global | tei_model.headLike)*,
      (tei_model.common, tei_model.global*)+),
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_epigraph =
@@ -5709,6 +5739,7 @@ tei_epigraph =
   element epigraph {
     (tei_model.common | tei_model.global)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_opener =
@@ -5727,6 +5758,7 @@ tei_opener =
      | tei_model.global)*,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_closer =
@@ -5742,6 +5774,7 @@ tei_closer =
      | tei_model.global)*,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_salute =
@@ -5751,6 +5784,7 @@ tei_salute =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_signed =
@@ -5760,6 +5794,7 @@ tei_signed =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_postscript =
@@ -5772,6 +5807,7 @@ tei_postscript =
      (tei_model.divBottomPart, tei_model.global*)*),
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_titlePage =
@@ -5808,25 +5844,9 @@ tei_titlePart =
     tei_att.typed.attribute.subtype,
     
     ## (type) specifies the role of this subdivision of the title.
-    ## Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)
     [ a:defaultValue = "main" ]
     attribute type {
-      
-      ## (main) main title of the work
-      "main"
-      | 
-        ## (subordinate) subtitle of the work
-        "sub"
-      | 
-        ## (alternate) alternative title of the work
-        "alt"
-      | 
-        ## (short) abbreviated form of title
-        "short"
-      | 
-        ## (descriptive) descriptive paraphrase of the work
-        "desc"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5837,6 +5857,7 @@ tei_docAuthor =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.canonical.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_imprimatur =
@@ -5871,6 +5892,7 @@ tei_docDate =
   element docDate {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     tei_att.datable.attributes,
     tei_att.calendarSystem.attributes,
     empty
@@ -5983,11 +6005,11 @@ tei_att.global.linking.attribute.select =
   }?
 tei_link =
   
-  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]
+  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]
   element link {
     empty
     >> sch:pattern [
-         id = "foo-link-linkTargets3-constraint-rule-46"
+         id = "foo-link-linkTargets3-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6010,25 +6032,27 @@ tei_link =
     tei_att.global.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_linkGrp =
   
-  ## (link group) defines a collection of associations or hypertextual links. [16.1. Links]
+  ## (link group) defines a collection of associations or hypertextual links. [17.1. Links]
   element linkGrp {
     (tei_model.descLike*, (tei_link | tei_ptr)+),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ab =
   
-  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]
+  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]
   element ab {
     tei_macro.abContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6053,17 +6077,22 @@ tei_ab =
     tei_att.declaring.attributes,
     tei_att.fragmentable.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_anchor =
   
-  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
+  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]
   element anchor {
-    empty, tei_att.global.attributes, tei_att.typed.attributes, empty
+    empty,
+    tei_att.global.attributes,
+    tei_att.typed.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_seg =
   
-  ## (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
+  ## (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
   element seg {
     tei_macro.paraContent,
     tei_att.global.attributes,
@@ -6071,11 +6100,12 @@ tei_seg =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.notated.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_when =
   
-  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]
+  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]
   element when {
     empty,
     tei_att.global.attributes,
@@ -6147,10 +6177,11 @@ tei_when =
   }
 tei_timeline =
   
-  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]
+  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]
   element timeline {
     tei_when+,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
     attribute origin {
@@ -6200,11 +6231,11 @@ tei_timeline =
   }
 tei_join =
   
-  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation]
+  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation]
   element join {
     ((tei_model.descLike | tei_model.certLike)*)
     >> sch:pattern [
-         id = "foo-join-joinTargets3-constraint-rule-48"
+         id = "foo-join-joinTargets3-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6228,6 +6259,7 @@ tei_join =
     tei_att.global.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     
     ## specifies the name of an element which this aggregation may be understood to represent.
     attribute result { xsd:Name }?,
@@ -6259,13 +6291,14 @@ tei_joinGrp =
     a:documentation [
       "(join group) groups a collection of "
       ns1:code [ "<join>" ]
-      " elements and possibly pointers. [16.7. Aggregation]"
+      " elements and possibly pointers. [17.7. Aggregation]"
     ]
   ]
   element joinGrp {
     ((tei_gloss | tei_model.descLike)*, (tei_join | tei_ptr)+),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     [
       a:documentation [
         "supplies the default value for the "
@@ -6280,13 +6313,14 @@ tei_joinGrp =
   }
 tei_alt =
   
-  ## (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]
+  ## (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]
   element alt {
     empty,
     tei_att.global.attributes,
     tei_att.pointing.attribute.targetLang,
     tei_att.pointing.attribute.evaluate,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
@@ -6329,13 +6363,14 @@ tei_altGrp =
     a:documentation [
       "(alternation group) groups a collection of "
       ns1:code [ "<alt>" ]
-      " elements and possibly pointers. [16.8. Alternation]"
+      " elements and possibly pointers. [17.8. Alternation]"
     ]
   ]
   element altGrp {
     (tei_model.descLike*, (tei_alt | tei_ptr)*),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
     [ a:defaultValue = "excl" ]
@@ -6351,12 +6386,12 @@ tei_altGrp =
   }
 tei_standOff =
   
-  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]
+  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]
   element standOff {
     (tei_model.standOffPart+)
     >> sch:pattern [
          id =
-           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-49"
+           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6396,7 +6431,7 @@ tei_listAnnotation =
       ns1:code [ "<note>" ]
       ", possibly organized with nested "
       ns1:code [ "<listAnnotation>" ]
-      " elements. [16.10. The standOff Container]"
+      " elements. [17.10. The standOff Container]"
     ]
   ]
   element listAnnotation {
@@ -6418,7 +6453,7 @@ tei_annotation =
         "Web\x{a}" ~
         "      Annotation Data Model"
       ]
-      ". [16.10. The standOff Container]"
+      ". [17.10. The standOff Container]"
     ]
   ]
   element annotation {
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index 052c71539..aad267339 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -218,6 +218,48 @@ tei_att.breaking.attribute.break =
   attribute break {
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
+tei_att.cmc.attributes = tei_att.cmc.attribute.generatedBy
+tei_att.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "foo-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 tei_att.cReferencing.attributes = tei_att.cReferencing.attribute.cRef
 tei_att.cReferencing.attribute.cRef =
   [
@@ -300,7 +342,7 @@ tei_att.datable.w3c.attribute.to =
     | xsd:dateTime
   }?
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-when-constraint-rule-1"
+  id = "foo-att.datable.w3c-att-datable-w3c-when-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -319,7 +361,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-from-constraint-rule-2"
+  id = "foo-att.datable.w3c-att-datable-w3c-from-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -338,7 +380,7 @@ sch:pattern [
   "   "
 ]
 sch:pattern [
-  id = "foo-att.datable.w3c-att-datable-w3c-to-constraint-rule-3"
+  id = "foo-att.datable.w3c-att-datable-w3c-to-constraint-rule-4"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -609,7 +651,7 @@ tei_att.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-4"
+    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-5"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -898,7 +940,7 @@ tei_att.measurement.attribute.commodity =
     }
   }?
 sch:pattern [
-  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-5"
+  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1004,7 +1046,7 @@ tei_att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "foo-att.typed-subtypeTyped-constraint-rule-6"
+  id = "foo-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1047,7 +1089,7 @@ tei_att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1168,7 +1210,7 @@ tei_att.spanning.attribute.spanTo =
   }?
 sch:pattern [
   id =
-    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1225,7 +1267,7 @@ tei_att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1861,6 +1903,7 @@ tei_model.global =
 tei_model.biblPart =
   tei_model.respLike
   | tei_model.imprintPart
+  | tei_quote
   | tei_series
   | tei_citedRange
   | tei_bibl
@@ -1915,7 +1958,9 @@ tei_model.inter =
   | tei_model.listLike
   | tei_model.stageLike
   | tei_model.attributable
-tei_model.common = tei_model.divPart | tei_model.inter | tei_q
+tei_model.cmc = notAllowed
+tei_model.common =
+  tei_model.divPart | tei_model.inter | tei_model.cmc | tei_q
 tei_model.phrase =
   tei_model.segLike
   | tei_model.highlighted
@@ -1992,6 +2037,7 @@ tei_model.standOffPart =
   | tei_model.biblLike
   | tei_model.listLike
   | tei_model.annotationLike
+  | tei_xenoData
   | tei_listChange
   | tei_seg
   | tei_listAnnotation
@@ -2065,7 +2111,7 @@ tei_att.calendarSystem.attribute.calendar =
   }?
 sch:pattern [
   id =
-    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10"
+    "foo-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -2150,7 +2196,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2172,7 +2218,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2196,19 +2242,26 @@ tei_p =
     tei_att.declaring.attributes,
     tei_att.fragmentable.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_foreign =
   
   ## (foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]
   element tei:foreign {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_emph =
   
   ## (emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]
   element tei:emph {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_hi =
   
@@ -2217,6 +2270,7 @@ tei_hi =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_distinct =
@@ -2226,6 +2280,7 @@ tei_distinct =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## specifies the sublanguage or register to which the word or phrase is being assigned
     attribute type {
@@ -2249,6 +2304,7 @@ tei_said =
     tei_macro.specialPara,
     tei_att.global.attributes,
     tei_att.ascribed.directed.attributes,
+    tei_att.cmc.attributes,
     
     ## may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.
     attribute aloud {
@@ -2282,6 +2338,7 @@ tei_quote =
     tei_att.global.attributes,
     tei_att.typed.attributes,
     tei_att.notated.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_q =
@@ -2291,6 +2348,7 @@ tei_q =
     tei_macro.specialPara,
     tei_att.global.attributes,
     tei_att.ascribed.directed.attributes,
+    tei_att.cmc.attributes,
     
     ## (type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
     ## Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (written); 4] soCalled (so called); 5] foreign (foreign); 6] distinct (distinct); 7] term; 8] emph (emph); 9] mentioned (mentioned)
@@ -2328,7 +2386,7 @@ tei_q =
   }
 tei_cit =
   
-  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]
+  ## (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]
   element tei:cit {
     (tei_model.biblLike
      | tei_model.egLike
@@ -2340,28 +2398,35 @@ tei_cit =
      | tei_q)+,
     tei_att.global.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_mentioned =
   
   ## marks words or phrases mentioned, not used. [3.3.3. Quotation]
   element tei:mentioned {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_soCalled =
   
   ## (so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]
   element tei:soCalled {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_desc =
   
-  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]
+  ## (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]
   element tei:desc {
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-13"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2384,21 +2449,17 @@ tei_desc =
        ],
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## characterizes the element in some sense, using any convenient classification scheme or typology.
-    ## Suggested values include: 1] deprecationInfo (deprecation information)
     attribute type {
-      
-      ## (deprecation
-      ##           information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.
-      "deprecationInfo"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
 tei_gloss =
   
-  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]
+  ## (gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]
   element tei:gloss {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
@@ -2406,6 +2467,7 @@ tei_gloss =
     tei_att.typed.attributes,
     tei_att.pointing.attributes,
     tei_att.cReferencing.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_term =
@@ -2420,6 +2482,7 @@ tei_term =
     tei_att.canonical.attributes,
     tei_att.sortable.attributes,
     tei_att.cReferencing.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ruby =
@@ -2429,6 +2492,7 @@ tei_ruby =
     (tei_rb, tei_rt+),
     tei_att.global.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_rb =
@@ -2455,7 +2519,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-rule-14"
+         id = "foo-rt-target-rt-target-not-span-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2478,7 +2542,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-from-rt-from-constraint-rule-15"
+         id = "foo-rt-from-rt-from-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2503,7 +2567,7 @@ tei_rt =
        xsd:anyURI { pattern = "\S+" }
      }?)
     >> sch:pattern [
-         id = "foo-rt-to-rt-to-constraint-rule-16"
+         id = "foo-rt-to-rt-to-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2528,7 +2592,10 @@ tei_sic =
   
   ## (Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]
   element tei:sic {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_corr =
   
@@ -2538,6 +2605,7 @@ tei_corr =
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_choice =
@@ -2548,25 +2616,30 @@ tei_choice =
     (tei_model.choicePart | tei_choice),
     (tei_model.choicePart | tei_choice)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_reg =
   
   ## (regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element tei:reg {
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_orig =
   
   ## (original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-  ## Normalization 12. Critical Apparatus]
+  ## Normalization 13. Critical Apparatus]
   element tei:orig {
-    tei_macro.paraContent, tei_att.global.attributes, empty
+    tei_macro.paraContent,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_gap =
   
@@ -2577,6 +2650,7 @@ tei_gap =
     tei_att.timed.attributes,
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     
     ## (reason) gives the reason for omission
     ## Suggested values include: 1] cancelled (cancelled); 2] deleted (deleted); 3] editorial (editorial); 4] illegible (illegible); 5] inaudible (inaudible); 6] irrelevant (irrelevant); 7] sampling (sampling)
@@ -2634,6 +2708,7 @@ tei_add =
     tei_att.placement.attributes,
     tei_att.typed.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_del =
@@ -2645,16 +2720,18 @@ tei_del =
     tei_att.transcriptional.attributes,
     tei_att.typed.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_unclear =
   
-  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
+  ## (unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]
   element tei:unclear {
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates why the material is hard to transcribe.
     ## Suggested values include: 1] illegible (illegible); 2] inaudible (inaudible); 3] faded (faded); 4] background_noise (background noise); 5] eccentric_ductus (eccentric ductus)
@@ -2696,6 +2773,7 @@ tei_name =
     tei_att.datable.attributes,
     tei_att.editLike.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -2704,7 +2782,7 @@ tei_name =
        }
      }?)
     >> sch:pattern [
-         id = "foo-name-calendar-calendar-check-name-constraint-rule-17"
+         id = "foo-name-calendar-calendar-check-name-constraint-rule-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2729,19 +2807,23 @@ tei_name =
   }
 tei_rs =
   
-  ## (referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]
+  ## (referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]
   element tei:rs {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.naming.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_email =
   
   ## (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]
   element tei:email {
-    tei_macro.phraseSeq, tei_att.global.attributes, empty
+    tei_macro.phraseSeq,
+    tei_att.global.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_address =
   
@@ -2749,6 +2831,7 @@ tei_address =
   element tei:address {
     (tei_model.global*, (tei_model.addrPart, tei_model.global*)+),
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_addrLine =
@@ -2780,23 +2863,11 @@ tei_num =
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
     tei_att.ranging.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates the type of numeric value.
-    ## Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage
     attribute type {
-      
-      ## absolute number, e.g. 21, 21.5
-      "cardinal"
-      | 
-        ## ordinal number, e.g. 21st
-        "ordinal"
-      | 
-        ## fraction, e.g. one half or three-quarters
-        "fraction"
-      | 
-        ## a percentage
-        "percentage"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     
     ## supplies the value of the number in standard form.
@@ -2816,6 +2887,7 @@ tei_measure =
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
     tei_att.measurement.attributes,
+    tei_att.cmc.attributes,
     tei_att.ranging.attributes,
     
     ## specifies the type of measurement in any convenient typology.
@@ -2826,12 +2898,13 @@ tei_measure =
   }
 tei_measureGrp =
   
-  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]
+  ## (measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]
   element tei:measureGrp {
     (text | tei_model.gLike | tei_model.measureLike)*,
     tei_att.global.attributes,
     tei_att.measurement.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_unit =
@@ -2843,11 +2916,12 @@ tei_unit =
     tei_att.global.attributes,
     tei_att.typed.attributes,
     tei_att.measurement.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_date =
   
-  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]
+  ## (date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]
   element tei:date {
     (text | tei_model.gLike | tei_model.phrase | tei_model.global)*,
     tei_att.global.attributes,
@@ -2857,6 +2931,7 @@ tei_date =
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_time =
@@ -2871,6 +2946,7 @@ tei_time =
     tei_att.editLike.attributes,
     tei_att.dimensions.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_abbr =
@@ -2880,9 +2956,9 @@ tei_abbr =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## (type) allows the encoder to classify the abbreviation according to some convenient typology.
-    ## Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -2895,15 +2971,16 @@ tei_expan =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.editLike.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ptr =
   
-  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]
   element tei:ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-rule-18"
+         id = "foo-ptr-ptrAtts-constraint-rule-19"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2928,15 +3005,16 @@ tei_ptr =
     tei_att.internetMedia.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ref =
   
-  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]
+  ## (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]
   element tei:ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-rule-19"
+         id = "foo-ref-refAtts-constraint-rule-20"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2962,6 +3040,7 @@ tei_ref =
     tei_att.internetMedia.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_list =
@@ -2975,7 +3054,7 @@ tei_list =
          (tei_label, tei_model.global*, tei_item, tei_model.global*)+)),
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-list-gloss-list-must-have-labels-constraint-rule-20"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-21"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2995,31 +3074,11 @@ tei_list =
     tei_att.global.attributes,
     tei_att.sortable.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## (type) describes the nature of the items in the list.
-    ## Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)
     attribute type {
-      [
-        a:documentation [
-          "(gloss) each list item glosses some term or concept, which is given by a "
-          ns1:code [ "<label>" ]
-          " element preceding the list item."
-        ]
-      ]
-      "gloss"
-      | 
-        ## (index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.
-        "index"
-      | 
-        ## (instructions) each list item is a step in a sequence of instructions, as in a recipe.
-        "instructions"
-      | 
-        ## (litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.
-        "litany"
-      | 
-        ## (syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.
-        "syllogism"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -3041,6 +3100,7 @@ tei_label =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_head =
@@ -3058,6 +3118,7 @@ tei_head =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_headLabel =
@@ -3074,7 +3135,7 @@ tei_headItem =
   }
 tei_note =
   
-  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]
+  ## (note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]
   element tei:note {
     tei_macro.specialPara,
     tei_att.global.attributes,
@@ -3083,6 +3144,7 @@ tei_note =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.anchoring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_noteGrp =
@@ -3096,6 +3158,7 @@ tei_noteGrp =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.anchoring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_index =
@@ -3105,6 +3168,7 @@ tei_index =
     (tei_term, tei_index?)*,
     tei_att.global.attributes,
     tei_att.spanning.attributes,
+    tei_att.cmc.attributes,
     
     ## a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.
     attribute indexName { xsd:Name }?,
@@ -3123,6 +3187,7 @@ tei_media =
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
     tei_att.timed.attributes,
+    tei_att.cmc.attributes,
     
     ## (MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type
     attribute mimeType {
@@ -3134,7 +3199,7 @@ tei_media =
   }
 tei_graphic =
   
-  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]
+  ## (graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]
   element tei:graphic {
     tei_model.descLike*,
     tei_att.global.attributes,
@@ -3142,6 +3207,7 @@ tei_graphic =
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_binaryObject =
@@ -3153,6 +3219,7 @@ tei_binaryObject =
     tei_att.media.attributes,
     tei_att.timed.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     [
       a:documentation [
         "The encoding used to encode the binary data. If not specified, this is assumed to be "
@@ -3179,6 +3246,7 @@ tei_milestone =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_gb =
@@ -3192,6 +3260,7 @@ tei_gb =
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
     tei_att.edition.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_pb =
@@ -3205,6 +3274,7 @@ tei_pb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_lb =
@@ -3218,6 +3288,7 @@ tei_lb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_cb =
@@ -3231,6 +3302,7 @@ tei_cb =
     tei_att.edition.attributes,
     tei_att.spanning.attributes,
     tei_att.breaking.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_analytic =
@@ -3317,7 +3389,7 @@ tei_author =
      }?)
     >> sch:pattern [
          id =
-           "foo-author-calendar-calendar-check-author-constraint-rule-21"
+           "foo-author-calendar-calendar-check-author-constraint-rule-22"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3357,7 +3429,7 @@ tei_editor =
      }?)
     >> sch:pattern [
          id =
-           "foo-editor-calendar-calendar-check-editor-constraint-rule-22"
+           "foo-editor-calendar-calendar-check-editor-constraint-rule-23"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3407,7 +3479,7 @@ tei_resp =
        }
      }?)
     >> sch:pattern [
-         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-23"
+         id = "foo-resp-calendar-calendar-check-resp-constraint-rule-24"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3439,9 +3511,9 @@ tei_title =
     tei_att.typed.attribute.subtype,
     tei_att.canonical.attributes,
     tei_att.datable.attributes,
+    tei_att.cmc.attributes,
     
     ## classifies the title according to some convenient typology.
-    ## Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive)
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3454,7 +3526,7 @@ tei_title =
      }?)
     >> sch:pattern [
          id =
-           "foo-title-calendar-calendar-check-title-constraint-rule-24"
+           "foo-title-calendar-calendar-check-title-constraint-rule-25"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3504,6 +3576,7 @@ tei_meeting =
     tei_att.global.attributes,
     tei_att.datable.attributes,
     tei_att.canonical.attributes,
+    tei_att.cmc.attributes,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
      attribute calendar {
@@ -3513,7 +3586,7 @@ tei_meeting =
      }?)
     >> sch:pattern [
          id =
-           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-25"
+           "foo-meeting-calendar-calendar-check-meeting-constraint-rule-26"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3586,7 +3659,7 @@ tei_pubPlace =
   }
 tei_bibl =
   
-  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:bibl {
     (text
      | tei_model.gLike
@@ -3602,11 +3675,12 @@ tei_bibl =
     tei_att.typed.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_biblStruct =
   
-  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:biblStruct {
     (tei_analytic*,
      (tei_monogr, tei_series*)+,
@@ -3619,11 +3693,12 @@ tei_biblStruct =
     tei_att.typed.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_listBibl =
   
-  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:listBibl {
     (tei_model.headLike*,
      tei_desc*,
@@ -3633,6 +3708,7 @@ tei_listBibl =
     tei_att.sortable.attributes,
     tei_att.declarable.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_relatedItem =
@@ -3641,7 +3717,7 @@ tei_relatedItem =
   element tei:relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-rule-26"
+         id = "foo-relatedItem-targetorcontent1-constraint-rule-27"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3685,7 +3761,7 @@ tei_l =
       | tei_model.inter
       | tei_model.global)*)
     >> sch:pattern [
-         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-27"
+         id = "foo-l-abstractModel-structure-l-in-l-constraint-rule-28"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3705,6 +3781,7 @@ tei_l =
        ],
     tei_att.global.attributes,
     tei_att.fragmentable.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_lg =
@@ -3725,7 +3802,7 @@ tei_lg =
       | tei_lg)*,
      (tei_model.divBottom, tei_model.global*)*)
     >> sch:pattern [
-         id = "foo-lg-atleast1oflggapl-constraint-rule-28"
+         id = "foo-lg-atleast1oflggapl-constraint-rule-29"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3745,7 +3822,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-29"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-rule-30"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3767,6 +3844,7 @@ tei_lg =
     tei_att.divLike.attributes,
     tei_att.typed.attributes,
     tei_att.declaring.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_sp =
@@ -3801,6 +3879,7 @@ tei_stage =
     tei_att.global.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3847,7 +3926,6 @@ tei_divGen =
     tei_att.typed.attribute.subtype,
     
     ## specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-    ## Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist
     attribute type {
       xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
@@ -3855,7 +3933,7 @@ tei_divGen =
   }
 tei_textLang =
   
-  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]
+  ## (text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]
   element tei:textLang {
     tei_macro.specialPara,
     tei_att.global.attributes,
@@ -3908,7 +3986,7 @@ tei_att.patternReplacement.attribute.replacementPattern =
   attribute replacementPattern { text }
 tei_teiHeader =
   
-  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]
+  ## (TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]
   element tei:teiHeader {
     (tei_fileDesc, tei_model.teiHeaderPart*, tei_revisionDesc?),
     tei_att.global.attributes,
@@ -3951,7 +4029,7 @@ tei_sponsor =
      }?)
     >> sch:pattern [
          id =
-           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-30"
+           "foo-sponsor-calendar-calendar-check-sponsor-constraint-rule-31"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3991,7 +4069,7 @@ tei_funder =
      }?)
     >> sch:pattern [
          id =
-           "foo-funder-calendar-calendar-check-funder-constraint-rule-31"
+           "foo-funder-calendar-calendar-check-funder-constraint-rule-32"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4031,7 +4109,7 @@ tei_principal =
      }?)
     >> sch:pattern [
          id =
-           "foo-principal-calendar-calendar-check-principal-constraint-rule-32"
+           "foo-principal-calendar-calendar-check-principal-constraint-rule-33"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4070,7 +4148,7 @@ tei_edition =
   }
 tei_extent =
   
-  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]
+  ## (extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]
   element tei:extent {
     tei_macro.phraseSeq, tei_att.global.attributes, empty
   }
@@ -4104,56 +4182,18 @@ tei_authority =
   }
 tei_idno =
   
-  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
+  ## (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]
   element tei:idno {
     (text | tei_model.gLike | tei_idno)*,
     tei_att.global.attributes,
     tei_att.sortable.attributes,
     tei_att.datable.attributes,
     tei_att.typed.attribute.subtype,
+    tei_att.cmc.attributes,
     
     ## categorizes the identifier, for example as an ISBN, Social Security number, etc.
-    ## Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC
     attribute type {
-      [
-        a:documentation [
-          "International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the "
-          ns1:a [
-            href = "https://www.isbn-international.org"
-            " International ISBN Agency."
-          ]
-          "\x{a}" ~
-          "                  "
-        ]
-      ]
-      "ISBN"
-      | 
-        ## International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.
-        "ISSN"
-      | 
-        ## Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.
-        "DOI"
-      | [
-          a:documentation [
-            "Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of "
-            ns1:a [
-              href = "https://datatracker.ietf.org/doc/html/rfc3986"
-              "RFC 3986"
-            ]
-            "."
-          ]
-        ]
-        "URI"
-      | 
-        ## A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.
-        "VIAF"
-      | 
-        ## English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.
-        "ESTC"
-      | 
-        ## OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.
-        "OCLC"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     (
      ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
@@ -4163,7 +4203,7 @@ tei_idno =
        }
      }?)
     >> sch:pattern [
-         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-33"
+         id = "foo-idno-calendar-calendar-check-idno-constraint-rule-34"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4225,7 +4265,7 @@ tei_licence =
      }?)
     >> sch:pattern [
          id =
-           "foo-licence-calendar-calendar-check-licence-constraint-rule-34"
+           "foo-licence-calendar-calendar-check-licence-constraint-rule-35"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4270,7 +4310,7 @@ tei_notesStmt =
   }
 tei_sourceDesc =
   
-  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]
+  ## (source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]
   element tei:sourceDesc {
     (tei_model.pLike+
      | (tei_model.biblLike
@@ -4282,7 +4322,7 @@ tei_sourceDesc =
   }
 tei_biblFull =
   
-  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]
+  ## (fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]
   element tei:biblFull {
     (((tei_titleStmt,
        tei_editionStmt?,
@@ -4296,6 +4336,7 @@ tei_biblFull =
     tei_att.declarable.attributes,
     tei_att.sortable.attributes,
     tei_att.docStatus.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_encodingDesc =
@@ -4321,7 +4362,7 @@ tei_schemaRef =
   }
 tei_projectDesc =
   
-  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element tei:projectDesc {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4330,7 +4371,7 @@ tei_projectDesc =
   }
 tei_samplingDecl =
   
-  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element tei:samplingDecl {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4339,7 +4380,7 @@ tei_samplingDecl =
   }
 tei_editorialDecl =
   
-  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
+  ## (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]
   element tei:editorialDecl {
     (tei_model.pLike | tei_model.editorialDeclPart)+,
     tei_att.global.attributes,
@@ -4348,7 +4389,7 @@ tei_editorialDecl =
   }
 tei_correction =
   
-  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:correction {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4384,7 +4425,7 @@ tei_correction =
   }
 tei_normalization =
   
-  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:normalization {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4404,11 +4445,11 @@ tei_normalization =
   }
 tei_quotation =
   
-  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-rule-35"
+         id = "foo-quotation-quotationContents-constraint-rule-36"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4448,7 +4489,7 @@ tei_quotation =
   }
 tei_hyphenation =
   
-  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:hyphenation {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4474,7 +4515,7 @@ tei_hyphenation =
   }
 tei_segmentation =
   
-  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:segmentation {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4483,7 +4524,7 @@ tei_segmentation =
   }
 tei_stdVals =
   
-  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
+  ## (standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]
   element tei:stdVals {
     tei_model.pLike+,
     tei_att.global.attributes,
@@ -4635,7 +4676,7 @@ tei_refsDecl =
   }
 tei_citeStructure =
   
-  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element tei:citeStructure {
     (tei_citeData*, tei_citeStructure*, tei_model.descLike*),
     tei_att.global.attributes,
@@ -4663,7 +4704,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-36"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-37"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4684,7 +4725,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-37"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-38"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4718,7 +4759,7 @@ tei_citeStructure =
   }
 tei_citeData =
   
-  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]
+  ## (citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]
   element tei:citeData {
     empty,
     tei_att.global.attributes,
@@ -4741,7 +4782,7 @@ tei_cRefPattern =
   }
 tei_prefixDef =
   
-  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element tei:prefixDef {
     tei_model.pLike*,
     tei_att.global.attributes,
@@ -4755,7 +4796,7 @@ tei_prefixDef =
   }
 tei_listPrefixDef =
   
-  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]
+  ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]
   element tei:listPrefixDef {
     (tei_desc*, (tei_prefixDef | tei_listPrefixDef)+),
     tei_att.global.attributes,
@@ -4869,7 +4910,7 @@ tei_unitDecl =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38"
+           "foo-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4913,7 +4954,7 @@ tei_unitDef =
      }?)
     >> sch:pattern [
          id =
-           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-39"
+           "foo-unitDef-calendar-calendar-check-unitDef-constraint-rule-40"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4954,7 +4995,7 @@ tei_conversion =
      }?)
     >> sch:pattern [
          id =
-           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-40"
+           "foo-conversion-calendar-calendar-check-conversion-constraint-rule-41"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5020,7 +5061,7 @@ tei_application =
      }?)
     >> sch:pattern [
          id =
-           "foo-application-calendar-calendar-check-application-constraint-rule-41"
+           "foo-application-calendar-calendar-check-application-constraint-rule-42"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5083,7 +5124,7 @@ tei_creation =
      }?)
     >> sch:pattern [
          id =
-           "foo-creation-calendar-calendar-check-creation-constraint-rule-42"
+           "foo-creation-calendar-calendar-check-creation-constraint-rule-43"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5108,7 +5149,7 @@ tei_creation =
   }
 tei_langUsage =
   
-  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]
+  ## (language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]
   element tei:langUsage {
     (tei_model.pLike+ | tei_language+),
     tei_att.global.attributes,
@@ -5242,24 +5283,8 @@ tei_correspAction =
     tei_att.sortable.attributes,
     
     ## describes the nature of the action.
-    ## Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded
     attribute type {
-      
-      ## information concerning the sending or dispatch of a message.
-      "sent"
-      | 
-        ## information concerning the receipt of a message.
-        "received"
-      | 
-        ## information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.
-        "transmitted"
-      | 
-        ## information concerning the redirection of an unread message.
-        "redirected"
-      | 
-        ## information concerning the forwarding of a message.
-        "forwarded"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5290,7 +5315,7 @@ tei_revisionDesc =
   }
 tei_change =
   
-  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]
+  ## (change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]
   element tei:change {
     tei_macro.specialPara,
     tei_att.ascribed.attributes,
@@ -5307,7 +5332,7 @@ tei_change =
      }?)
     >> sch:pattern [
          id =
-           "foo-change-calendar-calendar-check-change-constraint-rule-43"
+           "foo-change-calendar-calendar-check-change-constraint-rule-44"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5339,7 +5364,7 @@ tei_change =
   }
 tei_listChange =
   
-  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]
+  ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]
   element tei:listChange {
     (tei_desc*, (tei_listChange | tei_change)+),
     tei_att.global.attributes,
@@ -5365,7 +5390,7 @@ tei_TEI =
       ns1:code [ "<TEI>" ]
       " (or "
       ns1:code [ "<teiCorpus>" ]
-      ") element. [4. Default Text Structure 15.1. Varieties of Composite Text]"
+      ") element. [4. Default Text Structure 16.1. Varieties of Composite Text]"
     ]
   ]
   element tei:TEI {
@@ -5400,7 +5425,7 @@ tei_TEI =
   }
 tei_text =
   
-  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]
+  ## (text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]
   element tei:text {
     (tei_model.global*,
      (tei_front, tei_model.global*)?,
@@ -5436,7 +5461,7 @@ tei_body =
   }
 tei_group =
   
-  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]
+  ## (group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]
   element tei:group {
     ((tei_model.divTop | tei_model.global)*,
      ((tei_text | tei_group),
@@ -5459,6 +5484,7 @@ tei_floatingText =
     tei_att.global.attributes,
     tei_att.declaring.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_div =
@@ -5473,7 +5499,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-45"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5495,7 +5521,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-46"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5646,6 +5672,7 @@ tei_trailer =
     tei_att.typed.attributes,
     tei_att.placement.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_byline =
@@ -5658,6 +5685,7 @@ tei_byline =
      | tei_docAuthor
      | tei_model.global)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_dateline =
@@ -5670,6 +5698,7 @@ tei_dateline =
      | tei_model.global
      | tei_docDate)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_argument =
@@ -5679,6 +5708,7 @@ tei_argument =
     ((tei_model.global | tei_model.headLike)*,
      (tei_model.common, tei_model.global*)+),
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_epigraph =
@@ -5687,6 +5717,7 @@ tei_epigraph =
   element tei:epigraph {
     (tei_model.common | tei_model.global)*,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_opener =
@@ -5705,6 +5736,7 @@ tei_opener =
      | tei_model.global)*,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_closer =
@@ -5720,6 +5752,7 @@ tei_closer =
      | tei_model.global)*,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_salute =
@@ -5729,6 +5762,7 @@ tei_salute =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_signed =
@@ -5738,6 +5772,7 @@ tei_signed =
     tei_macro.paraContent,
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_postscript =
@@ -5750,6 +5785,7 @@ tei_postscript =
      (tei_model.divBottomPart, tei_model.global*)*),
     tei_att.global.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_titlePage =
@@ -5786,25 +5822,9 @@ tei_titlePart =
     tei_att.typed.attribute.subtype,
     
     ## (type) specifies the role of this subdivision of the title.
-    ## Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)
     [ a:defaultValue = "main" ]
     attribute type {
-      
-      ## (main) main title of the work
-      "main"
-      | 
-        ## (subordinate) subtitle of the work
-        "sub"
-      | 
-        ## (alternate) alternative title of the work
-        "alt"
-      | 
-        ## (short) abbreviated form of title
-        "short"
-      | 
-        ## (descriptive) descriptive paraphrase of the work
-        "desc"
-      | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+      xsd:token { pattern = "[^\p{C}\p{Z}]+" }
     }?,
     empty
   }
@@ -5815,6 +5835,7 @@ tei_docAuthor =
     tei_macro.phraseSeq,
     tei_att.global.attributes,
     tei_att.canonical.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_imprimatur =
@@ -5849,6 +5870,7 @@ tei_docDate =
   element tei:docDate {
     tei_macro.phraseSeq,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     tei_att.datable.attributes,
     tei_att.calendarSystem.attributes,
     empty
@@ -5961,11 +5983,11 @@ tei_att.global.linking.attribute.select =
   }?
 tei_link =
   
-  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]
+  ## (link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]
   element tei:link {
     empty
     >> sch:pattern [
-         id = "foo-link-linkTargets3-constraint-rule-46"
+         id = "foo-link-linkTargets3-constraint-rule-47"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5988,25 +6010,27 @@ tei_link =
     tei_att.global.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_linkGrp =
   
-  ## (link group) defines a collection of associations or hypertextual links. [16.1. Links]
+  ## (link group) defines a collection of associations or hypertextual links. [17.1. Links]
   element tei:linkGrp {
     (tei_model.descLike*, (tei_link | tei_ptr)+),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_ab =
   
-  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]
+  ## (anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]
   element tei:ab {
     tei_macro.abContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-47"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-48"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6031,17 +6055,22 @@ tei_ab =
     tei_att.declaring.attributes,
     tei_att.fragmentable.attributes,
     tei_att.written.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_anchor =
   
-  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
+  ## (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]
   element tei:anchor {
-    empty, tei_att.global.attributes, tei_att.typed.attributes, empty
+    empty,
+    tei_att.global.attributes,
+    tei_att.typed.attributes,
+    tei_att.cmc.attributes,
+    empty
   }
 tei_seg =
   
-  ## (arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
+  ## (arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]
   element tei:seg {
     tei_macro.paraContent,
     tei_att.global.attributes,
@@ -6049,11 +6078,12 @@ tei_seg =
     tei_att.typed.attributes,
     tei_att.written.attributes,
     tei_att.notated.attributes,
+    tei_att.cmc.attributes,
     empty
   }
 tei_when =
   
-  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]
+  ## indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]
   element tei:when {
     empty,
     tei_att.global.attributes,
@@ -6125,10 +6155,11 @@ tei_when =
   }
 tei_timeline =
   
-  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]
+  ## (timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]
   element tei:timeline {
     tei_when+,
     tei_att.global.attributes,
+    tei_att.cmc.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
     attribute origin {
@@ -6178,11 +6209,11 @@ tei_timeline =
   }
 tei_join =
   
-  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [16.7. Aggregation]
+  ## (join) identifies a possibly fragmented segment of text, by pointing at the possibly discontiguous elements which compose it. [17.7. Aggregation]
   element tei:join {
     ((tei_model.descLike | tei_model.certLike)*)
     >> sch:pattern [
-         id = "foo-join-joinTargets3-constraint-rule-48"
+         id = "foo-join-joinTargets3-constraint-rule-49"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6206,6 +6237,7 @@ tei_join =
     tei_att.global.attributes,
     tei_att.pointing.attributes,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     
     ## specifies the name of an element which this aggregation may be understood to represent.
     attribute result { xsd:Name }?,
@@ -6237,13 +6269,14 @@ tei_joinGrp =
     a:documentation [
       "(join group) groups a collection of "
       ns1:code [ "<join>" ]
-      " elements and possibly pointers. [16.7. Aggregation]"
+      " elements and possibly pointers. [17.7. Aggregation]"
     ]
   ]
   element tei:joinGrp {
     ((tei_gloss | tei_model.descLike)*, (tei_join | tei_ptr)+),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     [
       a:documentation [
         "supplies the default value for the "
@@ -6258,13 +6291,14 @@ tei_joinGrp =
   }
 tei_alt =
   
-  ## (alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]
+  ## (alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]
   element tei:alt {
     empty,
     tei_att.global.attributes,
     tei_att.pointing.attribute.targetLang,
     tei_att.pointing.attribute.evaluate,
     tei_att.typed.attributes,
+    tei_att.cmc.attributes,
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
@@ -6307,13 +6341,14 @@ tei_altGrp =
     a:documentation [
       "(alternation group) groups a collection of "
       ns1:code [ "<alt>" ]
-      " elements and possibly pointers. [16.8. Alternation]"
+      " elements and possibly pointers. [17.8. Alternation]"
     ]
   ]
   element tei:altGrp {
     (tei_model.descLike*, (tei_alt | tei_ptr)*),
     tei_att.global.attributes,
     tei_att.pointing.group.attributes,
+    tei_att.cmc.attributes,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
     [ a:defaultValue = "excl" ]
@@ -6329,12 +6364,12 @@ tei_altGrp =
   }
 tei_standOff =
   
-  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]
+  ## Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]
   element tei:standOff {
     (tei_model.standOffPart+)
     >> sch:pattern [
          id =
-           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-49"
+           "foo-standOff-nested_standOff_should_be_typed-constraint-rule-50"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6374,7 +6409,7 @@ tei_listAnnotation =
       ns1:code [ "<note>" ]
       ", possibly organized with nested "
       ns1:code [ "<listAnnotation>" ]
-      " elements. [16.10. The standOff Container]"
+      " elements. [17.10. The standOff Container]"
     ]
   ]
   element tei:listAnnotation {
@@ -6396,7 +6431,7 @@ tei_annotation =
         "Web\x{a}" ~
         "      Annotation Data Model"
       ]
-      ". [16.10. The standOff Container]"
+      ". [17.10. The standOff Container]"
     ]
   ]
   element tei:annotation {
diff --git a/Test/expected-results/testClass.rnc b/Test/expected-results/testClass.rnc
index 8c3ffbefa..07ddb5473 100644
--- a/Test/expected-results/testClass.rnc
+++ b/Test/expected-results/testClass.rnc
@@ -22,6 +22,48 @@ att.written.attribute.hand =
   attribute hand {
     xsd:anyURI { pattern = "\S+" }
   }?
+att.cmc.attributes = att.cmc.attribute.generatedBy
+att.cmc.attribute.generatedBy =
+  
+  ## (generated by) categorizes how the content of an element was generated in a CMC environment.
+  ## Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified
+  attribute generatedBy {
+    
+    ## the content was naturally typed or spoken by a human user
+    "human"
+    | 
+      ## the content was generated after a human user activated a template for its insertion
+      "template"
+    | 
+      ## the content was generated by the system, i.e. the CMC environment
+      "system"
+    | 
+      ## the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself
+      "bot"
+    | 
+      ## the content was generated by an unknown or unspecified process
+      "unspecified"
+    | xsd:token { pattern = "[^\p{C}\p{Z}]+" }
+  }?
+sch:pattern [
+  id =
+    "testClassRef-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*[@generatedBy]"
+    "\x{a}" ~
+    "         "
+    sch:assert [
+      test = "ancestor-or-self::tei:post"
+      "The @generatedBy attribute is for use within a <post> element."
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 att.declaring.attributes = att.declaring.attribute.decls
 att.declaring.attribute.decls =
   
@@ -154,7 +196,7 @@ att.global.source.attribute.source =
   }?
 sch:pattern [
   id =
-    "testClassRef-att.global.source-source-only_1_ODD_source-constraint-rule-1"
+    "testClassRef-att.global.source-source-only_1_ODD_source-constraint-rule-2"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -252,7 +294,7 @@ att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "testClassRef-att.typed-subtypeTyped-constraint-rule-2"
+  id = "testClassRef-att.typed-subtypeTyped-constraint-rule-3"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -588,7 +630,8 @@ model.inter =
   | model.listLike
   | model.stageLike
   | model.attributable
-model.common = model.divPart | model.inter
+model.cmc = notAllowed
+model.common = model.divPart | model.inter | model.cmc
 model.phrase =
   model.segLike
   | model.highlighted
@@ -615,7 +658,7 @@ model.divGenLike = notAllowed
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "testClassRef-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-3"
+           "testClassRef-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-4"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -637,7 +680,7 @@ model.divGenLike = notAllowed
        ]
     >> sch:pattern [
          id =
-           "testClassRef-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-4"
+           "testClassRef-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-5"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -671,7 +714,7 @@ p =
     macro.paraContent
     >> sch:pattern [
          id =
-           "testClassRef-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-5"
+           "testClassRef-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -693,7 +736,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "testClassRef-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-6"
+           "testClassRef-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -717,6 +760,7 @@ p =
     att.declaring.attributes,
     att.fragmentable.attributes,
     att.written.attributes,
+    att.cmc.attributes,
     empty
   }
 testClass = x | y | z
diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
index 3c7ff81d9..a006d8262 100644
--- a/Test/expected-results/testdrama.compiled.xml
+++ b/Test/expected-results/testdrama.compiled.xml
@@ -86,19 +86,19 @@
       <remarks versionDate="2009-01-23" xml:lang="en">
         <p>This attribute is retained for backwards compatibility; it may be removed at a subsequent
           release of the Guidelines. The recommended way of pointing to a span of elements is by
-          means of the <ident>range</ident> function of XPointer, as further described in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SATSRN">16.2.4.6. range()</ref>. </p>
+          means of the <ident>range</ident> function of XPointer, as further described in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SATSRN">17.2.4.6. range()</ref>. </p>
       </remarks>
       <remarks xml:lang="fr" versionDate="2007-06-12">
         <p>Cet attribut est conservé pour assurer un arrière-plan compatible ; il sera supprimé dans la
           prochaine mise à jour des Recommandations. La procédure recommandée pour pointer en
           direction d'une expansion des éléments est de le faire au moyen de la fonction
-            <ident>range</ident> de XPointer, telle que la description en est faite  à <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SATSRN">16.2.4.6. range()</ref>. </p>
+            <ident>range</ident> de XPointer, telle que la description en est faite  à <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SATSRN">17.2.4.6. range()</ref>. </p>
       </remarks>
       <remarks versionDate="2017-06-25" xml:lang="de">
         <p>Dieses Attribut wurde beibehalten, um eine Abwärtskompatibilität zu gewährleisten; bei einem
           zukünftigen Release der Guidelines kann es entfernt werden. Der empfohlene Weg, um auf einen
           Bereich zu verweisen, ist die Verwendung der <ident>range</ident>-Funktion von XPointer, wie in
-          <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SATSRN">16.2.4.6. range()</ref> beschrieben.</p>
+          <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SATSRN">17.2.4.6. range()</ref> beschrieben.</p>
       </remarks>
     </attDef>
   </attList>
@@ -330,7 +330,7 @@
     probably in an ODD customizaiton, for interchange.</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.ranging">
   <desc versionDate="2009-06-05" xml:lang="en">provides attributes for describing numerical ranges.</desc>
@@ -391,7 +391,7 @@ The MS. was lost in transmission by mail from <del rend="overstrike"><gap reason
   <desc versionDate="2007-08-05" xml:lang="en">provides attributes for describing the size of physical objects.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">물리적 대상의 크기를 기술하는 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供符合某種度量值的屬性值。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">物理的対象の大きさを表す属性を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">物理的対象の大きさを表す属性を示す。</desc>
   <desc versionDate="2009-05-25" xml:lang="fr">fournit des attributs
   pour décrire la taille des objets    physiques</desc>
   <desc versionDate="2007-11-06" xml:lang="it">assegna degli attributi che descrivono la grandezza di
@@ -556,8 +556,7 @@ The MS. was lost in transmission by mail from <del rend="overstrike"><gap reason
   	
   		
   		<desc versionDate="2007-12-20" xml:lang="ko">간섭을 만든 당사자의 필적을 나타낸다.</desc>
-  		<desc versionDate="2008-04-05" xml:lang="ja">当該調整を行った主体の筆致を特定する。
-  		</desc>
+  		<desc versionDate="2008-04-05" xml:lang="ja">当該調整を行った主体の筆致を特定する。</desc>
   		<desc versionDate="2008-03-30" xml:lang="fr">signale la main de celui qui est intervenue.</desc>
   		<desc versionDate="2007-01-21" xml:lang="it">indica il responsabile dell'aggiunta o della cancellazione</desc>
   		<desc versionDate="2007-05-04" xml:lang="es">indica el responsable de la adición o de la omisión.</desc>
@@ -633,6 +632,117 @@ of any adjacent whitespace</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS5">3.11.3. Milestone
 Elements</ref>
   </listRef>
+</classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="att.cmc" type="atts" module="tei">
+  <gloss xml:lang="en" versionDate="2023-11-24">computer-mediated communication</gloss>
+  <desc xml:lang="en" versionDate="2021-09-07">provides attributes categorizing how the element content was created in a CMC environment.</desc>
+  <attList>
+    <attDef ident="generatedBy" mode="add" module="cmc" usage="opt">
+      <gloss xml:lang="en" versionDate="2021-09-07">generated by</gloss>
+      <desc xml:lang="en" versionDate="2021-09-07">categorizes how the content of an element was generated in a CMC environment.</desc>
+      <datatype minOccurs="1" maxOccurs="1">
+        <dataRef key="teidata.enumerated"/>
+      </datatype>
+      <constraintSpec scheme="schematron" ident="CMC_generatedBy_within_post">
+        <constraint>
+          <sch:rule context="tei:*[@generatedBy]">
+            <sch:assert test="ancestor-or-self::tei:post">The @generatedBy attribute is for use within a &lt;post&gt; element.</sch:assert>
+          </sch:rule>
+        </constraint>
+      </constraintSpec>
+      <valList type="semi">
+        
+        
+        <valItem ident="human">
+          <desc xml:lang="en" versionDate="2021-09-07">the content was
+          <soCalled>naturally</soCalled> typed or spoken by a human user</desc>
+        </valItem>
+        <valItem ident="template">
+          <desc xml:lang="en" versionDate="2021-09-07">the content was
+          generated after a human user activated a template for its
+          insertion</desc>
+        </valItem>
+        <valItem ident="system">
+          <desc xml:lang="en" versionDate="2021-09-07">the content was
+          generated by the system, i.e. the CMC environment</desc>
+        </valItem>
+        <valItem ident="bot">
+          <desc xml:lang="en" versionDate="2024-05-17">the content was
+          generated by a bot, i.e. a non-human agent, typically one
+          that is not part of the CMC environment itself</desc>
+        </valItem>
+        <valItem ident="unspecified">
+          <desc xml:lang="en" versionDate="2024-05-17">the content was
+          generated by an unknown or unspecified process</desc>
+        </valItem>
+      </valList>
+      
+      <exemplum type="Chat2CLARIN" xml:lang="en" versionDate="2021-09-07">
+        <p>automatic system message in chat: user moves on to another
+        chatroom</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" generatedBy="system" who="#system" rend="color:blue">
+            <p>
+              <name type="nickname" corresp="#A02">McMike</name> geht
+              in einen anderen Raum: <name type="roomname">Kreuzfahrt</name>
+            </p>
+          </post>
+        </egXML>
+      </exemplum>
+      
+      <exemplum type="Chat2CLARIN" xml:lang="en" versionDate="2021-09-07">
+        <p>automatic system message in chat: user enters a chatroom</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" generatedBy="system">
+            <p>
+              <name type="nickname" corresp="#A08">c_bo</name> betritt
+            den Raum. </p>
+          </post>
+        </egXML>
+      </exemplum>
+      
+      <exemplum type="Chat2CLARIN" xml:lang="en" versionDate="2021-09-07">
+        <p>automatic system message in chat: user changes his font color</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" generatedBy="system" rend="color:red">
+            <p>
+              <name type="nickname" corresp="#A08">c_bo</name> hat die
+              Farbe gewechselt.
+            </p>
+          </post>
+        </egXML>
+      </exemplum>
+      
+      <exemplum type="wikitalk" xml:lang="en" versionDate="2021-09-07">
+        <p>An automatic signature of user including an automatic timestamp
+        (Wikipedia discussion, anonymized). The specification of
+        <att>generatedBy</att> at the inner element <gi>signed</gi> is
+        meant to override the specification at the outer element
+        <gi>post</gi>. This is generally possible when the outer
+        <att>generatedBy</att> value is "human".</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="standard" generatedBy="human" indentLevel="2" synch="#t00394407" who="#WU00005582">
+            <p> Kurze Nachfrage: Die Hieros für den Goldnamen stammen
+            auch von Beckerath gem. Literatur ? Grüße --</p><signed generatedBy="template" rend="inline"><gap reason="signatureContent"/><time generatedBy="template">18:50, 22. Okt. 2008 (CEST)</time></signed>
+          </post>
+        </egXML>
+      </exemplum>   
+    
+      <exemplum type="wikitalk" xml:lang="en" versionDate="2021-09-07">
+        <p>Wikipedia talk page: user signature</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="written" generatedBy="human"> 
+            <!-- ... main content of posting ... -->
+            <signed generatedBy="template">
+              <gap reason="signatureContent"/>
+              <time generatedBy="template">12:01, 12. Jun. 2009 (CEST)</time>
+            </signed>
+          </post>
+        </egXML>
+      </exemplum>
+      
+    </attDef>
+    
+  </attList>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.cReferencing">
   <desc versionDate="2021-08-22" xml:lang="en">provides attributes that may be used to supply a
   <term>canonical reference</term> as a means of identifying the
@@ -665,7 +775,7 @@ Elements</ref>
           <remarks versionDate="2012-09-23" xml:lang="en">
         <p>The value of <att>cRef</att> should be constructed so
       that when the algorithm for the resolution of canonical
-      references (described in section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACR">16.2.5. Canonical References</ref>) is
+      references (described in section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACR">17.2.5. Canonical References</ref>) is
       applied to it the result is a valid URI reference to the
       intended target.</p>
 <p>The <gi>refsDecl</gi> to use may be indicated with the <att>decls</att> attribute.</p>
@@ -674,14 +784,14 @@ Elements</ref>
       </remarks>
       <remarks xml:lang="fr" versionDate="2007-06-12">
 <p>Le résultat de l’application de l'algorithme pour la résolution des
-        références canoniques (décrit à la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACR">16.2.5. Canonical References</ref>). Ce sera une référence URI
+        références canoniques (décrit à la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACR">17.2.5. Canonical References</ref>). Ce sera une référence URI
         valide pour la cible prévue.</p>        <p>La <gi>refsDecl</gi> à utiliser peut être indiquée à l'aide
         de l'attribut <att>decls</att>.  Actuellement ces Principes
         directeurs ne permettent que l'encodage d'une unique référence
         canonique pour tout élément <gi>ptr</gi> donné.</p>
       </remarks>
 
-      <remarks xml:lang="ja" versionDate="2018-12-31"><p><ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACR">16.2.5. Canonical References</ref> 節での正規化参照を解決するためのアルゴリズムが適用される時にその結果が対象への正しいURI参照となるように、 <att>cRef</att> の値は作られるべきである</p> <p> <gi>refsDecl</gi> は <att>decls</att> 属性とともに示されてもよい。現行のガイドラインが <gi>ptr</gi> 要素に渡すのは、単一の符号化された正規化参照のみである。</p></remarks>
+      <remarks xml:lang="ja" versionDate="2018-12-31"><p><ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACR">17.2.5. Canonical References</ref> 節での正規化参照を解決するためのアルゴリズムが適用される時にその結果が対象への正しいURI参照となるように、 <att>cRef</att> の値は作られるべきである</p> <p> <gi>refsDecl</gi> は <att>decls</att> 属性とともに示されてもよい。現行のガイドラインが <gi>ptr</gi> 要素に渡すのは、単一の符号化された正規化参照のみである。</p></remarks>
     </attDef>
   </attList>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.datable.w3c" xml:id="DATABLEW3C">
@@ -887,7 +997,7 @@ Elements</ref>
       </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" xml:id="DATABLE" ident="att.datable">
   <desc versionDate="2007-06-12" xml:lang="en">provides attributes for normalization of elements
@@ -969,7 +1079,7 @@ Elements</ref>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="DATCAT" type="atts" ident="att.datcat">
   <desc versionDate="2022-09-17" xml:lang="en">provides attributes that are used to align XML
@@ -1303,8 +1413,8 @@ Elements</ref>
         Aに、<att>datcat</att>属性と<att>valueDatcat</att>属性を提供する小さなデータ分類参照のXML語彙がある。</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">9.5.2. Lexical View</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">18.3. Other Atomic Feature Values</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIMVLV">10.5.2. Lexical View</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FSSY">19.3. Other Atomic Feature Values</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="DECLABL" type="atts" ident="att.declarable">
   <desc versionDate="2013-02-02" xml:lang="en">provides attributes for those elements in the TEI header which
@@ -1316,8 +1426,7 @@ Elements</ref>
       l'en-tête TEI qui peuvent être choisis indépendamment au moyen de l'attribut
       <att>decls</att>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos para los elementos contenidos en el encabezado que pueden ser seleccionados autónomamente mediante el atributo <att>decls</att> adecuado.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">individua attributi per gli elementi contenuti nell'intestazione che possono essere selezionati autonomamente grazie all'apposito attributo <att>decls</att>
-   </desc>
+  <desc versionDate="2007-01-21" xml:lang="it">individua attributi per gli elementi contenuti nell'intestazione che possono essere selezionati autonomamente grazie all'apposito attributo <att>decls</att></desc>
   <attList>
     <attDef ident="default" usage="opt">
       <desc versionDate="2005-10-10" xml:lang="en">indicates whether or not this element is selected by default when
@@ -1325,8 +1434,7 @@ its parent is selected.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">그 부모가 선택될 때 기본값으로 이 요소가 선택되었는지를 표시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">當父元素被選擇時，指出此元素是否會被選擇。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">親要素が選択された場合に、当該要素がデフォルトとして選択されるか
-      どうかを示す。
-	</desc>
+      どうかを示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique si oui ou non cet élément est affecté par
           défaut quand son élément parent a été sélectionné.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica si el elemento es seleccionado automáticamente o no  cuando es seleccionado el padre</desc>
@@ -1362,32 +1470,32 @@ il est sélectionné si son parent a été choisi</desc>
   </attList>
   <remarks versionDate="2005-10-10" xml:lang="en">
     <p>The rules governing the association of declarable elements with
-    individual parts of a TEI text are fully defined in chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    individual parts of a TEI text are fully defined in chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>. Only one element of a particular type may have a
     <att>default</att> attribute with a value of <val>true</val>.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Les règles régissant l'association d'éléments déclarables avec des parties
                 individuelles d'un texte TEI sont entièrement définies
-		au chap1itre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+		au chap1itre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>. Un seul élément
                 d'un type particulier peut avoir un attribut <att>default</att> avec une valeur
                     <val>true</val>.</p>
   </remarks>
   <remarks xml:lang="es" versionDate="2008-04-06">
-    <p>Las reglas que gobiernan la asociación de los elementos declarables con las partes individuales de un texto de TEI se definen completamente en el capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    <p>Las reglas que gobiernan la asociación de los elementos declarables con las partes individuales de un texto de TEI se definen completamente en el capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>. Solamente un elemento de un tipo determinado puede tener algún atributo de <att>default</att> con un valor de <val>verdad</val>.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p>
     このような選択可能要素の関連性を決める規則は、
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>において詳しく規定されている。
     属性値<val>true</val>をとるのは、ひとつの要素だけである。
     </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="DECLING" type="atts" ident="att.declaring">
@@ -1423,27 +1531,27 @@ i quali sono validi per l'elemento a cui è assegnato l'attributo in questione e
   </attList>
   <remarks versionDate="2005-10-10" xml:lang="en">
     <p>The rules governing the association of declarable elements
-with individual parts of a TEI text are fully defined in chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+with individual parts of a TEI text are fully defined in chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Les règles régissant l'association d'éléments déclarables avec des parties
-                individuelles d'un texte TEI sont entièrement définies au chapitre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+                individuelles d'un texte TEI sont entièrement définies au chapitre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>.</p>
   </remarks>
   <remarks xml:lang="es" versionDate="2008-04-06">
-    <p>Las reglas que gobiernan la asociación de los elementos declarables con las partes individuales de un texto de TEI se definen completamente en el capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    <p>Las reglas que gobiernan la asociación de los elementos declarables con las partes individuales de un texto de TEI se definen completamente en el capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p>
-    宣言可能要素の関連性を決める規則については、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    宣言可能要素の関連性を決める規則については、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>
         を参照のこと。
      </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">15.3. Associating Contextual
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS">16.3. Associating Contextual
 Information with a Text</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.fragmentable">
@@ -1569,8 +1677,7 @@ logique et doivent être traités dans l'ordre séquentiel</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 구역이 원본의 표본이며 어떤 부분인지를 나타낸다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出此區段是否為來源文件的樣本，若為樣本，則說明出自哪一部分。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該区分が、元資料のものを含むかどうか、そうであればその場所はど
-        こかを示す。
-	</desc>
+        こかを示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique si cette division est un échantillon de
           la source originale et dans ce cas, de quelle partie.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica si la división es una muestra de la fuente original y, en ese caso, de que parte de este se trata</desc>
@@ -1583,8 +1690,7 @@ logique et doivent être traités dans l'ordre séquentiel</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 원본의 후반부에서 제시된 자료가 부족하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段的末端無資料</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la división falta el material presente en el extremo en la fuente.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の終わりの部分が欠けている。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の終わりの部分が欠けている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, lacune à la fin de la division</desc>
           <desc versionDate="2007-01-21" xml:lang="it">alla partizione testuale manca del materiale nella parte finale presente nell'originale</desc>
         </valItem>
@@ -1593,8 +1699,7 @@ logique et doivent être traités dans l'ordre séquentiel</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 초반부와 후반부 자료가 부족하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段的起始與末端無資料</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el fragmento carece de material al comienzo y al final.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めと終わりの部分が欠けている。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めと終わりの部分が欠けている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, lacune au
 début et à la fin de la division</desc>
           <desc versionDate="2007-01-21" xml:lang="it">alla partizione testuale manca del materiale nella parte iniziale e in quella finale</desc>
@@ -1604,8 +1709,7 @@ début et à la fin de la division</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 초반부 자료가 부족하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段的起始部分無資料</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el fragmento carece de material en el comienzo.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めの部分が欠けている。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めの部分が欠けている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, lacune au
 début de la division</desc>
           <desc versionDate="2007-01-21" xml:lang="it">alla partizione manca del materiale nella parte iniziale</desc>
@@ -1615,8 +1719,7 @@ début de la division</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">표본 자료의 원본 내의 위치를 알 수 없다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">來源文件中的樣本資料位置不明</desc>
           <desc versionDate="2008-04-06" xml:lang="es">ubicación del material  de muestra dentro del original desconocido.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">元資料のどの部分かは不明。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">元資料のどの部分かは不明。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, position de
 l'échantillon inconnue</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la posizione del materiale prelevato dall'originale all'interno di quest'ultimo è sconosciuta</desc>
@@ -1626,8 +1729,7 @@ l'échantillon inconnue</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 표본이 아니다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段非樣本</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el fragmento no es una muestra.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該領域は、元資料の一部ではない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該領域は、元資料の一部ではない。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">la division n'est pas un échantillon</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la partizione testuale non è stata prelevata da alcun originale</desc>
         </valItem>
@@ -1704,7 +1806,7 @@ associated with a dated element, at the time indicated.</desc>
         intervención o la interpretación.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">corrisponde al grado di certezza associato
         all'intervento o interpretazione</desc>
-      <desc xml:lang="ja" versionDate="2019-09-16">介入や解釈に関する確信度を示す。 </desc>
+      <desc xml:lang="ja" versionDate="2019-09-16">介入や解釈に関する確信度を示す。</desc>
       <datatype>
         <dataRef key="teidata.probCert"/>
       </datatype>
@@ -1766,9 +1868,9 @@ associated with a dated element, at the time indicated.</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STGAso">1.3.1.1.4. Sources, certainty, and responsibility</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">11.3.2.2. Hand, Responsibility, and Certainty Attributes</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">17.3. Spans and Interpretations</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">13.1.1. Linking Names and Their Referents</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHHR">12.3.2.2. Hand, Responsibility, and Certainty Attributes</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AISP">18.3. Spans and Interpretations</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDATTSnr">14.1.1. Linking Names and Their Referents</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.editLike">
   <desc versionDate="2012-02-14" xml:lang="en">provides attributes describing the nature of an encoded scholarly intervention or
@@ -1863,9 +1965,9 @@ associated with a dated element, at the time indicated.</desc>
   <remarks xml:lang="ja" versionDate="2019-05-20"><p>当該クラスは、あらゆる編集上の調整、例えば、原稿に対する修正や解釈、日時や場所の特定などを示すために、一般には使用される。</p></remarks>
   <listRef>
 <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</ref>
-<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">10.3.1. Origination</ref>
-<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">13.3.2. The Person Element</ref>
-<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</ref>
+<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdates">11.3.1. Origination</ref>
+<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSE">14.3.2. The Person Element</ref>
+<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" predeclare="true" module="tei" type="atts" ident="att.global.rendition">
   <desc versionDate="2014-12-02" xml:lang="en">provides rendering attributes common to all elements in the TEI encoding scheme.</desc>
@@ -2141,7 +2243,7 @@ the TEI header.</p>
   <desc versionDate="2007-10-02" xml:lang="en">provides attributes common to all elements in the TEI encoding scheme.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">TEI 부호화 스키마의 모든 요소에 공통 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供一組屬性，通用於TEI編碼標準中的所有元素。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">TEI符号化スキーム中の全要素に共通する属性を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">TEI符号化スキーム中の全要素に共通する属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">fournit un jeu d'attributs communs à tous les éléments
     dans le système de codage TEI.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona un conjunto de atributos común a todos los
@@ -2243,16 +2345,13 @@ the TEI header.</p>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">使用<ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC3066</ref>的代碼，指出該元素內容的使用語言</desc>
       <desc xml:lang="ja" versionDate="2019-06-08"><ref target="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</ref>に従って生成された<soCalled>タグ</soCalled>を用いて要素の内容の言語を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique la langue du contenu de l'élément en
-        utilisant les codes du <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC 3066</ref>
-         </desc>
+        utilisant les codes du <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC 3066</ref></desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica la lengua del contenido del elemento
         utilizando los códigos extraídos de <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC
-          3066</ref>
-         </desc>
+          3066</ref></desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica la lingua del contenuto dell'elemento
         utilizzando i codici tratti da <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC
-        3066</ref>
-         </desc>
+        3066</ref></desc>
       <datatype><dataRef key="teidata.language"/></datatype>
       <exemplum xml:lang="en">
         <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en">
@@ -2383,9 +2482,8 @@ the TEI header.</p>
   <desc versionDate="2007-09-27" xml:lang="en">provides attributes describing aspects of the hand in which a
   manuscript is written.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원고가 쓰여진 필적의 측면을 기술하는 속성을 제공한다.</desc>
-  <desc versionDate="2008-04-06" xml:lang="es">proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito. </desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">手書き資料の筆致に関する情報を表す情報を示す。
-</desc>
+  <desc versionDate="2008-04-06" xml:lang="es">proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito.</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">手書き資料の筆致に関する情報を表す情報を示す。</desc>
   <desc versionDate="2008-03-30" xml:lang="fr">fournit des attributs décrivant les caractéristiques
 de la main par laquelle un manuscrit est écrit.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">indica degli attributi che descrivono aspetti delle mano utilizzata per la scrittura del manoscritto</desc>
@@ -2394,8 +2492,7 @@ de la main par laquelle un manuscrit est écrit.</desc>
       <desc versionDate="2010-09-28" xml:lang="en">gives a name or other identifier for the scribe
 believed to be responsible for this hand.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 필적에 대한 책임이 있다고 간주되는 필기사에 대한 표준명 또는 다른 확인소를 제시한다.</desc>
-      <desc versionDate="2019-09-16" xml:lang="ja">当該筆致に対応すると考えられる筆写者の名前またはその他の識別子を示す。
-</desc>
+      <desc versionDate="2019-09-16" xml:lang="ja">当該筆致に対応すると考えられる筆写者の名前またはその他の識別子を示す。</desc>
       <desc versionDate="2009-05-27" xml:lang="fr">donne un nom normalisé ou un autre
 identifiant pour le scribe reconnu comme responsable de cette main.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">assegna un nome o altro identificatore standard al trascrittore che si ritiene corrisponda alla mano in questione</desc>
@@ -2417,8 +2514,7 @@ this hand, for example <mentioned>secretary</mentioned>, <mentioned>copperplate<
       えば、<mentioned>secretary(書記官スタイル)</mentioned>、
       <mentioned>copperplate(銅板スタイル)</mentioned>、
       <mentioned>Chancery(公文書スタイル)</mentioned>、
-       <mentioned>Italian(イタリアスタイル)</mentioned>など。
-	</desc>
+       <mentioned>Italian(イタリアスタイル)</mentioned>など。</desc>
       <desc versionDate="2009-05-27" xml:lang="fr">caractérise la calligraphie ou le style
         d'écriture particuliers utilisés par cette main, par exemple <mentioned>écriture anglaise</mentioned>,
         <mentioned>de chancellerie</mentioned>, <mentioned>italienne</mentioned>, etc.</desc>
@@ -2437,24 +2533,20 @@ this hand, typically supplied by a <gi>scriptNote</gi> element
     </attDef>
     <attDef ident="medium">
       <desc versionDate="2007-09-27" xml:lang="en">describes the tint or type of ink, e.g. <mentioned>brown</mentioned>, or other
-writing medium, e.g. <mentioned>pencil</mentioned>
-         </desc>
+writing medium, e.g. <mentioned>pencil</mentioned></desc>
       <desc versionDate="2007-12-20" xml:lang="ko"><mentioned>brown</mentioned>와 같이 잉크의 색 또는 유형, 또는 <mentioned>pencil</mentioned>와 같이 글쓰기 방식 기술한다.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">インクの種類や色合い、例えば、<mentioned>茶色</mentioned>
-      や、筆記具の種類、例えば、<mentioned>鉛筆</mentioned>など。
-</desc>
+      や、筆記具の種類、例えば、<mentioned>鉛筆</mentioned>など。</desc>
       <desc versionDate="2009-05-29" xml:lang="fr">décrit la teinte ou le type d'encre, par
         exemple <mentioned>brune</mentioned>, ou un autre outil d'écriture, par exemple un <mentioned>crayon</mentioned>.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">descrive la tinta o il tipo di inchiostro, per esempio <mentioned>marrone</mentioned>, o altri strumenti di scrittura, per esempio <mentioned>matita</mentioned>
-         </desc>
+      <desc versionDate="2007-01-21" xml:lang="it">descrive la tinta o il tipo di inchiostro, per esempio <mentioned>marrone</mentioned>, o altri strumenti di scrittura, per esempio <mentioned>matita</mentioned></desc>
       <desc versionDate="2007-05-04" xml:lang="es">describe la tinta o el tipo de tinta, p.ej. <mentioned>marrón</mentioned>, u otros instrumentos de escritura, p.ej. <mentioned>lápiz</mentioned>.</desc>
        <datatype minOccurs="1" maxOccurs="unbounded"><dataRef key="teidata.enumerated"/></datatype>
     </attDef>
     <attDef ident="scope">
       <desc versionDate="2007-09-27" xml:lang="en">specifies how widely this  hand is used in the manuscript.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 필적이 원고에서 사용된 범위를 명시한다.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該筆致が、当該手書き資料中で、どの程度出現しているかを示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該筆致が、当該手書き資料中で、どの程度出現しているかを示す。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">spécifie la fréquence d'apparition de cette
 main dans le manuscrit.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica in quale misura è utilizzata la mano in questione nel manoscritto</desc>
@@ -2464,8 +2556,7 @@ main dans le manuscrit.</desc>
         <valItem ident="sole">
           <desc versionDate="2007-09-27" xml:lang="en">only this hand is used throughout the manuscript</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 필적만이 원고 전체에 사용되었다.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致だけで全てが書かれている。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致だけで全てが書かれている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">il n'y a que cette main dans le
 manuscrit.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">unica mano utilizzata nel manoscritto</desc>
@@ -2474,8 +2565,7 @@ manuscrit.</desc>
         <valItem ident="major">
           <desc versionDate="2007-09-27" xml:lang="en">this hand is used through most of the manuscript</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 필적이 원고 대부분에서 사용되었다.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、殆どが書かれている。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、殆どが書かれている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette main est utilisée dans la
 majeure partie du manuscrit.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">mano utilizzata nella maggior parte del manoscritto</desc>
@@ -2484,8 +2574,7 @@ majeure partie du manuscrit.</desc>
         <valItem ident="minor">
           <desc versionDate="2007-09-27" xml:lang="en">this hand is used occasionally in the manuscript</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 필적이 원고에서 가끔 사용되었다.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、所々が書かれている。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、所々が書かれている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette main est utilisée
 occasionnellement dans le manuscrit.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">mano utilizzata solo di rado nel manoscritto</desc>
@@ -2503,14 +2592,13 @@ and similarly, either <att>scribe</att> or
     <p>通常は <att>script</att> または <att>scriptRef</att> そして同様に、 <att>scribe</att> あるいは <att>scribeRef</att> が用いられるだろう。</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.internetMedia">
   <desc versionDate="2007-10-18" xml:lang="en">provides attributes for specifying the type of a computer
   resource using a standard taxonomy.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">표준 분류법을 사용하는 컴퓨터 자원의 유형을 명시하는 속성을 제시한다.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">標準的な用語による計算機資源の種類を表す属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">標準的な用語による計算機資源の種類を表す属性を示す。</desc>
   <desc versionDate="2009-05-27" xml:lang="fr">fournit des attributs pour spécifier le type de
 ressource informatique selon une taxinomie normalisée.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">indica degli attributi che specificano il tipo di risorsa informatica utilizzando una tassonomia standard</desc>
@@ -2613,8 +2701,7 @@ ressource informatique selon une taxinomie normalisée.</desc>
   <desc versionDate="2006-01-05" xml:lang="en">provides attributes to represent a regularized or normalized measurement.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">정상화 또는 규격화된 측정 방식을 표상하는 속성을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供屬性，代表一般化或規格化的度量。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">正規化単位を表す属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">正規化単位を表す属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">donne des attributs pour représenter une mesure
       régularisée ou normalisée.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos que representen una medición regularizada o normalizada.</desc>
@@ -3134,7 +3221,7 @@ this name in the form of a set of whitespace-separated values, for example the o
   </attList>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">13.3.7. Names and Nyms</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDNYM">14.3.7. Names and Nyms</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.notated">
   <desc versionDate="2021-08-22" xml:lang="en">provides attributes to indicate any specialised notation used for element content.</desc>
@@ -3281,14 +3368,13 @@ this name in the form of a set of whitespace-separated values, for example the o
   </attList>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="TYPED" type="atts" ident="att.typed" predeclare="true">
   <desc versionDate="2007-10-02" xml:lang="en">provides attributes that can be used to classify or subclassify elements in any way.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">요소의 분류 또는 하위분류에서 사용될 수 있는 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供可依任何方法將元素分類或次要分類的一般屬性。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">要素を分類するための属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">要素を分類するための属性を示す。</desc>
   <desc versionDate="2009-05-29" xml:lang="fr">fournit des attributs qui peuvent être
       utilisés pour classer ou interclasser des éléments de n'importe quelle façon.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos genéricos utilizables para cualquier clasificación o subclasificación de elementos.</desc>
@@ -3372,11 +3458,11 @@ sub-classification for the element additional to that provided by its
     used. Alternatively a typology may be defined in the associated
     TEI header. If values are to be taken from a project-specific
     list, this should be defined using the <gi>valList</gi> element in
-    the project-specific schema description, as described in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">23.3.1.3. Modification of Attribute and Attribute Value Lists</ref> .</p>
+    the project-specific schema description, as described in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">24.3.1.3. Modification of Attribute and Attribute Value Lists</ref> .</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">17.1.1. Words and Above</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILCW">18.1.1. Words and Above</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONAAB">3.6.5. Abbreviations and Their Expansions</ref>
@@ -3386,14 +3472,14 @@ sub-classification for the element additional to that provided by its
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSDIV2">4.1.2. Numbered Divisions</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSHD">4.2.1. Headings and Trailers</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSVIRT">4.4. Virtual Divisions</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">13.3.2.3. Personal Relationships</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">11.3.1.1. Core Elements for Transcriptional Work</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">16.1.1. Pointers and Links</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">12.2. Linking the Apparatus to the Text</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">22.5.1.2. Defining Content Models: RELAX NG</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSREL">14.3.2.3. Personal Relationships</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCO">12.3.1.1. Core Elements for Transcriptional Work</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPTL">17.1.1. Pointers and Links</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLK">13.2. Linking the Apparatus to the Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDTAGCONT">23.5.1.2. Defining Content Models: RELAX NG</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSBA">8.3. Elements Unique to Spoken Texts</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">23.3.1.3. Modification of Attribute and Attribute Value Lists</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/USE.html#MDMDAL">24.3.1.3. Modification of Attribute and Attribute Value Lists</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.pointing">
   <desc versionDate="2016-01-15" xml:lang="en">provides a set of attributes used by all elements which point
@@ -3489,8 +3575,7 @@ sub-classification for the element additional to that provided by its
           <desc versionDate="2007-05-02" xml:lang="zh-TW">若指向的元素本身為指標，則該指標的目標會被移除，依此類推，直到找到一個非指標的元素為止。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">si el elemento que señala a sí mismo es un indicador, entonces el target de ese indicador será tomado, y así sucesivamente, hasta que se encuentre un elemento que no sea un indicador.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">参照先の要素がポインターである場合、そのポインターの参照先へ
-	  と展開する。これを、参照先がポインターでなくなるまで続ける。
-	</desc>
+	  と展開する。これを、参照先がポインターでなくなるまで続ける。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">si l'élément pointé est lui-même un pointeur, alors on prendra la cible de ce pointeur, et ainsi de suite jusqu'à trouver un élément qui n'est pas un pointeur.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">se l'elemento puntato è esso stesso un puntatore, allora sarà presa la destinazione di quel puntatore e così via fino a trovare un elemento che non è un puntatore</desc>
         </valItem>
@@ -3502,8 +3587,7 @@ sub-classification for the element additional to that provided by its
           <desc versionDate="2007-05-02" xml:lang="zh-TW">若指向的元素本身為指標，則該指標的目標(無論是否為指標)會作為這項指標的目標。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">si el elemento que señala a sí mismo es un puntero, entonces el target (puntero o no) se toma como el target de este puntero.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">参照先の要素がポインターである場合、(そのポインターの参照先
-	  がどうであれ)そのポインターが参照先になる。
-	</desc>
+	  がどうであれ)そのポインターが参照先になる。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">si l'élément pointé est lui-même un pointeur, alors sa cible (qui est ou non un pointeur) devient la cible retenue.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">se l'elemento puntato è esso stesso un puntatore, allora la sua destinazione (che sia un puntatore o meno) è presa come destinazione del puntatore</desc>
         </valItem>
@@ -3514,8 +3598,7 @@ sub-classification for the element additional to that provided by its
           <desc versionDate="2007-12-20" xml:lang="ko">포인터의 대상에서 명시된 요소를 발견할 필요가 없을 때 더 이상의 대상에 대한 평가는 수행되지 않는다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">尋找指標的目標元素時，未對目標進行不必要的延伸評估。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">no se realiza ninguna otra evaluación de los targets más allá de la necesaria para encontrar el elemento especificado en el target del puntero.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該ポインターの参照先から先にあるリンクへの展開は行わない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該ポインターの参照先から先にあるリンクへの展開は行わない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">aucune évaluation ultérieure des cibles n'est menée au-delà de la recherche de l'élément désigné dans la cible du pointeur.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">non viene condotta altra valutazione delle destinazioni se non quella necessaria a rintracciare l'elemento specificato nella destinazione del puntatore</desc>
         </valItem>
@@ -3615,8 +3698,7 @@ sub-classification for the element additional to that provided by its
           <gi>alt</gi>.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">describe la función de cada uno de los valores del atributo <att>target</att> (metas) de los marcadores correspondientes <gi>link</gi>, <gi>join</gi>, o <gi>alt</gi>.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">descrive la funzione di ognuno dei valori dell'attributo <att>target</att> dei marcatori corrispondenti <gi>link</gi>,
-      <gi>join</gi>, o <gi>alt</gi>
-         </desc>
+      <gi>join</gi>, o <gi>alt</gi></desc>
       <datatype minOccurs="2" maxOccurs="unbounded"><dataRef key="teidata.word"/></datatype>
       <remarks versionDate="2011-07-25" xml:lang="en">
         <p>The number of separate values must match the number of
@@ -3646,7 +3728,7 @@ sub-classification for the element additional to that provided by its
     </attDef>
   </attList>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.segLike">
   <desc versionDate="2006-01-05" xml:lang="en">provides attributes for elements used for arbitrary segmentation.</desc>
@@ -3685,8 +3767,8 @@ subject, predicate etc. may be more appropriate. Such constraints will typically
     </attDef>
   </attList>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.sortable">
   <desc versionDate="2011-11-06" xml:lang="en">provides attributes for elements in lists or groups that are sortable, but whose sorting key cannot be derived mechanically from the element content.</desc>
@@ -3748,7 +3830,7 @@ subject, predicate etc. may be more appropriate. Such constraints will typically
     </attDef>
   </attList>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.edition">
   <desc versionDate="2013-01-11" xml:lang="en">provides attributes identifying the source edition from which
@@ -3863,7 +3945,7 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
     </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STECAT">1.3.1. Attribute Classes</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.styleDef">
@@ -4025,8 +4107,7 @@ If no value for the @scheme attribute is provided, then the default assumption s
   <desc versionDate="2007-12-20" xml:lang="ko">원고 또는 유사 원본을 전사할 때 텍스트의 저작 또는 필사 간섭을 부호화하는 요소에 특징적으로 사용되는 속성을 제시한다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">proporciona a los atributos específicos a los elementos que codifican la intervención authorial o scribal en un texto al transcribir el manuscrito o las fuentes similares.</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">手書き資料や同様の資料を転記する場合、著者や筆写者に関する調整を記録
-  する要素に付与される属性を示す。
-</desc>
+  する要素に付与される属性を示す。</desc>
   <desc versionDate="2008-03-30" xml:lang="fr">fournit des attributs spécifiques au codage d'éléments
 relatifs à l'intervention de l'auteur ou du copiste dans un texte lors de la
 transcription de sources manuscrites ou assimilées.</desc>
@@ -4048,8 +4129,7 @@ transcription de sources manuscrites ou assimilées.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">indica el resultado de una intervención, por ejemplo en el caso de una cancelación, una tachadura que incluyen demasiado o demasiado poco texto, o en el caso de una adición o una inserción que duplica información ya presente en el texto.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該調整の影響を示す。例えば、削除の際、取消線の範囲が多すぎた
       り少なすぎたりする場合や、追加の際、既にあるテキストの部分をコピー
-      して挿入したりする場合。
-</desc>
+      して挿入したりする場合。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">indique la conséquence de l'intervention, par
 exemple dans le cas d'un effacement, une biffure, qui inclut trop ou pas assez de
 texte, ou dans le cas d'un ajout, une insertion, qui reproduit une portion du
@@ -4066,8 +4146,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">중복이 단어 대 단어로 된 것이지, 아니면 중복이 비교적 덜 정확하게 된 것인지 간에, 삽입으로 표시된 모든 텍스트는 원본의 일부 텍스트를 중복한 것임.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">todo el texto indicado como adición duplica un fragmento de texto presente en el original, siendo la duplicación palabra por palabra o algo menos exacta.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは全て、元資料にあるテキストのコピーを追加するも
-      のである。その程度は、語単位であったりそれより小さいこともある。
-</desc>
+      のである。その程度は、語単位であったりそれより小さいこともある。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">tout le texte indiqué comme étant une addition reprend le texte de l'original, que la duplication soit identique mot pour mot ou moins exacte.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">l'intero testo identificato come aggiunta riproduce parte del testo già presente nell'originale, indipendentemente dal fatto che la riproduzione sia esatta (parola per parola) o meno</desc>
         </valItem>
@@ -4077,8 +4156,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">일부 텍스트가 원본의 일부 텍스트를 중복</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la parte del texto marcado como adición duplica un fragmento de texto presente en el original</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該テキストの部分は、元資料にあるテキストのコピーを追加する
-      ものである。
-</desc>
+      ものである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">la partie du texte indiquée comme
 étant un ajout est redondante avec un texte présent dans l'original.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo identificato come aggiunta riproduce parte del testo già presente nell'originale</desc>
@@ -4090,8 +4168,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있지 않았어야 하는데도, 삭제부의 시작에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del principio de una cancelación se marca como suprimido aunque este no lo haya sido claramente.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の始点は、例えそれが明白な削除ではなくとも、マー
-      クされている。
-</desc>
+      クされている。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé au début de la supression est indiqué comme supprimé bien qu'à l'évidence il ne devrait pas l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo all'inizio della cancellazione è identificata come cancellata anche se chiaramente non dovrebbe esserlo</desc>
         </valItem>
@@ -4102,8 +4179,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있지 않았어야 하는데도, 삭제부의 끝에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del final de una cancelación se marca como suprimido aunque este no lo haya sido claramente.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の終点は、例えそれが明白な削除ではなくとも、マー
-      クされている。
-</desc>
+      クされている。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé à la fin de la supression est indiqué comme supprimé bien qu'à l'évidence il ne devrait pas l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo alla fine della cancellazione è identificata come cancellata anche se chiaramente non dovrebbe esserlo</desc>
         </valItem>
@@ -4113,8 +4189,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있어야 하는데도, 삭제부의 시작에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있지 않다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del inicio de la cancelación no se marca como suprimido aunque claramente haya sido suprimido.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の始点は、例えそれが明白な削除ではなくとも、マー
-      クされていない。
-</desc>
+      クされていない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé au début de la supression n'est pas indiqué comme supprimé bien qu'à l'évidence il devrait l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo all'inizio della cancellazione non è identificata come cancellata anche se chiaramente dovrebbe esserlo</desc>
         </valItem>
@@ -4124,8 +4199,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있어야 하는데도, 삭제부의 끝에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있지 않다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del final de la cancelación no se marca como suprimido aunque claramente haya sido suprimido.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の終点は、例えそれが明白な削除ではなくとも、マー
-      クされていない。
-</desc>
+      クされていない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé à la fin de la supression n'est pas indiqué comme supprimé bien qu'à l'évidence il devrait l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo alla fine della cancellazione non è identificata come cancellata anche se chiaramente dovrebbe esserlo</desc>
         </valItem>
@@ -4135,8 +4209,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있어야 하는데도, 삭제부에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있지 않다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto de la cancelación no se marca como suprimido aunque claramente haya sido suprimido.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分は、例えそれが明白な削除ではなくとも、マークされ
-      ていない。
-</desc>
+      ていない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte dans la supression n'est pas indiqué comme disparu bien qu'à l'évidence il devrait l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo all'interno della cancellazione non è identificata come cancellata anche se chiaramente dovrebbe esserlo</desc>
         </valItem>
@@ -4144,8 +4217,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-09-03" xml:lang="en">the deletion is not faulty.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">삭제가 잘못된 것이 아니다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la cancelación no es defectuosa.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分は、間違いではない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分は、間違いではない。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">l'indication de suppression n'est pas
 erronée.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">la cancellazione non è erronea</desc>
@@ -4202,8 +4274,7 @@ erronée.</desc>
       the encoded features carrying this attribute are believed to have occurred.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 속성을 포함하는 부호화된 자질이 발생했다고 가정되는 순서와 관련된 번호를 할당한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">asigna un número de serie relacionado con el orden en el cual se cree que se han sucedido las características codificadas que llevan este atributo.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該属性が示す素性が出現すると想定されている順番の、番号を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該属性が示す素性が出現すると想定されている順番の、番号を示す。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">assigne un numéro séquentiel relatif à l'ordre
 dans lequel les traits encodés portant cet attribut sont supposés être apparus.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">stabilisce un numero sequenziale relativo all'ordine in cui si ritiene che ricorrano i tratti codificati ai quali è assegnato tale attributo</desc>
@@ -4212,7 +4283,7 @@ dans lequel les traits encodés portant cet attribut sont supposés être apparu
   </attList>
   <listRef>
 
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">11.3.1.4. Additions and Deletions</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHAD">12.3.1.4. Additions and Deletions</ref>
 
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" ident="att.citing">
@@ -4384,8 +4455,8 @@ or corporate bodies.</desc>
       <gi>segmentation</gi>中で明示的に宣言されるべきである。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">17.1. Linguistic Segment Categories</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/AI.html#AILC">18.1. Linguistic Segment Categories</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.hiLike">
   <desc versionDate="2007-10-06" xml:lang="en">groups phrase-level elements which are typographically distinct but to which no specific
@@ -4458,7 +4529,7 @@ or corporate bodies.</desc>
   </classes>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.measureLike">
   <desc versionDate="2007-10-18" xml:lang="en">groups elements which denote a number, a quantity, a measurement, or similar piece of text
@@ -4493,7 +4564,7 @@ Measures</ref>
       
   </classes>
   <listRef>
-      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">22.1.1. Phrase Level Terms</ref>
+      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDphraseTE">23.1.1. Phrase Level Terms</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.graphicLike">
   <desc versionDate="2007-10-18" xml:lang="en">groups elements containing images, formulae, and 
@@ -4524,7 +4595,7 @@ Measures</ref>
     <memberOf key="model.nameLike"/>
   </classes>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.pPart.msdesc">
   <desc versionDate="2007-10-18" xml:lang="en">groups phrase-level elements used in manuscript description.</desc>
@@ -4542,14 +4613,13 @@ Measures</ref>
     <memberOf key="model.limitedPhrase"/>
   </classes>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">10. Manuscript Description</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#MS">11. Manuscript Description</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.pPart.editorial">
   <desc versionDate="2007-10-18" xml:lang="en">groups phrase-level elements for simple editorial interventions that may be useful both
 in transcribing and in authoring.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전사와 저작 모두에서 유용할 수 있는 간단한 편집 간섭에 대한 구-층위 요소를 모아 놓는다.</desc>
-  <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集的詞組層次元素用於簡單的編輯更正，且有助於轉錄和編寫
-</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集的詞組層次元素用於簡單的編輯更正，且有助於轉錄和編寫</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">転記や編集の両方で使用される、単純な編集上の調整を示す、句レベルの要
   素をまとめる。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments de niveau expression, utilisés pour de
@@ -4748,7 +4818,7 @@ Elements</ref>
     <memberOf key="model.limitedPhrase"/>
   </classes>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.specDescLike">
   <desc versionDate="2007-10-22" xml:lang="en">groups elements for referring to specification elements.</desc>
@@ -4763,7 +4833,7 @@ Elements</ref>
     <memberOf key="model.phrase"/>
   </classes>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">22. Documentation Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TD">23. Documentation Elements</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="CLBIBL" type="model" ident="model.biblLike">
   <desc versionDate="2005-10-10" xml:lang="en">groups elements containing a bibliographic description.</desc>
@@ -4910,7 +4980,7 @@ niveau dans une entrée de dictionnaire.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa tutti gli elementi specificatamente definiti per i dizionari.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa todos los elementos definidos específicamente para diccionarios.</desc>
   <listRef>
-      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">9.1. Dictionary Body and Overall Structure</ref>
+      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DIBO">10.1. Dictionary Body and Overall Structure</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="EDITINCL" type="model" ident="model.global.edit">
   <desc versionDate="2007-10-03" xml:lang="en">groups globally available elements which perform a specifically editorial function.</desc>
@@ -4977,7 +5047,7 @@ niveau dans une entrée de dictionnaire.</desc>
     <memberOf key="model.placeStateLike"/>
   </classes>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">13.2.3. Place Names</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPLAC">14.2.3. Place Names</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" predeclare="true" module="tei" type="model" ident="model.placeStateLike">
   <desc versionDate="2007-10-09" xml:lang="en">groups elements which describe changing states of a place.</desc>
@@ -5229,13 +5299,11 @@ fin d'une division de texte.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集的元素 (而非選擇本身) 可用於元素<gi>choice</gi>之替換</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">要素<gi>choice</gi>中に現れる(要素<gi>choice</gi>以外の)要素をまとめ る。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments (autres que <gi>choice</gi>) qui
-    peuvent être utilisés en alternance avec <gi>choice</gi>
-   </desc>
+    peuvent être utilisés en alternance avec <gi>choice</gi></desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa los elementos (excluída el propio elemento
-    "choice") que pueden ser usados en alternancia con <gi>choice</gi>.</desc>
+    <q>choice</q>) que pueden ser usados en alternancia con <gi>choice</gi>.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa gli elementi (escluso l'elemento choice) che
-    possono essere usati in alternanza con <gi>choice</gi>
-   </desc>
+    possono essere usati in alternanza con <gi>choice</gi></desc>
   <classes/>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COED">3.5. Simple Editorial Changes</ref>
@@ -5429,6 +5497,18 @@ fin d'une division de texte.</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ST.html#STEC">1.3. The TEI Class System</ref>
   </listRef>
+</classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" ident="model.cmc" type="model" module="tei">
+    <desc xml:lang="en" versionDate="2021-09-07">includes the CMC-specific element <gi>post</gi> and
+        makes it available on the divPart level. This allows for
+        using (and combining) occurrences of <gi>post</gi>,
+        <gi>u</gi>, <gi>incident</gi>, and <gi>kinesic</gi> in one
+        and the same <gi>div</gi> in order to be able to represent
+        the combined use of written and spoken posts, utterances,
+        and nonverbal acts on the GUI of multimodal CMC
+        environments.</desc>
+    <classes>
+        <memberOf key="model.common"/>
+    </classes>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" xml:id="COMMON" type="model" ident="model.common">
   <desc versionDate="2005-10-10" xml:lang="en">groups common chunk- and inter-level elements.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">공통적인 덩어리 및 상호 층위 요소를 모아 놓는다.</desc>
@@ -5596,7 +5676,7 @@ fin d'une division de texte.</desc>
     <memberOf key="model.standOffPart"/>
   </classes>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.annotationPart.body">
   <desc versionDate="2020-07-31" xml:lang="en">groups elements which may be used as an <gi>annotation</gi> body.</desc>
@@ -5873,7 +5953,7 @@ used for transcribing extant documents.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a probability.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">확률을 표현하는 속성 값의 범위를 정의한다.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義表示可能性的屬性值範圍</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">出現度を示す属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">出現度を示す属性値の範囲を定義する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs exprimant une
     probabilité.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un
@@ -5904,7 +5984,7 @@ used for transcribing extant documents.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for numeric values.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">수치에 사용되는 속성 값의 범위를 정의한다.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義用於數值的屬性值範圍</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">数値をとる属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">数値をとる属性値の範囲を定義する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs utilisées pour
     des valeurs numériques</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos para valores
@@ -5988,8 +6068,7 @@ used for transcribing extant documents.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for a non-negative
 integer value used as a count.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">계산으로 사용된 음이 아닌 정수 값의 속성 값 범위를 정의한다.</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍，用於作為總數的非負整數值
-</desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍，用於作為總數的非負整數值</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">非負整数値を採る属性値の範囲を定義する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs des attributs exprimant une valeur entière et non négative  utilisé pour des calculs.</desc>
@@ -6184,7 +6263,7 @@ value.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to express a truth value which may be unknown.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">알려지지 않을 수 있는 진리값을 표현하는 속성 값 범위를 정의한다.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個可能未知的真實值</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">不明の場合もある真偽値をとる属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">不明の場合もある真偽値をとる属性値の範囲を定義する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant une vérité potentiellement inconnue.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
@@ -6496,8 +6575,7 @@ value.</desc>
       W3C.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
     indicar los nombres de los espacios en XML como establecen las recomendaciones técnicas del W3C
-    para los <ptr target="https://www.w3.org/TR/1999/REC-xml-names-19990114/"/>
-   </desc>
+    para los <ptr target="https://www.w3.org/TR/1999/REC-xml-names-19990114/"/></desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
     indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
     <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">spazi dei nomi in XML</ref>.</desc>
@@ -6807,7 +6885,7 @@ which contain an XPath expression.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressed as an XML Name.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">XML 이름으로 표현되는 속성 값 범위를 정의한다.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以XML名稱或識別符碼表示</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">XML名前としてある属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">XML名前としてある属性値の範囲を定義する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2009-05-29" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant
     un nom XML</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos expresados como
@@ -6897,14 +6975,14 @@ which contain an XPath expression.</desc>
   <remarks xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-08-27" xml:lang="en">
     <p>Values for attributes using this datatype may be defined locally by a project, or they may refer to an external standard.</p>
     <p>Values for this datatype should not be used to encode morphological gender (cf. <gi>gen</gi>,
-        <att>msd</att> as defined in <ident type="class">att.linguistic</ident>, and <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">9.3.1. Information on Written and Spoken Forms</ref>).</p>
+        <att>msd</att> as defined in <ident type="class">att.linguistic</ident>, and <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPFO">10.3.1. Information on Written and Spoken Forms</ref>).</p>
   </remarks>
 </dataSpec><dataSpec module="tei" ident="teidata.sex">
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="en">defines the range of attribute values used to identify
     the sex of an organism.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">인간 또는 동물의 성을 식별하는 속성 값 범위를 정의한다.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍用以識別人類或動物的性別</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">人間または動物の性を示す属性値の範囲を定義する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">人間または動物の性を示す属性値の範囲を定義する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="fr">définit la gamme des valeurs d'attributs employés
     pour identifier le sexe d’un organisme.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2022-05-10" xml:lang="es">define la gama de valores de atributos usados para
@@ -7004,7 +7082,7 @@ which contain an XPath expression.</desc>
   </attList>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HDUDECL">2.3.9. The Unit Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">13.3.4.3. States, Traits, and Events</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDGEOGste">14.3.4.3. States, Traits, and Events</ref>
   </listRef>
 </classSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="model" ident="model.correspActionPart">
     <desc versionDate="2014-11-11" xml:lang="en">groups elements which define the
@@ -7129,7 +7207,7 @@ one initial.</desc>
     </attDef>
   </attList>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</ref>
   </listRef>
 </classSpec><classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="tei" type="atts" xml:id="CALENDARSYSTEM" ident="att.calendarSystem">
   <desc versionDate="2023-05-09" xml:lang="en">provides attributes for indicating calendar systems to which a date belongs.</desc>
@@ -7201,14 +7279,14 @@ one initial.</desc>
   </attList>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONADA">3.6.4. Dates and Times</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</ref>
   </listRef>
 </classSpec><dataSpec module="tei" ident="teidata.duration.iso">
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-04-09" xml:lang="en">defines the range of attribute values available for representation of a duration in time
     using ISO 8601 standard formats</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-02" xml:lang="zh-TW">以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍</desc>
-  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。 </desc>
+  <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601.</desc>
   <desc xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos posibles para
     representar la duración en el tiempo usando formatos estàndards ISO 8601.</desc>
@@ -7489,6 +7567,7 @@ Elements</ref>
     <memberOf key="att.declaring"/>
     <memberOf key="att.fragmentable"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -7566,6 +7645,7 @@ Elements</ref>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -7664,6 +7744,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -7734,6 +7815,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.hiLike"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -7778,6 +7860,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -7881,6 +7964,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.attributable"/>
     <memberOf key="att.ascribed.directed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -8045,24 +8129,21 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2009-01-06" xml:lang="fr">citation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">cita</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">citazione</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">contains a phrase or passage attributed by the narrator or author to some agency external
-        to the text.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko"> 해설자 또는 저자에 의해, 텍스트의 외부 주체에 의해 생성된 것이라 밝혀진 구 또는 단락을
-        포함한다.</desc>
+  <desc versionDate="2005-01-14" xml:lang="en">contains a phrase or passage attributed by the narrator or author to some agency external to the text.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko"> 해설자 또는 저자에 의해, 텍스트의 외부 주체에 의해 생성된 것이라 밝혀진 구 또는 단락을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含敘述者或作者引用自文本以外來源的字 (句) 詞或段落。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">語り手や著者が、当該テキスト外にあるものに向けた、一節を示す。</desc>
-  <desc versionDate="2009-01-06" xml:lang="fr">contient une expression ou un passage que le
-        narrateur ou l'auteur attribue à une origine extérieure au texte.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene una frase o pasaje atribuido por el narrador o
-        autor a un agente externo al texto.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene una frase o un brano attribuito dall'autore o
-        dal narratore a soggetti esterni al testo</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient une expression ou un passage que le narrateur ou l'auteur attribue à une origine extérieure au texte.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene una frase o pasaje atribuido por el narrador o autor a un agente externo al texto.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene una frase o un brano attribuito dall'autore o dal narratore a soggetti esterni al testo</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.quoteLike"/>
+    <memberOf key="model.biblPart"/>
     <memberOf key="att.typed"/>
     
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -8148,6 +8229,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="model.hiLike"/>
     <memberOf key="model.common"/>
     <memberOf key="att.ascribed.directed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -8360,6 +8442,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.typed"/>
     <memberOf key="model.quoteLike"/>
     
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -8473,7 +8556,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHQQ">3.3.3. Quotation</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">9.3.5.1. Examples</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPEG">10.3.5.1. Examples</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="mentioned">
   <gloss versionDate="2005-01-14" xml:lang="en"/>
@@ -8489,6 +8572,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -8534,6 +8618,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -8597,6 +8682,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     
     <memberOf key="att.typed"/>
     <memberOf key="model.labelLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.limitedContent"/>
@@ -8619,7 +8705,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   </constraintSpec>
   <attList>
     <attDef ident="type" mode="change">
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="deprecationInfo">
           <gloss versionDate="2018-09-14" xml:lang="en">deprecation
           information</gloss>
@@ -8699,7 +8785,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
       Satz ausgedrückt wird, der mit einem Verb im Aktiv beginnt.</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="gloss">
   <gloss xml:lang="en" versionDate="2009-01-06">gloss</gloss>
@@ -8724,6 +8810,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.pointing"/>
     <memberOf key="att.cReferencing"/>
     
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -8759,7 +8846,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COHTG">3.4.1. Terms and Glosses</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">22.4.1. Description of Components</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TD.html#TDcrystalsCEdc">23.4.1. Description of Components</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="term">
   <gloss xml:lang="en" versionDate="2009-01-06">term</gloss>
@@ -8787,6 +8874,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.canonical"/>
     <memberOf key="att.sortable"/>
     <memberOf key="att.cReferencing"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -8891,7 +8979,8 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <memberOf key="att.global"/>
   <memberOf key="att.typed"/>
   <memberOf key="model.phrase"/>
-</classes>
+    <memberOf key="att.cmc"/>
+  </classes>
   <content>
     <sequence>
       <elementRef key="rb" minOccurs="1" maxOccurs="1"/>
@@ -9007,7 +9096,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
           <att>to</att>.</p>
       </remarks>
     </attDef>
-    <attDef ident="from" usage="opt" mode="add">
+    <attDef ident="from" usage="opt">
       <desc xml:lang="en" versionDate="2021-01-06">points to the starting point of the span of text
         being glossed by this ruby text.</desc>
       <desc versionDate="2021-01-31" xml:lang="ja">ルビテキストの対象範囲の始点を示す。</desc>
@@ -9025,7 +9114,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         </constraint>
       </constraintSpec>
     </attDef>
-    <attDef ident="to" usage="opt" mode="add">
+    <attDef ident="to" usage="opt">
       <desc xml:lang="en" versionDate="2021-01-06">points to the ending point of the span of text
         being glossed.</desc>
       <desc versionDate="2021-01-31" xml:lang="ja">ルビテキストの対象範囲の終点を示す。</desc>
@@ -9086,6 +9175,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
     <memberOf key="model.choicePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -9188,6 +9278,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -9264,6 +9355,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.editorial"/>
     
+    <memberOf key="att.cmc"/>
   </classes>
 <content>
   <alternate minOccurs="2" maxOccurs="unbounded">
@@ -9320,7 +9412,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
             witnesses of a single work, rather than to identify
     multiple possible encoding decisions at a given point, the
     <gi>app</gi> element and associated elements discussed in  section
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref> should be preferred.</p>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">13.1. The Apparatus Entry, Readings, and Witnesses</ref> should be preferred.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Parce que les éléments contenus par un élément <gi>choice</gi> correspondent  tous à des solutions
@@ -9330,13 +9422,13 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
             parallèles.</p>
     <p>A Noter aussi que les <gi>choice</gi> peuvent s'imbriquer. </p>
     <p>Pour une version de <gi>choice</gi> spécialisée pour l'encodage de témoins multiples
-            d'une même oeuvre, l'élément <gi>app</gi> peut etre préférable : voir la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref>.</p>
+            d'une même oeuvre, l'élément <gi>app</gi> peut etre préférable : voir la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">13.1. The Apparatus Entry, Readings, and Witnesses</ref>.</p>
   </remarks>
   <remarks xml:lang="es" versionDate="2008-04-06">
     <p>Porque los niños de un elemento <gi>opción</gi> representan las maneras alternativas de codificar la misma secuencia, es natural pensar en ellas como mutuamente exclusivas.
             Sin embargo, puede haber casos donde una representación completa de un texto requiera que las codificaciones alternativas sean consideradas como paralelas. </p>
     <p>Se Observa también que los elementos <gi>opción</gi> pueden ser uno mismo-jerarquía.</p>
-    <p>Para una versión especializada de la <gi>opción</gi> para codificar los testimonios múltiples de un único trabajo, ver la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref>.</p>
+    <p>Para una versión especializada de la <gi>opción</gi> para codificar los testimonios múltiples de un único trabajo, ver la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">13.1. The Apparatus Entry, Readings, and Witnesses</ref>.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2024-02-28">
     <p>
@@ -9344,7 +9436,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
       けれども、テキストを完全に表現するには複数の選択肢を並列的に扱う必要がある場合もあるだろう。</p>
       <p><gi>choice</gi>要素は、自らを入れ子にできることにも注意して欲しい。</p>
       <p>符号化時にありうる選択肢ではなく、1つの作品にある複数の本文を記録する目的では、
-      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref>で扱われている<gi>app</gi>要素などが望ましい。</p>
+      <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">13.1. The Apparatus Entry, Readings, and Witnesses</ref>で扱われている<gi>app</gi>要素などが望ましい。</p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-24">
       <p>
@@ -9357,7 +9449,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
       </p>
       <p>
           In Fällen, in denen nicht mehrere mögliche Kodierungsvarianten, sondern Varianten aus mehreren Zeugen eines Werkes kodiert werden sollen, 
-          sind das <gi>app</gi>-Element und dazu gehörige Elemente, die im Abschnitt <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">12.1. The Apparatus Entry, Readings, and Witnesses</ref> erläutert werden, zu bevorzugen.
+          sind das <gi>app</gi>-Element und dazu gehörige Elemente, die im Abschnitt <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TCAPLL">13.1. The Apparatus Entry, Readings, and Witnesses</ref> erläutert werden, zu bevorzugen.
       </p>
   </remarks>
   <listRef>
@@ -9382,13 +9474,14 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         normalizada en algún sentido.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una lettura è stata regolarizzata o
         normalizzata in qualche modo.</desc>
-    <desc versionDate="2016-11-24" xml:lang="de">enthält eine normalisierte Schreibweise einer Textstelle. </desc>
+    <desc versionDate="2016-11-24" xml:lang="de">enthält eine normalisierte Schreibweise einer Textstelle.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -9461,7 +9554,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and
 Normalization</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="orig">
   <gloss versionDate="2005-01-14" xml:lang="en">original form</gloss>
@@ -9487,6 +9580,7 @@ Normalization</ref>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
     <memberOf key="model.choicePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -9559,7 +9653,7 @@ Normalization</ref>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDREG">3.5.2. Regularization and
 Normalization</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">12. Critical Apparatus</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TC.html#TC">13. Critical Apparatus</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="gap">
   <gloss xml:lang="en" versionDate="2008-12-09">gap</gloss>
@@ -9592,6 +9686,7 @@ Normalization</ref>
     <memberOf key="att.timed"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
         <alternate minOccurs="0" maxOccurs="unbounded">
@@ -9775,7 +9870,7 @@ Normalization</ref>
   <remarks versionDate="2011-12-09" xml:lang="en">
     <p>The <gi>gap</gi>, <gi>unclear</gi>, and <gi>del</gi> core tag elements may be closely allied
       in use with the <gi>damage</gi> and <gi>supplied</gi> elements, available when using the
-      additional tagset for transcription of primary sources. See section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+      additional tagset for transcription of primary sources. See section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref>
       for discussion of which element is appropriate for which circumstance.</p>
     <p>The <gi>gap</gi> tag simply signals the editors decision to omit or inability to transcribe a span of
@@ -9786,7 +9881,7 @@ Normalization</ref>
     <p>Les éléments du jeu de balises de base <gi>gap</gi>, <gi>unclear</gi>, et <gi>del</gi>
       peuvent être étroitement associés avec l'utilisation des éléments <gi>damage</gi> et
         <gi>supplied</gi> qui sont disponibles si l'on utilise le jeu de balises additionnel pour la
-      transcription des sources primaires. Voir la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+      transcription des sources primaires. Voir la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> pour plus de
       détails sur l'élément le plus pertinent suivant les circonstances.</p>
   </remarks>
@@ -9794,18 +9889,18 @@ Normalization</ref>
     <p> El <gi>gap</gi>, <gi>unclear</gi>, y los elementos de la etiqueta base pueden funcionar
       con los elementos de <gi>daño</gi> y elementos de <gi>supresión</gi>, disponibles al usar el
       conjunto de etiquetas adicional para la transcripción de las fuentes primarias. Ver la sección
-        <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+        <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> para la discusión cuyo el elemento es apropiado para qué
       circunstancia.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
-    <p> コアモジュールの要素<gi>gap</gi>、<gi>unclear</gi>、<gi>del</gi>は、 転記モジュールの要素<gi>damage</gi>、<gi>supplied</gi>と連携するこ とができる。どのタグを使用すべきかについては、詳細については、 <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+    <p> コアモジュールの要素<gi>gap</gi>、<gi>unclear</gi>、<gi>del</gi>は、 転記モジュールの要素<gi>damage</gi>、<gi>supplied</gi>と連携するこ とができる。どのタグを使用すべきかについては、詳細については、 <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref>を参照のこと。 </p>
   </remarks>
   <remarks versionDate="2016-11-25" xml:lang="de">
     <p>Die Elemente <gi>gap</gi>, <gi>unclear</gi> und <gi>del</gi> aus dem Core-Modul sind eng verwandt mit den 
       Elementen <gi>damage</gi> und <gi>supplied</gi>, die mit dem <ident type="module">transcr</ident> zur Verfügung 
-      gestellt werden. Die Unterschiede im Gebrauch dieser Elemente werden in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+      gestellt werden. Die Unterschiede im Gebrauch dieser Elemente werden in <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> näher beschrieben.</p> 
     <p>Das <gi>gap</gi>-Element weist nur darauf hin, dass die Bearbeiter*innen sich entschieden haben, 
       eine Textpassage auszulassen oder sie nicht transkribieren konnten. 
@@ -9935,6 +10030,7 @@ Normalization</ref>
     <memberOf key="att.placement"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -10025,6 +10121,7 @@ Normalization</ref>
     <memberOf key="att.transcriptional"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -10068,7 +10165,7 @@ Normalization</ref>
       tagset for transcription of primary sources) should be used to signal the areas of text which
       cannot be read with confidence in a similar way.</p>
     <p>Degrees of uncertainty over what can still be read, or whether a deletion was intended may be
-      indicated by use of the <gi>certainty</gi> element (see <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>).</p>
+      indicated by use of the <gi>certainty</gi> element (see <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>).</p>
     <p>There is a clear distinction in the TEI between <gi>del</gi>
     and <gi>surplus</gi> on the one hand and <gi>gap</gi> or
     <gi>unclear</gi> on the other. <gi>del</gi> indicates a
@@ -10079,14 +10176,14 @@ Normalization</ref>
      deleted, but which is not in fact. <gi>gap</gi> or <gi>unclear</gi>, by contrast, signal an
      editor's or encoder's decision to omit something or their
      inability to read the source text.
-    See  sections <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">11.3.1.7. Text Omitted from or Supplied in the Transcription</ref> and <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+    See  sections <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">12.3.1.7. Text Omitted from or Supplied in the Transcription</ref> and <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> for the relationship between these and other
     related elements used in detailed transcription. </p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Cf. <gi>gap</gi>.</p>
     <p>Les degrés d'incertitude sur ce qui est encore lisible peuvent être indiqués par l'emploi de
-      l'élément <gi>certainty</gi> (voir <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>).</p>
+      l'élément <gi>certainty</gi> (voir <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>).</p>
     <p>Cet élément doit être utilisé pour la suppression de courtes séquences de texte, généralement
       des mots ou des expressions. Il faut utiliser l'élément <gi>delSpan</gi> pour les séquences de
       texte plus longues, celles qui contiennent des divisions structurelles, et celles qui
@@ -10098,10 +10195,10 @@ Normalization</ref>
       attributs de l'élément <gi>gap</gi>. Si le texte n'est pas entièrement lisible, l'élément
         <gi>unclear</gi> (disponible avec le jeu additionnel de balises pour la transcription des
       sources primaires) doit être utilisé pour signaler les zones de texte ne pouvant pas être lues
-      de manière fiable. Voir les sections suivantes <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">11.3.1.7. Text Omitted from or Supplied in the Transcription</ref> et, pour l'association
+      de manière fiable. Voir les sections suivantes <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">12.3.1.7. Text Omitted from or Supplied in the Transcription</ref> et, pour l'association
       étroite entre les balises <gi>del</gi> et <gi>gap</gi>, <gi>damage</gi>, <gi>unclear</gi> et
         <gi>supplied</gi> (ces trois dernières balises étant disponibles avec le jeu additionnel de
-      balises pour la transcription de sources primaires), voir la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+      balises pour la transcription de sources primaires), voir la section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref>.</p>
     <p>La balise <gi>del</gi> ne doit pas être utilisée pour les suppressions par des éditeurs
       scientifiques ou des encodeurs. Dans ce cas, il faut utiliser soit la balise <gi>corr</gi>,
@@ -10109,14 +10206,14 @@ Normalization</ref>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p><gi>gap</gi>を参照のこと。</p>
-    <p> 当該解釈の確信度は要素<gi>certainty</gi>で示される (<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>を参照のこと)。 </p>
+    <p> 当該解釈の確信度は要素<gi>certainty</gi>で示される (<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>を参照のこと)。 </p>
     <p> 当該要素は、短いテキスト部分、例えばひつとの単語や句が削除されてい る時に使用されるべきである。要素<gi>delSpan</gi>は、より大きなテキ
       スト部分、例えば、下位構造を含むものや追加と削除をともに含むような ものが削除されているときに使用されるべきである。 </p>
     <p> 当該削除されているテキストは、少なくとも転記するに充分なほどには読 めるものでなければならない。全く読めないのであれば、要素
         <gi>del</gi>は使うべきではない。この場合には、要素<gi>gap</gi>を使 い、転記できない単一のテキスト部分を示すべきである。この際、属性
       <att>reason</att>により転記ができない理由が削除であることを示すこ とができる。全てが読めるわけではないという場合には、要素
-      <gi>unclear</gi>を使い、確信が持てないが読めるひとつのテキスト部分 を示すべきである。詳しくは、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">11.3.1.7. Text Omitted from or Supplied in the Transcription</ref>を参照のこと。
-      また、要素<gi>del</gi>と要素<gi>gap</gi>、<gi>damage</gi>、<gi>unclear</gi>、<gi>supplied</gi>との関係については、 <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+      <gi>unclear</gi>を使い、確信が持てないが読めるひとつのテキスト部分 を示すべきである。詳しくは、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">12.3.1.7. Text Omitted from or Supplied in the Transcription</ref>を参照のこと。
+      また、要素<gi>del</gi>と要素<gi>gap</gi>、<gi>damage</gi>、<gi>unclear</gi>、<gi>supplied</gi>との関係については、 <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref>を参照のこと(damageとsuppliedは元資料を転記
       するための追加モジュールを使用する際に使うことができる)。 </p>
     <p> 要素<gi>del</gi>は、編集者や符号化する人による削除部分に使用される べきではない。この場合は、要素<gi>corr</gi>または要素<gi>gap</gi>
@@ -10137,7 +10234,7 @@ Normalization</ref>
       teilweise lesbar ist und daher nicht mit Sicherheit entziffert werden kann, sollte das
       <gi>unclear</gi>-Element (verfügbar im zusätzlichen Tagset für die Transkription von
       primären Ressourcen) benutzt werden.</p>
-    <p>Das <gi>certainty</gi>-Element (siehe <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>) kann benutzt werden, um den Grad
+    <p>Das <gi>certainty</gi>-Element (siehe <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>) kann benutzt werden, um den Grad
       an Gewissheit anzugeben, was noch lesbar ist bzw. ob eine Löschung intendiert war oder nicht.</p>
     <p>Die TEI unterscheidet eindeutig zwischen <gi>del</gi> und <gi>surplus</gi> auf der einen
       und <gi>gap</gi> und <gi>unclear</gi> auf der anderen Seite. <gi>del</gi> beschreibt eine
@@ -10146,8 +10243,8 @@ Normalization</ref>
       beschreibt Text in der zu transkribierenden Ressource, der gelöscht werden sollte, aber in
       Wirklichkeit nicht gelöscht wurde. Die Elemente <gi>gap</gi> oder <gi>unclear</gi> hingegen
       beschreiben eine vom Editor oder Auszeichnenden getroffene Entscheidung, etwas auszulassen oder
-      deren Unvermögen, die Textvorlage zu entziffern. Vergleiche die Abschnitte <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">11.3.1.7. Text Omitted from or Supplied in the Transcription</ref>
-      und <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+      deren Unvermögen, die Textvorlage zu entziffern. Vergleiche die Abschnitte <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHOM">12.3.1.7. Text Omitted from or Supplied in the Transcription</ref>
+      und <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> zur Beziehung dieser Elemente untereinander und zu anderen,
       verwandten Elementen und wie diese in einer detaillierten Transkription verwendet werden.</p>
   </remarks>
@@ -10158,6 +10255,7 @@ Normalization</ref>
   <gloss xml:lang="en" versionDate="2009-01-06">unclear</gloss>
   <gloss xml:lang="es" versionDate="2022-02-20">poco claro</gloss>
   <gloss versionDate="2009-01-06" xml:lang="fr">incertain</gloss>
+  <gloss versionDate="2024-06-05" xml:lang="de">unklar</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a word, phrase, or passage which cannot be transcribed with certainty because it
         is illegible or inaudible in the source.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원본에서 읽거나 듣기 어려워서 분명하게 전사할 수 없는 단어, 구, 단락들을 포함한다.</desc>
@@ -10165,13 +10263,11 @@ Normalization</ref>
   <desc versionDate="2008-04-05" xml:lang="ja">元資料からは判読できないまたは聞こえないという理由で、確実に転記でき ない語句や一節を示す。</desc>
   <desc versionDate="2009-01-06" xml:lang="fr">contient un mot, une expression ou bien un passage qui
         ne peut être transcrit avec certitude parce qu'il est illisible ou inaudible dans la source.</desc>
-  <desc versionDate="2022-02-20" xml:lang="es">contiene una palabra, frase o pasaje que no puede ser transcrito con certeza porque en la fuente es ilegible o inaudible. </desc>
+  <desc versionDate="2022-02-20" xml:lang="es">contiene una palabra, frase o pasaje que no puede ser transcrito con certeza porque en la fuente es ilegible o inaudible.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una parola, una frase o un brano che non può
         essere trascritto con certezza perché è parzialmente illeggibile o incomprensibile
         nell'originale.</desc>
-  <desc versionDate="2016-11-24" xml:lang="de">
-      enthält ein Wort, einen Satz oder eine Textpassage, welche in der Quelle nicht oder nur schwer lesbar bzw. hörbar ist.
-  </desc>
+  <desc versionDate="2016-11-24" xml:lang="de">enthält ein Wort, einen Satz oder eine Textpassage, welche in der Quelle nicht oder nur schwer lesbar bzw. hörbar ist.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
@@ -10179,7 +10275,8 @@ Normalization</ref>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
-   </classes>
+    <memberOf key="att.cmc"/>
+  </classes>
   <content>
     <macroRef key="macro.paraContent"/>
   </content>
@@ -10271,7 +10368,7 @@ usually each word will refer to a single cause.</p>
           <desc versionDate="2007-06-27" xml:lang="en">damage results from rubbing of the leaf edges</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">책장 모서리의 마모로 인한 훼손</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">損毀起因於書頁邊緣摩擦受損</desc>
-          <desc versionDate="2022-02-20" xml:lang="es">Daños resultantes del frotamiento de los bordes de la hoja. </desc>
+          <desc versionDate="2022-02-20" xml:lang="es">Daños resultantes del frotamiento de los bordes de la hoja.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">葉の端がこすれたことによる損傷。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">des dommages résultent du frottement
                         des bords de la feuille</desc>
@@ -10325,51 +10422,51 @@ his att<unclear>ention</unclear>
   <remarks versionDate="2013-11-21" xml:lang="en">
     <p>The same element is used for all cases of uncertainty in the transcription of element
             content, whether for written or spoken material. For other aspects of certainty,
-            uncertainty, and reliability of tagging and transcription, see chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>.</p>
+            uncertainty, and reliability of tagging and transcription, see chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>.</p>
     <p>The <gi>damage</gi>, <gi>gap</gi>, <gi>del</gi>, <gi>unclear</gi> and <gi>supplied</gi>
-            elements may be closely allied in use. See section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+            elements may be closely allied in use. See section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> for
             discussion of which element is appropriate for which
     circumstance.</p>
 <p>The <att>hand</att> attribute points to a definition of the hand
-concerned, as further discussed in section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</ref>.</p>
+concerned, as further discussed in section <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</ref>.</p>
 
   </remarks>
-  <remarks versionDate="2022-02-20" xml:lang="es"><p>El mismo elemento se usa para todos los casos de incertidubre en la transcripción del contenido de un elemento, para material tanto escrito como hablado. Para otros aspectos relacionados con la certeza, incertidumbre y fiablilidad del etiquetado y transcripción, consultar el capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>.</p>
-    <p>Los elementos <gi>damage</gi>, <gi>gap</gi>, <gi>del</gi>, <gi>unclear</gi> y <gi>supplied</gi> pueden estar estrechamente relacionados en su uso. Consulta la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+  <remarks versionDate="2022-02-20" xml:lang="es"><p>El mismo elemento se usa para todos los casos de incertidubre en la transcripción del contenido de un elemento, para material tanto escrito como hablado. Para otros aspectos relacionados con la certeza, incertidumbre y fiablilidad del etiquetado y transcripción, consultar el capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>.</p>
+    <p>Los elementos <gi>damage</gi>, <gi>gap</gi>, <gi>del</gi>, <gi>unclear</gi> y <gi>supplied</gi> pueden estar estrechamente relacionados en su uso. Consulta la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> para ver una discusión sobre qué elemento es apropiado en qué circunstancias.</p>
-    <p>El atributo <att>hand</att> dirige a una descripción de la mano implicada; se discute de manera más detallada en la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</ref>.</p></remarks>
+    <p>El atributo <att>hand</att> dirige a una descripción de la mano implicada; se discute de manera más detallada en la sección <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</ref>.</p></remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Le même élément est utilisé pour tous les cas d'incertitude portant sur la transcription
             du contenu d'éléments, qu'il s'agisse de documents écrits ou oraux. Pour les autres
             aspects concernant la certitude, l'incertitude, et la fiabilité du balisage et de la
-            transcription, voir le chapitre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>.</p>
+            transcription, voir le chapitre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>.</p>
     <p>Les éléments <gi>damage</gi>, <gi>gap</gi>, <gi>del</gi>, <gi>unclear</gi> et
                 <gi>supplied</gi> peuvent être utilisés en étroite conjonction. Voir la section pour
             plus de détails sur l'élément le plus pertinent en fonction des circonstances.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
-    <p> 当該要素は、文字情報と発話情報の両方で、転記が不確実な時に使用され る。転記が不確実である他の面については、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>を参照 のこと。 </p>
-    <p> 要素<gi>damage</gi>、<gi>gap</gi>、<gi>del</gi>、<gi>unclear</gi>、<gi>supplied</gi>は、同時に使用されるかもしれない。どの場合にどの 要素が適切であるかについては、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+    <p> 当該要素は、文字情報と発話情報の両方で、転記が不確実な時に使用され る。転記が不確実である他の面については、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>を参照 のこと。 </p>
+    <p> 要素<gi>damage</gi>、<gi>gap</gi>、<gi>del</gi>、<gi>unclear</gi>、<gi>supplied</gi>は、同時に使用されるかもしれない。どの場合にどの 要素が適切であるかについては、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref>を参照のこと。
         </p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-24">
       <p>
           Das Element wird für alle unsicheren Transkriptionen verwendet, egal ob es sich um geschriebenes oder gesprochenes Material handelt. 
-          Für andere Aspekte der Sicherheit, Unsicherheit und Zuverlässigkeit von Auszeichnung und Transkription, siehe Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">21. Certainty, Precision, and Responsibility</ref>.  
+          Für andere Aspekte der Sicherheit, Unsicherheit und Zuverlässigkeit von Auszeichnung und Transkription, siehe Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CE.html#CE">22. Certainty, Precision, and Responsibility</ref>.  
       </p>
       <p>
           Die Elemente <gi>damage</gi>, <gi>gap</gi>, <gi>del</gi>, <gi>unclear</gi> und <gi>supplied</gi> werden oft im selben Kontext verwendet. 
-          Im Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">11.3.3.2. Use of the gap, del, damage, unclear, and
+          Im Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHCOMB">12.3.3.2. Use of the gap, del, damage, unclear, and
                   supplied Elements in Combination</ref> wird diskutiert, welches Element unter welchen Umständen geeignet ist.
       </p>
       <p>
-          Das <att>hand</att>-Attribut verweist auf eine Beschreibung der betreffenden Schreibhand (siehe hierzu Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">11.3.2.1. Document Hands</ref>).  
+          Das <att>hand</att>-Attribut verweist auf eine Beschreibung der betreffenden Schreibhand (siehe hierzu Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDH">12.3.2.1. Document Hands</ref>).  
       </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">11.3.3.1. Damage, Illegibility, and Supplied Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHDA">12.3.3.1. Damage, Illegibility, and Supplied Text</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COEDADD">3.5.3. Additions, Deletions, and Omissions</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="name">
@@ -10396,6 +10493,7 @@ concerned, as further discussed in section <ref target="https://www.tei-c.org/re
     <memberOf key="att.datable"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -10486,6 +10584,7 @@ concerned, as further discussed in section <ref target="https://www.tei-c.org/re
     <memberOf key="att.naming"/>
     <memberOf key="model.nameLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -10510,7 +10609,7 @@ concerned, as further discussed in section <ref target="https://www.tei-c.org/re
       </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">13.2.1. Personal Names</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPER">14.2.1. Personal Names</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONARS">3.6.1. Referring Strings</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="email">
@@ -10532,6 +10631,7 @@ concerned, as further discussed in section <ref target="https://www.tei-c.org/re
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addressLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -10585,6 +10685,7 @@ concerned, as further discussed in section <ref target="https://www.tei-c.org/re
     <memberOf key="att.global"/>
     <memberOf key="model.addressLike"/>
     <memberOf key="model.publicationStmtPart.detail"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -10878,6 +10979,7 @@ TOURS</addrLine>
   <gloss versionDate="2009-01-06" xml:lang="fr">code postal</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">Código postal</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">Codice di Avviamento Postale</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Postleitzahl</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a numerical or alphanumeric code used as part of a postal address to simplify
         sorting or delivery of mail.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">우편의 분류 및 배달을 용이하도록 우편 주소의 일부로 사용되는 숫자 또는 문자와 숫자가 혼용된
@@ -10890,6 +10992,8 @@ TOURS</addrLine>
         parte de la dirección postal para simplificar la clasificación o entrega de correo.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene il codice alfanumerico utilizzato
         nell'indirizzo postale per semplificare l'ordine e la distribuzione della posta.</desc>
+  <desc versionDate="2024-04-11" xml:lang="de">enthält einen numerischen oder alphanumerischen Schlüssel,
+        der als Teil einer Postadresse zur Vereinfachung der Sortierung oder Zustellung von Postsendungen verwendet wird.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addrPart"/>
@@ -10948,6 +11052,7 @@ TOURS</addrLine>
   <gloss versionDate="2009-01-06" xml:lang="fr">boîte postale</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">buzón</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">Casella postale</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Postfach</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a number or other identifier for some postal delivery point other than a street
     address.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">주소 이외의 우편 배달 지점을 위한 숫자 또는 다른 확인소를 포함한다.</desc>
@@ -10959,6 +11064,8 @@ TOURS</addrLine>
     de entrega postal distinto a una dirección postal.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene il numero o altro identificatore per un luogo di
     consegna della posta diverso da un indirizzo postale.</desc>
+  <desc versionDate="2024-04-11" xml:lang="de">enthält eine Nummer oder eine andere Kennung für eine Postanschrift,
+    bei der es sich nicht um eine Straßenadresse handelt.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addrPart"/>
@@ -11026,6 +11133,7 @@ TOURS</addrLine>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
     <memberOf key="att.ranging"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -11041,7 +11149,7 @@ TOURS</addrLine>
       <desc versionDate="2007-01-21" xml:lang="it">indica il tipo di valore numerico</desc>
       <desc versionDate="2016-11-25" xml:lang="de">bestimmt die Art des numerischen Wertes.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="cardinal">
           <desc versionDate="2007-06-27" xml:lang="en">absolute number, e.g. 21, 21.5</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">예를 들어, 21, 21.5와 같은 절대값</desc>
@@ -11149,22 +11257,22 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
   </exemplum>
   <remarks versionDate="2005-11-01" xml:lang="en">
     <p>Detailed analyses of quantities and units of measure in historical documents may also use
-            the feature structure mechanism described in chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">18. Feature Structures</ref>. The
+            the feature structure mechanism described in chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">19. Feature Structures</ref>. The
             <gi>num</gi> element is intended for use in simple applications.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Les analyses détaillées des quantités et unités de mesure dans les textes historiques
-      peuvent aussi utiliser le mécanisme de structure de traits décrit au chapitre<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">18. Feature Structures</ref>. 
+      peuvent aussi utiliser le mécanisme de structure de traits décrit au chapitre<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">19. Feature Structures</ref>. 
             L'élément <gi>num</gi> est conçu pour un usage dans des applications simples.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
-    <p> 歴史的文書の量や大きさの詳細な分析には、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">18. Feature Structures</ref>で解説 されている素性構造機能を使うことになるかもしれない。
+    <p> 歴史的文書の量や大きさの詳細な分析には、<ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">19. Feature Structures</ref>で解説 されている素性構造機能を使うことになるかもしれない。
             当該要素<gi>num</gi>は、簡単なソフトウェアで使われることが想定され ている。 </p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-25">
       <p>
           Detaillierte Analysen von Mengen und Maßeinheiten in historischen Dokumenten können auch den 'feature structure' 
-          Mechanismus verwenden, wie in Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">18. Feature Structures</ref> beschrieben. Das <gi>num</gi>-Element ist für 
+          Mechanismus verwenden, wie in Kapitel <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/FS.html#FS">19. Feature Structures</ref> beschrieben. Das <gi>num</gi>-Element ist für 
           einfache Anwendungen vorgesehen.
       </p>
   </remarks>
@@ -11195,6 +11303,7 @@ Measures</ref>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
     <memberOf key="att.measurement"/>
+    <memberOf key="att.cmc"/>
     <memberOf key="att.ranging"/>
   </classes>
   <content>
@@ -11309,6 +11418,7 @@ Measures</ref>
     <memberOf key="att.measurement"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -11372,19 +11482,18 @@ Measures</ref>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">10.3.4. Dimensions</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msdim">11.3.4. Dimensions</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="unit">
   <desc versionDate="2018-07-17" xml:lang="en">contains a symbol, a word or a phrase referring to a unit of measurement in any kind of formal or informal system.</desc>
   <desc versionDate="2018-07-17" xml:lang="de">enthält ein Symbol, ein Wort oder eine Phrase, die sich auf eine Maßeinheit in einem formellen oder informellen System bezieht.</desc>
-    <desc versionDate="2023-07-29" xml:lang="ja">
-        公式・非公式に関わらず、単位を表す記号や単語、語句を含む。
-       </desc>
+  <desc versionDate="2023-07-29" xml:lang="ja">公式・非公式に関わらず、単位を表す記号や単語、語句を含む。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
     <memberOf key="att.measurement"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
      <macroRef key="macro.phraseSeq"/>
@@ -11466,6 +11575,7 @@ Measures</ref>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>    
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -11532,8 +11642,8 @@ Measures</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">15.2.3. The Setting Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">13.4. Dates</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAHSE">16.2.3. The Setting Description</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDDATE">14.4. Dates</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="time">
   <gloss xml:lang="en" versionDate="2009-01-06">time</gloss>
@@ -11557,6 +11667,7 @@ Measures</ref>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -11605,6 +11716,7 @@ Measures</ref>
     <memberOf key="model.pPart.editorial"/>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -11626,7 +11738,7 @@ Measures</ref>
                 l'abbreviazione secondo una tipologia funzionale.</desc>
       <desc versionDate="2016-11-25" xml:lang="de">erlaubt es, die Abkürzung nach einer geeigneten Typologie zu klassifizieren.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="suspension">
           <gloss xml:lang="en" versionDate="2017-06-25">suspension</gloss>
           <gloss versionDate="2017-06-25" xml:lang="de">Suspension</gloss>
@@ -11875,6 +11987,7 @@ Measures</ref>
     <memberOf key="model.pPart.editorial"/>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -11964,6 +12077,7 @@ Measures</ref>
     <memberOf key="att.typed"/>
     <memberOf key="model.annotationPart.body"/>
     <memberOf key="model.ptrLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <constraintSpec scheme="schematron" ident="ptrAtts">
@@ -11982,7 +12096,7 @@ Measures</ref>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="ref">
   <gloss versionDate="2007-07-04" xml:lang="en">reference</gloss>
@@ -12009,6 +12123,7 @@ Measures</ref>
     <memberOf key="att.typed"/>
     <memberOf key="model.annotationPart.body"/>
     <memberOf key="model.ptrLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -12056,7 +12171,7 @@ Measures</ref>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COXR">3.7. Simple Links and Cross-References</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="list">
   <gloss xml:lang="en" versionDate="2007-06-12">list</gloss>
@@ -12077,6 +12192,7 @@ Measures</ref>
     <memberOf key="att.sortable"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.listLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   
   
@@ -12153,7 +12269,7 @@ Measures</ref>
       <desc versionDate="2014-07-29" xml:lang="en">describes the nature of the items in the list.</desc>
       <desc versionDate="2016-11-25" xml:lang="de">beschreibt die Art der Listenpunkte.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="gloss">
           <gloss xml:lang="en" versionDate="2017-06-25">gloss</gloss>
           <gloss versionDate="2017-06-25" xml:lang="de">Gloss</gloss>
@@ -12601,6 +12717,7 @@ Measures</ref>
     <memberOf key="att.placement"/>
     <memberOf key="att.written"/>
     <memberOf key="model.labelLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -12944,6 +13061,7 @@ entre les Romains.</label>
     <memberOf key="att.written"/>
     <memberOf key="model.headLike"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -13226,6 +13344,7 @@ entre les Romains.</label>
     <memberOf key="model.correspActionPart"/>
     <memberOf key="model.correspContextPart"/>
     <memberOf key="model.annotationPart.body"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -13342,7 +13461,7 @@ psychological significance.
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONONO">3.9.1. Notes and Simple Annotation</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD27">2.2.6. The Notes Statement</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICON">3.12.2.8. Notes and Statement of Language</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">9.3.5.4. Notes within Entries</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DI.html#DITPNO">10.3.5.4. Notes within Entries</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="noteGrp">
   <gloss versionDate="2022-06-09" xml:lang="en">note group</gloss>
@@ -13358,6 +13477,7 @@ psychological significance.
     <memberOf key="model.correspDescPart"/>
     <memberOf key="model.correspActionPart"/>
     <memberOf key="model.correspContextPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -13414,6 +13534,7 @@ psychological significance.
     <memberOf key="att.global"/>
     <memberOf key="model.global.meta"/>
     <memberOf key="att.spanning"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -13477,6 +13598,7 @@ psychological significance.
     <memberOf key="att.resourced"/>
     <memberOf key="att.declaring"/>
     <memberOf key="att.timed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -13555,9 +13677,10 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.resourced"/>
     <memberOf key="att.declaring"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
-       <classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>   
+    <classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>   
   </content>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
@@ -13655,8 +13778,7 @@ the resource specified by the <att>url</att> attribute.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COGR">3.10. Graphics and Other Non-textual Components</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">11.1. Digital Facsimiles</ref>
-    
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PHFAX">12.1. Digital Facsimiles</ref>    
   </listRef>
 </elementSpec><elementSpec module="core" xml:id="BINARYOBJECT" ident="binaryObject">
   <desc versionDate="2013-01-08" xml:lang="en">provides encoded binary data representing an inline graphic,
@@ -13677,6 +13799,7 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.media"/>
     <memberOf key="att.timed"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <textNode/>
@@ -13745,6 +13868,7 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   
@@ -13808,6 +13932,7 @@ Elements</ref>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
     <memberOf key="att.edition"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -13857,6 +13982,7 @@ Elements</ref>
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -13984,6 +14110,7 @@ Elements</ref>
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -14118,6 +14245,7 @@ Elements</ref>
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -14984,6 +15112,7 @@ places, in particular where  multiple names are given.</p>
     
     <memberOf key="att.canonical"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -15237,7 +15366,7 @@ doit pas être utilisé.</p>
                                         una tipologia conveniente.</desc>
       <desc versionDate="2017-06-04" xml:lang="de">klassifiziert den Titel entsprechend einer geeigneten Typologie.</desc> 
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="main">
           <desc versionDate="2007-06-27" xml:lang="en">main title</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">(주)제목</desc>
@@ -15492,6 +15621,7 @@ epistemology, methodology and history of
     <memberOf key="att.canonical"/>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.respLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.limitedContent"/>
@@ -15936,6 +16066,7 @@ epistemology, methodology and history of
     
     <memberOf key="att.sortable"/>
     <memberOf key="att.docStatus"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -16024,7 +16155,7 @@ epistemology, methodology and history of
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="biblStruct">
   <gloss versionDate="2005-04-15" xml:lang="en">structured bibliographic citation</gloss>
@@ -16053,6 +16184,7 @@ epistemology, methodology and history of
     <memberOf key="att.typed"/>
     <memberOf key="att.sortable"/>
     <memberOf key="att.docStatus"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -16158,7 +16290,7 @@ epistemology, methodology and history of
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="listBibl">
   <gloss versionDate="2005-01-14" xml:lang="en">citation list</gloss>
@@ -16185,6 +16317,7 @@ epistemology, methodology and history of
     
     
     <memberOf key="model.biblLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -16273,7 +16406,7 @@ epistemology, methodology and history of
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="relatedItem" module="core">
   <desc versionDate="2007-03-19" xml:lang="en">contains or references some other bibliographic item which is related to the present one in some specified manner, for example as a constituent or alternative version of it.</desc>
@@ -16380,6 +16513,7 @@ epistemology, methodology and history of
     
     
     <memberOf key="att.fragmentable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -16441,6 +16575,7 @@ epistemology, methodology and history of
     <memberOf key="att.divLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.declaring"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -16803,6 +16938,7 @@ epistemology, methodology and history of
     <memberOf key="att.placement"/>
     <memberOf key="att.written"/>
     <memberOf key="model.stageLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -17158,7 +17294,7 @@ by the stage direction.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</ref>
   </listRef>
 </elementSpec><elementSpec module="core" ident="divGen">
   <gloss versionDate="2005-01-14" xml:lang="en">automatically generated text division</gloss>
@@ -17199,7 +17335,7 @@ by the stage direction.</p>
       <desc versionDate="2007-05-04" xml:lang="es">especifica que tipo de divisón de texto generada aparece (p.ej. índice, tabla de contenidos, etc.)</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica quale tipo di partizione testuale generata (ad esempio indice, sommario, ecc.) apparirà</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="index">
           <desc versionDate="2007-06-27" xml:lang="en">an index is to be generated and inserted at this point.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">색인은 이 지점에서 생성되고 삽입된다.</desc>
@@ -17396,8 +17532,7 @@ by the stage direction.</p>
     en un manuscrito (no se ha de confundir con la descripción contenida en el elemento
       <gi>langUsage</gi>. ****</desc>
   <desc versionDate="2007-01-21" xml:lang="it">descrive le lingue e i sistemi di scrittura usati da un
-    manoscritto (da non confondere con la descrizione contenuta nell'elemento <gi>langUsage</gi>
-   </desc>
+    manoscritto (da non confondere con la descrizione contenuta nell'elemento <gi>langUsage</gi></desc>
   <classes>
     <memberOf key="att.global"/>
     
@@ -17477,7 +17612,7 @@ element in the TEI header.
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">10.6.6. Languages and Writing Systems</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#mslangs">11.6.6. Languages and Writing Systems</ref>
   </listRef>
 </elementSpec><classSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" type="atts" ident="att.citeStructurePart">
   <desc versionDate="2020-02-03" xml:lang="en">provides attributes for selecting particular elements
@@ -17580,7 +17715,7 @@ element in the TEI header.
     </attDef>
   </attList>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54M">2.3.6.3. Milestone Method</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54">2.3.6. The Reference System Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD54S">2.3.6.2. Search-and-Replace Method</ref>
@@ -17785,7 +17920,7 @@ element in the TEI header.
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD11">2.1.1. The TEI Header and Its Components</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="fileDesc">
   <gloss versionDate="2007-07-05" xml:lang="en">file description</gloss>
@@ -18486,7 +18621,7 @@ material</measure>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD23">2.2.3. Type and Extent of File</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">10.7.1. Object Description</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph1">11.7.1. Object Description</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="publicationStmt">
   <gloss versionDate="2005-01-14" xml:lang="en">publication statement</gloss>
@@ -18764,6 +18899,7 @@ distribution of a text.</desc>
     <memberOf key="model.nameLike"/>
     <memberOf key="model.publicationStmtPart.detail"/>
     
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
 
@@ -18825,12 +18961,11 @@ distribution of a text.</desc>
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="ISBN">
           <desc versionDate="2016-07-02" xml:lang="en">International Standard Book Number: a 13- or
             (if assigned prior to 2007) 10-digit identifying number assigned by the publishing
-            industry to a published book or similar item, registered with the <ref target="https://www.isbn-international.org"> International ISBN Agency.</ref>
-          </desc>
+            industry to a published book or similar item, registered with the <ref target="https://www.isbn-international.org"> International ISBN Agency.</ref></desc>
         </valItem>
         <valItem ident="ISSN">
           <desc versionDate="2016-07-02" xml:lang="en">International Standard Serial Number: an
@@ -18914,7 +19049,7 @@ distribution of a text.</desc>
       oder ein <val>URI</val> an. </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">13.3.1. Basic Principles</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#NDPERSbp">14.3.1. Basic Principles</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD26">2.2.5. The Series Statement</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</ref>
@@ -19366,17 +19501,17 @@ définissant les droits d'utilisation.</desc>
   <gloss versionDate="2007-11-06" xml:lang="it">descrizione della fonte</gloss>
     <gloss versionDate="2016-11-17" xml:lang="de">Beschreibung der Quellen</gloss>
   <desc versionDate="2008-12-09" xml:lang="en">describes the source(s) from which an electronic text was derived or generated, typically a
-    bibliographic description in the case of a digitized text, or a phrase such as "born digital"
+    bibliographic description in the case of a digitized text, or a phrase such as <q>born digital</q>
     for a text which has no previous existence.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">décrit la source à partir de laquelle un texte électronique a été
     dérivé ou produit, habituellement une description bibliographique pour un texte numérisé, ou une
-    expression comme "document numérique natif " pour un texte qui n'a aucune existence précédente.</desc>
+    expression comme <q>document numérique natif</q> pour un texte qui n'a aucune existence précédente.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전자 파일을 생성하거나 도출한 원전 텍스트에 대한 기술을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供所製電子文件的一個或數個來源文件的書目描述。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">電子テキストが作られた元テキストの情報を示す。</desc>
     <desc versionDate="2016-11-17" xml:lang="de">beschreibt die Quelle, von der sich der elektronische Text ableitet. 
         Üblicherweise eine bibliografische Beschreibung im Falle eines digitalisierten Textes oder eine Bezeichnung wie 
-        "born digital" für einen nur in elektronischer Form vorliegenden Text.  </desc>
+        <q>born digital</q> für einen nur in elektronischer Form vorliegenden Text.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona una descripción del texto (o textos) fuente
     del que un texto electrónico deriva o ha sido generado.</desc>
   <desc versionDate="2007-01-21" xml:lang="it"> fornisce una descrizione relativa alla o alle fonti da
@@ -19454,6 +19589,7 @@ définissant les droits d'utilisation.</desc>
     <memberOf key="att.declarable"/>
     <memberOf key="att.sortable"/>
     <memberOf key="att.docStatus"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate>
@@ -19549,7 +19685,7 @@ définissant les droits d'utilisation.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBITY">3.12.1. Methods of Encoding Bibliographic References and Lists of References</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="encodingDesc">
   <gloss versionDate="2007-07-04" xml:lang="en">encoding description</gloss>
@@ -19719,7 +19855,7 @@ formatting or layout information preserved.</p>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD51">2.3.1. The Project Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="samplingDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">sampling declaration</gloss>
@@ -19801,7 +19937,7 @@ formatting or layout information preserved.</p>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD52">2.3.2. The Sampling Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="editorialDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">editorial practice declaration</gloss>
@@ -19877,7 +20013,7 @@ during the encoding of a text.</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correction">
   <gloss versionDate="2005-01-14" xml:lang="en">correction principles</gloss>
@@ -20050,7 +20186,7 @@ during the encoding of a text.</desc>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="normalization">
   <gloss xml:lang="en" versionDate="2009-01-05">normalization</gloss>
@@ -20175,7 +20311,7 @@ during the encoding of a text.</desc>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="quotation">
   <gloss xml:lang="en" versionDate="2007-06-12">quotation</gloss>
@@ -20309,7 +20445,7 @@ during the encoding of a text.</desc>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="hyphenation">
   <gloss xml:lang="en" versionDate="2009-04-27">hyphenation</gloss>
@@ -20440,7 +20576,7 @@ during the encoding of a text.</desc>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="segmentation">
   <gloss xml:lang="en" versionDate="2007-06-12">segmentation</gloss>
@@ -20487,7 +20623,7 @@ during the encoding of a text.</desc>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="stdVals">
   <gloss versionDate="2007-07-04" xml:lang="en">standard values</gloss>
@@ -20542,7 +20678,7 @@ during the encoding of a text.</desc>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="interpretation">
   <gloss xml:lang="en" versionDate="2007-06-12">interpretation</gloss>
@@ -21177,7 +21313,7 @@ the target element</desc>
         syntax defined in <ptr target="#XSLT3"/> which identifies a set of nodes which are 
         citable structural components. The expression may be absolute (beginning with <code>/</code>) or relative. 
         <att>match</att> on a <gi>citeStructure</gi> without a <gi>citeStructure</gi> parent must be an absolute XPath. If it is
-        relative, its context is set by the <att>match</att> of the parent <gi>citeStructure</gi>. </desc>
+        relative, its context is set by the <att>match</att> of the parent <gi>citeStructure</gi>.</desc>
       <datatype>
         <dataRef key="teidata.xpath"/>
       </datatype>
@@ -21226,7 +21362,7 @@ the target element</desc>
   </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="citeData">
   <gloss versionDate="2020-02-03" xml:lang="en">citation data</gloss>
@@ -21256,7 +21392,7 @@ the target element</desc>
   </exemplum>  
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">17.2.5.4. Citation Structures</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="cRefPattern">
   <gloss versionDate="2007-07-09" xml:lang="en">canonical reference pattern</gloss>
@@ -21366,7 +21502,7 @@ the target element</desc>
     in the usual manner as prescribed by <ref target="https://www.w3.org/TR/xmlbase/">XML Base</ref>.</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="listPrefixDef">
   <gloss versionDate="2012-11-22" xml:lang="en">list of prefix definitions</gloss>
@@ -21410,7 +21546,7 @@ the target element</desc>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">16.2.3. Using Abbreviated Pointers</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPU">17.2.3. Using Abbreviated Pointers</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="refState">
   <gloss versionDate="2007-07-04" xml:lang="en">reference state</gloss>
@@ -22344,13 +22480,13 @@ codes used elsewhere in the text.</desc>
     </attDef>
 
   
-      <attDef ident="fromUnit" mode="add" usage="req">
+      <attDef ident="fromUnit" usage="req">
       <desc versionDate="2019-06-26" xml:lang="en">indicates a source unit of measure that is to be converted into another unit indicated in <att>toUnit</att>.</desc>
       <datatype>
         <dataRef key="teidata.pointer"/>
       </datatype>
     </attDef>
-    <attDef ident="toUnit" mode="add" usage="req">
+    <attDef ident="toUnit" usage="req">
       <desc versionDate="2019-06-26" xml:lang="en">the target unit of measurement for a conversion from a source unit referenced in <att>fromUnit</att>.</desc>
       <datatype>
         <dataRef key="teidata.pointer"/>
@@ -22718,13 +22854,13 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="abstract">
   <desc versionDate="2012-12-27" xml:lang="en">contains a summary or formal
     abstract prefixed to an existing source document by the encoder.</desc>
   <desc versionDate="2018-09-08" xml:lang="es">Contiene un resumen o abstract formal prefijado a una fuente documental por el codificador.</desc>
-  <desc versionDate="2021-10-21" xml:lang="it">contiene un riepilogo o <foreign>abstract</foreign> formale aggiunto, in testa a un dato documento di origine, da chi codifica.   </desc>
+  <desc versionDate="2021-10-21" xml:lang="it">contiene un riepilogo o <foreign>abstract</foreign> formale aggiunto, in testa a un dato documento di origine, da chi codifica.</desc>
   <desc versionDate="2021-10-20" xml:lang="de">enthält eine (formale) Zusammenfassung, die einem bestehenden Quelldokument vorangestellt wird.</desc>
   <desc versionDate="2018-12-18" xml:lang="ja">符号化する人によって既存の元文書の前に付加された要約または正式な要約を含む。</desc>
   <classes>
@@ -22969,7 +23105,7 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD41">2.4.2. Language Usage</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4">2.4. The Profile Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">16.3.2. Declarable Elements</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="language">
   <gloss xml:lang="en" versionDate="2009-01-05">language</gloss>
@@ -23106,8 +23242,7 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集以標準分類架構、索引典等來描述文件性質或主題的資訊。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">標準的な分類スキーム、分類語彙などにより、テキストの性格や話題を示す 情報をまとめる。</desc>
   <desc versionDate="2016-11-24" xml:lang="de">gruppiert Informationen über Art oder Thematik eines Textes unter 
-      Bezug auf ein Standard-Klassifikationsschema, einen Thesaurus o. ä.
-  </desc>
+      Bezug auf ein Standard-Klassifikationsschema, einen Thesaurus o. ä.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa información que describe la naturaleza o la
     temática de un texto en términos de un esquema de clasificación estándard.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa le informazioni che descrivono la natura o
@@ -23388,8 +23523,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">標明該分類架構，其中相關的類目群組已被定義</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">たとえば<gi>taxonomy</gi>要素あるいはその他の資料によって、当該分類項目が定義されている分類スキームを同定する。</desc>
         <desc versionDate="2016-11-24" xml:lang="de">gibt das Klassifikationsschema an, in dem die entsprechenden Kategorien definiert sind, 
-            z. B. über ein <gi>taxonomy</gi>-Element oder eine andere Ressource. 
-        </desc>
+            z. B. über ein <gi>taxonomy</gi>-Element oder eine andere Ressource.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica el esquema de clasificación al interno del
         cual se define una serie de categorias referidas.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">identifica lo schema di classificazione all'interno
@@ -23753,8 +23887,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
   description of the place, the name of a person/organization and the
   date related to the sending/receiving of a message or any other
   action related to the correspondence.</desc>
-	<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信・受信をはじめとする書簡に関する所作についての場所、人名／組織名、日付の構造的記述を含む。
-	</desc>
+	<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信・受信をはじめとする書簡に関する所作についての場所、人名／組織名、日付の構造的記述を含む。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -23770,38 +23903,32 @@ should be supplied for the <att>scheme</att> attribute.</p>
   <attList>
     <attDef ident="type" mode="change" usage="opt">
       <desc versionDate="2015-01-29" xml:lang="en">describes the nature of the action.</desc>
-	    <desc versionDate="2022-06-02" xml:lang="ja">（書簡に関する）所作の性質を記述する。
-	    </desc>
+	    <desc versionDate="2022-06-02" xml:lang="ja">（書簡に関する）所作の性質を記述する。</desc>
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="sent">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the sending or dispatch of a message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信や発送に関する情報。
-	    </desc>
+		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信や発送に関する情報。</desc>
         </valItem>
         <valItem ident="received">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the receipt of a message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの受信に関する情報。
-	    </desc>
+		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの受信に関する情報。</desc>
         </valItem>
         <valItem ident="transmitted">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</desc>
-          <desc versionDate="2024-03-07" xml:lang="ja">メッセージの伝達手段に関する情報。発信とその後の受信・転送等の間の情報。
-	    </desc>
+          <desc versionDate="2024-03-07" xml:lang="ja">メッセージの伝達手段に関する情報。発信とその後の受信・転送等の間の情報。</desc>
 	      </valItem>
         <valItem ident="redirected">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  redirection of an unread message.</desc>
-          <desc versionDate="2024-03-07" xml:lang="ja">〔開封せずに〕未読のままに転送されるメッセージに関する情報。
-	    </desc>
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封せずに〕未読のままに転送されるメッセージに関する情報。</desc>
         </valItem>
         <valItem ident="forwarded">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  forwarding of a message.</desc>
-          <desc versionDate="2024-03-07" xml:lang="ja">〔開封後の〕メッセージの転送に関する情報。
-	    </desc>
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封後の〕メッセージの転送に関する情報。</desc>
         </valItem>
       </valList>
     </attDef>
@@ -23873,6 +24000,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
     <memberOf key="att.declarable"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.teiHeaderPart"/>
+    <memberOf key="model.standOffPart"/>
   </classes>
   <content>
     <alternate>
@@ -24270,7 +24398,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
       <gloss versionDate="2016-11-25" xml:lang="de">Ziel</gloss>
       <gloss versionDate="2023-10-02" xml:lang="ja">対象</gloss>
       <desc versionDate="2011-10-31" xml:lang="en">points to one or more elements that belong to this change.</desc>
-      <desc versionDate="2016-11-25" xml:lang="de">verweist auf ein oder mehrere Elemente, die zu dieser Änderung gehören.  </desc>
+      <desc versionDate="2016-11-25" xml:lang="de">verweist auf ein oder mehrere Elemente, die zu dieser Änderung gehören.</desc>
       <desc versionDate="2023-10-02" xml:lang="ja">この変更の対象となる一つ以上の要素を指す。</desc>
       <datatype minOccurs="1" maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
     </attDef>
@@ -24367,7 +24495,7 @@ supplied to printer.</change>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4C">2.4.1. Creation</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="scriptNote">
   <desc versionDate="2010-09-24" xml:lang="en">describes a particular script distinguished within
@@ -24385,7 +24513,7 @@ supplied to printer.</change>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">10.7.2. Writing, Decoration, and Other Notations</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/MS.html#msph2">11.7.2. Writing, Decoration, and Other Notations</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" ident="listChange" module="header">
   <desc versionDate="2013-04-14" xml:lang="en">groups a number of change descriptions associated 
@@ -24448,7 +24576,7 @@ during the evolution of the encoded representation of that text.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD6">2.6. The Revision Description</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">11.7. Identifying Changes and Revisions</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/PH.html#PH-changes">12.7. Identifying Changes and Revisions</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="textstructure" ident="TEI">
   <gloss versionDate="2005-12-24" xml:lang="en">TEI document</gloss>
@@ -24471,10 +24599,8 @@ during the evolution of the encoded representation of that text.</p>
   <desc versionDate="2017-06-13" xml:lang="de">enthält ein einzelnes TEI-konformes Dokument, das aus einem einzigen TEI-Header und einem oder
     mehreren Mitgliedern der <ident type="class">model.resource</ident>-Klasse besteht. Mehrere
     <gi>TEI</gi>-Elemente können in einem <gi>teiCorpus</gi>-Element zusammengefasst werden.</desc>
-  <desc versionDate="2022-06-02" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando un solo encabezado TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar al interno de un elemento <gi>TEI</gi> o <gi>teiCorpus</gi>.
-</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene un documento TEI-conforme, comprendente un'intestazione e un testo, sia esso isolato o parte di un elemento <gi>teiCorpus</gi>
-   </desc>
+  <desc versionDate="2022-06-02" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando un solo encabezado TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar al interno de un elemento <gi>TEI</gi> o <gi>teiCorpus</gi>.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene un documento TEI-conforme, comprendente un'intestazione e un testo, sia esso isolato o parte di un elemento <gi>teiCorpus</gi></desc>
   <classes>
     <memberOf key="model.describedResource"/>
     <memberOf key="att.global"/>
@@ -24666,7 +24792,7 @@ during the evolution of the encoded representation of that text.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</ref>
   </listRef>
 </elementSpec><elementSpec module="textstructure" ident="text">
   <gloss xml:lang="en" versionDate="2007-06-12">text</gloss>
@@ -24862,7 +24988,7 @@ during the evolution of the encoded representation of that text.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</ref>
   </listRef>
 </elementSpec><elementSpec module="textstructure" ident="body">
   <gloss versionDate="2005-01-14" xml:lang="en">text body</gloss>
@@ -25102,7 +25228,7 @@ during the evolution of the encoded representation of that text.</p>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DSGRP">4.3.1. Grouped Texts</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">15.1. Varieties of Composite Text</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCDEF">16.1. Varieties of Composite Text</ref>
   </listRef>
 </elementSpec><elementSpec module="textstructure" ident="floatingText">
   <gloss xml:lang="en" versionDate="2020-12-20">floating text</gloss>
@@ -25126,6 +25252,7 @@ during the evolution of the encoded representation of that text.</p>
     <memberOf key="model.attributable"/>
     <memberOf key="att.declaring"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -26363,6 +26490,7 @@ during the evolution of the encoded representation of that text.</p>
     <memberOf key="att.placement"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -26437,6 +26565,7 @@ on its title page or at the head or end of the work.</desc>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -26581,6 +26710,7 @@ it may optionally be tagged using the <gi>docAuthor</gi> element.</p>
     <memberOf key="att.global"/>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -26680,6 +26810,7 @@ it may optionally be tagged using the <gi>docAuthor</gi> element.</p>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -26736,7 +26867,7 @@ Tubes formed by Lightning — House struck</p>
   the start or end of a section or on a title page.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">절 또는 장의 시작, 또는 제목 페이지에 나타나는 인용, 작자미상, 또는 추정을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一段匿名或署名引文，出現在段落或章節的開頭，或在題名頁中。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">章や節の始め、タイトルページなどにある引用(題辞)を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">章や節の始め、タイトルページなどにある引用(題辞)を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient une citation, anonyme ou attribuée et qui apparaît au
     début d’une section ou d’un chapitre ou sur une page de titre.</desc>
   <desc versionDate="2017-06-13" xml:lang="de">enthält ein anonymes oder jemandem zugeschriebenes Zitat, das am Beginn eines Abschnitts,
@@ -26750,6 +26881,7 @@ Tubes formed by Lightning — House struck</p>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -26815,6 +26947,7 @@ Tubes formed by Lightning — House struck</p>
     <memberOf key="att.global"/>
     <memberOf key="model.divTopPart"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -26914,6 +27047,7 @@ aparecen en la última sección al final de una división, especialmente en una
     <memberOf key="att.global"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -27040,6 +27174,7 @@ aparecen en la última sección al final de una división, especialmente en una
     <memberOf key="att.global"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divWrapper"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -27086,6 +27221,7 @@ dedicatory epistle, or other division of a text.</desc>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
     <memberOf key="model.divTopPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -27133,6 +27269,7 @@ lettre.</desc>
     <memberOf key="att.global"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -27471,7 +27608,7 @@ indicated on a title page.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica il ruolo di tale sezione o partizione all'interno del titolo</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>main</defaultVal>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="main">
           <gloss xml:lang="en" versionDate="2017-06-19">main</gloss>
           <gloss versionDate="2017-06-19" xml:lang="de">Haupttitel</gloss>
@@ -27611,6 +27748,7 @@ title page (often but not always contained in a byline).</desc>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.pLike.front"/>
     <memberOf key="att.canonical"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -27923,6 +28061,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
     <memberOf key="att.datable"/>
     <memberOf key="att.calendarSystem"/>
   </classes>
@@ -28632,7 +28771,7 @@ reserved for the element likely to be used more often.</p>
     </attDef>
   </attList>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">16. Linking, Segmentation, and Alignment</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SA">17. Linking, Segmentation, and Alignment</ref>
   </listRef>
 </classSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="link">
   <gloss xml:lang="en" versionDate="2007-06-12">link</gloss>
@@ -28649,6 +28788,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.pointing"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <constraintSpec ident="linkTargets3" scheme="schematron">
@@ -28684,7 +28824,7 @@ reserved for the element likely to be used more often.</p>
     <p> 当該要素が、要素<gi>linkGrp</gi>でまとめられているのでなければ、当 該要素のある場所は重要ではない。要素<gi>linkGrp</gi>の下にある場合、 属性<att>type</att>の値は要素<gi>linkGrp</gi>がもつ値を継承する。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="linkGrp">
   <gloss versionDate="2007-07-04" xml:lang="en">link group</gloss>
@@ -28704,6 +28844,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing.group"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -28796,7 +28937,7 @@ reserved for the element likely to be used more often.</p>
     <p> webグループまたはリンクグループは、管理上便利なものである。これに より、属性<att>type</att>のデフォルト値を与えるためだけではなく、各 種の目的でリンクをまとめることができる。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">16.1. Links</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAPT">17.1. Links</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="ab">
   <gloss versionDate="2005-01-14" xml:lang="en">anonymous block</gloss>
@@ -28810,7 +28951,7 @@ reserved for the element likely to be used more often.</p>
   <desc versionDate="2007-12-20" xml:lang="ko">의미적 부담 없이, 문단과 유사한 구 또는 상호층위 요소에 대한 익명 전달체로 기능하는 임의적 성분-층위 단위를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含文件中任何隨機組合性層次的單元，匿名收容類似一個段落、但不包含段落語義的字詞或中間層元素。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">任意の部分的テキスト単位を示す。特定の意味はなくとも、段落に相当する、 句レベル・挿入レベルの単位として無名単位になる。</desc>
-  <desc versionDate="2009-10-05" xml:lang="fr">contient une unité de texte quelconque, de niveau "composant", faisant office de contenant anonyme pour une expression ou des éléments de niveau intermédiaire, analogue à un paragraphe mais sans sa portée sémantique.</desc>
+  <desc versionDate="2009-10-05" xml:lang="fr">contient une unité de texte quelconque, de niveau <q>composant</q>, faisant office de contenant anonyme pour une expression ou des éléments de niveau intermédiaire, analogue à un paragraphe mais sans sa portée sémantique.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o de elementos de internivel similares al párrafo pero sin la carga semántica de este último.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una qualsiasi unità testuale a livello di componente che funge da contenitore anonimo di sintagmi o elementi interlivello simili al paragrafo ma senza il bagaglio semantico di quest'ultimo</desc>
   <classes>
@@ -28820,6 +28961,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.declaring"/>
     <memberOf key="att.fragmentable"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.abContent"/>
@@ -28858,7 +29000,7 @@ reserved for the element likely to be used more often.</p>
     <p> 要素<gi>ab</gi>は、符号化する人が望むあらゆる単位レベルで、適切な 要素が規定されていない場合に、自由に使用することが出来る。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="anchor">
   <gloss versionDate="2005-01-14" xml:lang="en">anchor point</gloss>
@@ -28881,6 +29023,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.global"/>
     <memberOf key="model.milestoneLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -28922,7 +29065,7 @@ reserved for the element likely to be used more often.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/TS.html#TSSAPA">8.4.2. Synchronization and Overlap</ref>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">16.5. Correspondence and Alignment</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACS">17.5. Correspondence and Alignment</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="seg">
   <gloss versionDate="2005-01-14" xml:lang="en">arbitrary segment</gloss>
@@ -28950,6 +29093,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.typed"/>
     <memberOf key="att.written"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -29032,7 +29176,7 @@ reserved for the element likely to be used more often.</p>
       ein ähnliches Element zur Verfügung zu stellen.</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">16.3. Blocks, Segments, and Anchors</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASE">17.3. Blocks, Segments, and Anchors</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/VE.html#VESE">6.2. Components of the Verse Line</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DR.html#DRPAL">7.2.5. Speech Contents</ref>
   </listRef>
@@ -29075,8 +29219,7 @@ reserved for the element likely to be used more often.</p>
       <desc versionDate="2008-04-05" xml:lang="ja">親要素<gi>timeLine</gi>から継承されない場合、属性 <att>interval</att>で示される時間の単位を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">spécifie l'unité de temps dans laquelle la valeur de l'attribut <att>interval</att> est exprimée, si elle n'est pas héritée de l'élément parent <gi>timeLine</gi>.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">especifica la unidad temporal en la que se expresa el valor <att>interval</att>, si este valor no es heredado del padre <gi>timeline</gi>.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">specifica l'unità temporale nel quale è espresso l'attributo <att>interval</att>, se questo non è ereditato dal genitore <gi>timeline</gi>
-         </desc>
+      <desc versionDate="2007-01-21" xml:lang="it">specifica l'unità temporale nel quale è espresso l'attributo <att>interval</att>, se questo non è ereditato dal genitore <gi>timeline</gi></desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <valList type="semi">
         <valItem ident="d">
@@ -29169,7 +29312,7 @@ reserved for the element likely to be used more often.</p>
     <p> 当該要素には、時点の識別子となるグローバル属性<att>xml:id</att>は 必ず付与される。この値は、当該文書中でユニークであり、統語上妥当で ある名前であれば、自由に選んでよい。一連の数字を含むといった制約は ない。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="timeline">
   <gloss xml:lang="en" versionDate="2007-01-21">timeline</gloss>
@@ -29188,6 +29331,7 @@ reserved for the element likely to be used more often.</p>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -29304,7 +29448,7 @@ reserved for the element likely to be used more often.</p>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">16.4.2. Placing Synchronous Events in Time</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASYMP">17.4.2. Placing Synchronous Events in Time</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="join">
   <gloss xml:lang="en" versionDate="2009-10-06">join</gloss>
@@ -29321,6 +29465,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.pointing"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>    
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -29502,7 +29647,7 @@ reserved for the element likely to be used more often.</p>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="joinGrp">
   <gloss versionDate="2005-01-14" xml:lang="en">join group</gloss>
@@ -29522,6 +29667,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing.group"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -29574,7 +29720,7 @@ reserved for the element likely to be used more often.</p>
     <p rend="dataDesc"> 任意数の要素<gi>join</gi>または要素<gi>ptr</gi>。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">16.7. Aggregation</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAG">17.7. Aggregation</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="alt">
   <gloss versionDate="2005-01-14" xml:lang="en">alternation</gloss>
@@ -29599,6 +29745,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.pointing"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <attList>
@@ -29716,7 +29863,7 @@ reserved for the element likely to be used more often.</p>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="linking" ident="altGrp">
   <gloss versionDate="2005-01-14" xml:lang="en">alternation group</gloss>
@@ -29740,6 +29887,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing.group"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -29864,11 +30012,11 @@ reserved for the element likely to be used more often.</p>
     <p rend="dataDesc"> 任意数の選択肢、ポインタ、拡張ポインタを示す。 </p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">16.8. Alternation</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SAAT">17.8. Alternation</ref>
   </listRef>
 </elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="standOff" mode="add" module="linking">
   <desc xml:lang="en" versionDate="2018-10-31">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</desc>
-  <desc xml:lang="ja" versionDate="2023-07-29">リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。 </desc>
+  <desc xml:lang="ja" versionDate="2023-07-29">リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。</desc>
   <classes>
     <memberOf key="model.resource"/>
     <memberOf key="att.global"/>
@@ -29878,7 +30026,7 @@ reserved for the element likely to be used more often.</p>
   <content>
     <classRef key="model.standOffPart" minOccurs="1" maxOccurs="unbounded"/>
   </content>
-  <constraintSpec ident="nested_standOff_should_be_typed" scheme="schematron" mode="add">
+  <constraintSpec ident="nested_standOff_should_be_typed" scheme="schematron">
     <constraint>
       <sch:rule context="tei:standOff">
         <sch:assert test="@type or not(ancestor::tei:standOff)">This
@@ -29991,9 +30139,9 @@ reserved for the element likely to be used more often.</p>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="listAnnotation" mode="add" module="linking">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="listAnnotation" module="linking">
   <desc versionDate="2020-03-08" xml:lang="en">contains a list of annotations, typically encoded as
       <gi>annotation</gi>, <gi>annotationBlock</gi>, or <gi>note</gi>, possibly organized with
     nested <gi>listAnnotation</gi> elements.</desc>
@@ -30123,9 +30271,9 @@ reserved for the element likely to be used more often.</p>
       map cleanly onto the <ref target="#WADM">Web Annotation Data Model</ref>.</p>
   </remarks>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="annotation" mode="add" module="linking">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" ident="annotation" module="linking">
   <desc versionDate="2020-07-31" xml:lang="en">represents an annotation following the <ref target="#WADM">Web
       Annotation Data Model</ref>.</desc>
   <classes>
@@ -30246,7 +30394,7 @@ reserved for the element likely to be used more often.</p>
     </egXML>
   </exemplum>
   <listRef>
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">16.10. The standOff Container</ref>
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SASOstdf">17.10. The standOff Container</ref>
   </listRef>
 </elementSpec><elementSpec module="drama" ident="set">
   <gloss versionDate="2007-07-04" xml:lang="en">setting</gloss>
@@ -30413,6 +30561,7 @@ reserved for the element likely to be used more often.</p>
 </elementSpec><elementSpec module="drama" ident="prologue">
   <gloss xml:lang="en" versionDate="2007-06-12">prologue</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">prologue</gloss>
+  <gloss versionDate="2023-08-08" xml:lang="de">Prolog</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the prologue to a drama, typically spoken by an actor out of character, possibly in
     association with a particular performance or venue.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전형적으로 등장인물들 중 하나가 말하는, 때로는 특정 공연 또는 행위의 현장과 관련된, 드라마의
@@ -30768,6 +30917,7 @@ reserved for the element likely to be used more often.</p>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">角色清單</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">reparto</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">distribution </gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Besetzungsliste</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">elenco dei personaggi</gloss>
   <gloss versionDate="2023-10-02" xml:lang="ja">配役リスト</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a single cast list or dramatis personae.</desc>
@@ -31309,13 +31459,13 @@ either a single role or a list of non-speaking roles.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica la voce della lista dei personaggi</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>role</defaultVal>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="role">
           <desc versionDate="2007-06-27" xml:lang="en">the item describes a single role.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">항목이 하나의 배역을 기술한다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該項目為單一角色</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el elemeto describe un único papel.</desc>
-          <desc versionDate="2023-10-02" xml:lang="ja">ひとつの役を示す。	</desc>
+          <desc versionDate="2023-10-02" xml:lang="ja">ひとつの役を示す。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">l'item décrit un simple rôle.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">l'oggetto descrive un solo ruolo.</desc>
         </valItem>
@@ -31538,21 +31688,21 @@ either a single role or a list of non-speaking roles.</desc>
   </exemplum>
   <remarks versionDate="2006-06-11" xml:lang="en">
     <p>This element should be used only to mark the name of the actor as
-    given in the source. Chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">13. Names, Dates, People, and Places</ref> discusses ways of
+    given in the source. Chapter <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">14. Names, Dates, People, and Places</ref> discusses ways of
     marking the components of names, and also of associating names with
     biographical information about a person. </p>
   </remarks>
-  <remarks versionDate="2018-09-08" xml:lang="es"><p>Este elemento debe ser usado solo para marcar el nombre del actor tal como aparece en la fuente. El capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">13. Names, Dates, People, and Places</ref> comenta/discute formas de marcar los componentes de los nombres,  asi como también asociar nombre con información biográfica sobre una persona</p></remarks>
+  <remarks versionDate="2018-09-08" xml:lang="es"><p>Este elemento debe ser usado solo para marcar el nombre del actor tal como aparece en la fuente. El capítulo <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">14. Names, Dates, People, and Places</ref> comenta/discute formas de marcar los componentes de los nombres,  asi como también asociar nombre con información biográfica sobre una persona</p></remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Cet élément ne devrait être utilisé que pour encoder le nom de l'acteur tel qu'il est donné
-                dans la source. Le chapitre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">13. Names, Dates, People, and Places</ref>
+                dans la source. Le chapitre <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">14. Names, Dates, People, and Places</ref>
                 traite des différentes manières d'encoder les composants des noms, et aussi celui d'associer des
                 noms à des informations biographiques concernant une personne.</p>
   </remarks>
   <remarks xml:lang="ja" versionDate="2008-04-05">
     <p>
     当該要素は、元資料にある役者名を示すために使用されるべきである。
-    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">13. Names, Dates, People, and Places</ref>では、名前の構成要素や、当該人物に関する情報に
+    <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ND.html#ND">14. Names, Dates, People, and Places</ref>では、名前の構成要素や、当該人物に関する情報に
     関連する名前をタグ付けする方法が解説されている。
  </p>
   </remarks>
@@ -31671,7 +31821,7 @@ young man would present to his lady love. It makes me blush!
       <desc versionDate="2007-01-21" xml:lang="it">indica il tipo di movimento, ad esempio come entrata
         o uscita.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="entrance">
           <desc versionDate="2007-06-27" xml:lang="en">character is entering the stage.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">등장인물이 무대에 등장하고 있다.</desc>
@@ -32140,6 +32290,7 @@ Out the window the body of a dead man suddenly slams into frame
 </elementSpec><elementSpec module="drama" ident="caption">
   <gloss versionDate="2007-06-12" xml:lang="en">caption</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">sous-titre</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Beschriftung</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the text of a caption or other text displayed as part of
 a film script or screenplay.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">영화 스크립트 또는 시나리오의 일부로서 제시되는 자막 또는 다른 텍스트를 포함한다.</desc>
@@ -32246,7 +32397,7 @@ meant for the actors.</desc>
           scène.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica l'indicazione di scena tecnica.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="light">
           <desc versionDate="2007-06-27" xml:lang="en">a lighting cue</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">조명 신호</desc>
@@ -32323,7 +32474,7 @@ technical direction applies.</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DR.html#DRTEC">7.3.1. Technical Information</ref>
   </listRef>
-</elementSpec><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="ST" xml:id="DSTTEI2" ident="tei" type="core"/><moduleSpec n="CO" xml:id="DCO" ident="core"/><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="HD" xml:id="DHD" ident="header"/><moduleSpec n="DS" xml:id="DDS" ident="textstructure"/><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="SA" xml:id="DSA" ident="linking"/><moduleSpec n="DR" xml:id="DDR" ident="drama"/></schemaSpec>
+</elementSpec><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="ST" xml:id="DSTTEI2" ident="tei" type="core"/><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="CMC" ident="cmc"/><moduleSpec n="CO" xml:id="DCO" ident="core"/><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="HD" xml:id="DHD" ident="header"/><moduleSpec n="DS" xml:id="DDS" ident="textstructure"/><moduleSpec xmlns:xi="http://www.w3.org/2001/XInclude" n="SA" xml:id="DSA" ident="linking"/><moduleSpec n="DR" xml:id="DDR" ident="drama"/></schemaSpec>
 </body>
 </text>
 </TEI>
\ No newline at end of file
diff --git a/Test2/expected-results/testAttValQuant.rng b/Test2/expected-results/testAttValQuant.rng
index 5743e7c62..eb1d7cc20 100644
--- a/Test2/expected-results/testAttValQuant.rng
+++ b/Test2/expected-results/testAttValQuant.rng
@@ -347,6 +347,42 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
          </attribute>
       </optional>
    </define>
+   <define name="att.cmc.attributes">
+      <ref name="att.cmc.attribute.generatedBy"/>
+   </define>
+   <define name="att.cmc.attribute.generatedBy">
+      <optional>
+         <attribute name="generatedBy">
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generated by) categorizes how the content of an element was generated in a CMC environment.
+Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified</a:documentation>
+            <choice>
+               <value>human</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was naturally typed or spoken by a human user</a:documentation>
+               <value>template</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated after a human user activated a template for its insertion</a:documentation>
+               <value>system</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by the system, i.e. the CMC environment</a:documentation>
+               <value>bot</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself</a:documentation>
+               <value>unspecified</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by an unknown or unspecified process</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
+            </choice>
+         </attribute>
+      </optional>
+   </define>
+   <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+            id="tavq-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1">
+      <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                context="tei:*[@generatedBy]">
+         <sch:assert test="ancestor-or-self::tei:post">The @generatedBy attribute is for use within a &lt;post&gt; element.</sch:assert>
+      </sch:rule>
+   </pattern>
    <define name="att.cReferencing.attributes">
       <ref name="att.cReferencing.attribute.cRef"/>
    </define>
@@ -452,7 +488,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.datable.w3c-att-datable-w3c-when-constraint-rule-1">
+            id="tavq-att.datable.w3c-att-datable-w3c-when-constraint-rule-2">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -462,7 +498,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.datable.w3c-att-datable-w3c-from-constraint-rule-2">
+            id="tavq-att.datable.w3c-att-datable-w3c-from-constraint-rule-3">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -472,7 +508,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.datable.w3c-att-datable-w3c-to-constraint-rule-3">
+            id="tavq-att.datable.w3c-att-datable-w3c-to-constraint-rule-4">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -814,7 +850,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.global.source-source-only_1_ODD_source-constraint-rule-4">
+            id="tavq-att.global.source-source-only_1_ODD_source-constraint-rule-5">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1138,7 +1174,7 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.measurement-att-measurement-unitRef-constraint-rule-5">
+            id="tavq-att.measurement-att-measurement-unitRef-constraint-rule-6">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1262,7 +1298,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.typed-subtypeTyped-constraint-rule-6">
+            id="tavq-att.typed-subtypeTyped-constraint-rule-7">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1294,7 +1330,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.pointing-targetLang-targetLang-constraint-rule-7">
+            id="tavq-att.pointing-targetLang-targetLang-constraint-rule-8">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1391,7 +1427,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8">
+            id="tavq-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1435,7 +1471,7 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9">
+            id="tavq-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3161,6 +3197,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <choice>
          <ref name="model.respLike"/>
          <ref name="model.imprintPart"/>
+         <ref name="quote"/>
          <ref name="series"/>
          <ref name="citedRange"/>
          <ref name="bibl"/>
@@ -3263,10 +3300,14 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          <ref name="model.attributable"/>
       </choice>
    </define>
+   <define name="model.cmc">
+      <notAllowed/>
+   </define>
    <define name="model.common">
       <choice>
          <ref name="model.divPart"/>
          <ref name="model.inter"/>
+         <ref name="model.cmc"/>
          <ref name="q"/>
       </choice>
    </define>
@@ -3486,7 +3527,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="tavq-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
+            id="tavq-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3545,7 +3586,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11">
+                  id="tavq-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:p">
@@ -3556,7 +3597,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12">
+                  id="tavq-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:p">
@@ -3569,6 +3610,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="att.declaring.attributes"/>
          <ref name="att.fragmentable.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3577,6 +3619,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3585,6 +3628,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]</a:documentation>
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3594,6 +3638,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3603,6 +3648,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the sublanguage or register to which the word or phrase is being assigned</a:documentation>
@@ -3638,6 +3684,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="macro.specialPara"/>
          <ref name="att.global.attributes"/>
          <ref name="att.ascribed.directed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="aloud">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.</a:documentation>
@@ -3678,6 +3725,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attributes"/>
          <ref name="att.notated.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3687,6 +3735,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="macro.specialPara"/>
          <ref name="att.global.attributes"/>
          <ref name="att.ascribed.directed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
@@ -3721,7 +3770,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
    </define>
    <define name="cit">
       <element name="cit">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]</a:documentation>
          <oneOrMore>
             <choice>
                <ref name="model.biblLike"/>
@@ -3736,6 +3785,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          </oneOrMore>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3744,6 +3794,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">marks words or phrases mentioned, not used. [3.3.3. Quotation]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3752,16 +3803,17 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="desc">
       <element name="desc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]</a:documentation>
          <ref name="macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-desc-deprecationInfo-only-in-deprecated-constraint-rule-13">
+                  id="tavq-desc-deprecationInfo-only-in-deprecated-constraint-rule-14">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:desc[ @type eq 'deprecationInfo']">
@@ -3774,18 +3826,13 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.
-Suggested values include: 1] deprecationInfo (deprecation information)</a:documentation>
-               <choice>
-                  <value>deprecationInfo</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation
-          information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -3793,13 +3840,14 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
    </define>
    <define name="gloss">
       <element name="gloss">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
          <ref name="att.typed.attributes"/>
          <ref name="att.pointing.attributes"/>
          <ref name="att.cReferencing.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3814,6 +3862,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <ref name="att.canonical.attributes"/>
          <ref name="att.sortable.attributes"/>
          <ref name="att.cReferencing.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3828,6 +3877,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </group>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3858,7 +3908,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-rt-target-rt-target-not-span-constraint-rule-14">
+                  id="tavq-rt-target-rt-target-not-span-constraint-rule-15">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:rt/@target">
@@ -3875,7 +3925,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-rt-from-rt-from-constraint-rule-15">
+                  id="tavq-rt-from-rt-from-constraint-rule-16">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:rt/@from">
@@ -3892,7 +3942,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-rt-to-rt-to-constraint-rule-16">
+                  id="tavq-rt-to-rt-to-constraint-rule-17">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:rt/@to">
@@ -3907,6 +3957,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]</a:documentation>
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3917,6 +3968,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <ref name="att.global.attributes"/>
          <ref name="att.editLike.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3938,26 +3990,29 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </choice>
          </zeroOrMore>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="reg">
       <element name="reg">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus]</a:documentation>
+Normalization 13. Critical Apparatus]</a:documentation>
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
          <ref name="att.editLike.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="orig">
       <element name="orig">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus]</a:documentation>
+Normalization 13. Critical Apparatus]</a:documentation>
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -3974,6 +4029,7 @@ Normalization 12. Critical Apparatus]</a:documentation>
          <ref name="att.timed.attributes"/>
          <ref name="att.editLike.attributes"/>
          <ref name="att.dimensions.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="reason">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reason) gives the reason for omission
@@ -4038,6 +4094,7 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
          <ref name="att.placement.attributes"/>
          <ref name="att.typed.attributes"/>
          <ref name="att.dimensions.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4049,16 +4106,18 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
          <ref name="att.transcriptional.attributes"/>
          <ref name="att.typed.attributes"/>
          <ref name="att.dimensions.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="unclear">
       <element name="unclear">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]</a:documentation>
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
          <ref name="att.editLike.attributes"/>
          <ref name="att.dimensions.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="reason">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates why the material is hard to transcribe.
@@ -4105,6 +4164,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          <ref name="att.datable.attributes"/>
          <ref name="att.editLike.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -4119,7 +4179,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-name-calendar-calendar-check-name-constraint-rule-17">
+                  id="tavq-name-calendar-calendar-check-name-constraint-rule-18">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4133,11 +4193,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
    </define>
    <define name="rs">
       <element name="rs">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.naming.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4146,6 +4207,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4164,6 +4226,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4207,23 +4270,13 @@ Measures]</a:documentation>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
          <ref name="att.ranging.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of numeric value.
-Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:documentation>
-               <choice>
-                  <value>cardinal</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">absolute number, e.g. 21, 21.5</a:documentation>
-                  <value>ordinal</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">ordinal number, e.g. 21st</a:documentation>
-                  <value>fraction</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">fraction, e.g. one half or three-quarters</a:documentation>
-                  <value>percentage</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a percentage</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of numeric value.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <optional>
@@ -4249,6 +4302,7 @@ Measures]</a:documentation>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
          <ref name="att.measurement.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <ref name="att.ranging.attributes"/>
          <optional>
             <attribute name="type">
@@ -4263,7 +4317,7 @@ Measures]</a:documentation>
    </define>
    <define name="measureGrp">
       <element name="measureGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -4274,6 +4328,7 @@ Measures]</a:documentation>
          <ref name="att.global.attributes"/>
          <ref name="att.measurement.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4285,12 +4340,13 @@ Measures]</a:documentation>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attributes"/>
          <ref name="att.measurement.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="date">
       <element name="date">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -4306,6 +4362,7 @@ Measures]</a:documentation>
          <ref name="att.editLike.attributes"/>
          <ref name="att.dimensions.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4327,6 +4384,7 @@ Measures]</a:documentation>
          <ref name="att.editLike.attributes"/>
          <ref name="att.dimensions.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4336,10 +4394,10 @@ Measures]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) allows the encoder to classify the abbreviation according to some convenient typology.
-Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) allows the encoder to classify the abbreviation according to some convenient typology.</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
                </data>
@@ -4354,16 +4412,17 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.editLike.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="ptr">
       <element name="ptr">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-ptr-ptrAtts-constraint-rule-18">
+                  id="tavq-ptr-ptrAtts-constraint-rule-19">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:ptr">
@@ -4376,16 +4435,17 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="att.internetMedia.attributes"/>
          <ref name="att.pointing.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="ref">
       <element name="ref">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]</a:documentation>
          <ref name="macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-ref-refAtts-constraint-rule-19">
+                  id="tavq-ref-refAtts-constraint-rule-20">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:ref">
@@ -4399,6 +4459,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="att.internetMedia.attributes"/>
          <ref name="att.pointing.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4450,7 +4511,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-list-gloss-list-must-have-labels-constraint-rule-20">
+                  id="tavq-list-gloss-list-must-have-labels-constraint-rule-21">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:list[@type='gloss']">
@@ -4460,26 +4521,13 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="att.global.attributes"/>
          <ref name="att.sortable.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) describes the nature of the items in the list.
-Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (instructions); 4] litany (litany); 5] syllogism (syllogism)</a:documentation>
-               <choice>
-                  <value>gloss</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) each list item glosses some term or concept, which is given by a <code xmlns="http://www.w3.org/1999/xhtml"
-                           xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;label&gt;</code> element preceding the list item.</a:documentation>
-                  <value>index</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(index) each list item is an entry in an index such as the alphabetical topical index at the back of a print volume.</a:documentation>
-                  <value>instructions</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(instructions) each list item is a step in a sequence of instructions, as in a recipe.</a:documentation>
-                  <value>litany</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(litany) each list item is one of a sequence of petitions, supplications or invocations, typically in a religious ritual.</a:documentation>
-                  <value>syllogism</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(syllogism) each list item is part of an argument consisting of two or more propositions and a final conclusion derived from them.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) describes the nature of the items in the list.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -4502,6 +4550,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.typed.attributes"/>
          <ref name="att.placement.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4523,6 +4572,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.typed.attributes"/>
          <ref name="att.placement.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4544,7 +4594,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
    </define>
    <define name="note">
       <element name="note">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]</a:documentation>
          <ref name="macro.specialPara"/>
          <ref name="att.global.attributes"/>
          <ref name="att.placement.attributes"/>
@@ -4552,6 +4602,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.typed.attributes"/>
          <ref name="att.written.attributes"/>
          <ref name="att.anchoring.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4575,6 +4626,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.typed.attributes"/>
          <ref name="att.written.attributes"/>
          <ref name="att.anchoring.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4589,6 +4641,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          </zeroOrMore>
          <ref name="att.global.attributes"/>
          <ref name="att.spanning.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="indexName">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.</a:documentation>
@@ -4612,6 +4665,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.resourced.attributes"/>
          <ref name="att.declaring.attributes"/>
          <ref name="att.timed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <attribute name="mimeType">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type</a:documentation>
             <list>
@@ -4627,7 +4681,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
    </define>
    <define name="graphic">
       <element name="graphic">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]</a:documentation>
          <zeroOrMore>
             <ref name="model.descLike"/>
          </zeroOrMore>
@@ -4636,6 +4690,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.resourced.attributes"/>
          <ref name="att.declaring.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4647,6 +4702,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i
          <ref name="att.media.attributes"/>
          <ref name="att.timed.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="encoding">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml"
@@ -4675,6 +4731,7 @@ Elements]</a:documentation>
          <ref name="att.edition.attributes"/>
          <ref name="att.spanning.attributes"/>
          <ref name="att.breaking.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4688,6 +4745,7 @@ Elements]</a:documentation>
          <ref name="att.spanning.attributes"/>
          <ref name="att.breaking.attributes"/>
          <ref name="att.edition.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4701,6 +4759,7 @@ Elements]</a:documentation>
          <ref name="att.edition.attributes"/>
          <ref name="att.spanning.attributes"/>
          <ref name="att.breaking.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4714,6 +4773,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <ref name="att.edition.attributes"/>
          <ref name="att.spanning.attributes"/>
          <ref name="att.breaking.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4727,6 +4787,7 @@ Elements]</a:documentation>
          <ref name="att.edition.attributes"/>
          <ref name="att.spanning.attributes"/>
          <ref name="att.breaking.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4883,7 +4944,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-author-calendar-calendar-check-author-constraint-rule-21">
+                  id="tavq-author-calendar-calendar-check-author-constraint-rule-22">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4916,7 +4977,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-editor-calendar-calendar-check-editor-constraint-rule-22">
+                  id="tavq-editor-calendar-calendar-check-editor-constraint-rule-23">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4980,7 +5041,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-resp-calendar-calendar-check-resp-constraint-rule-23">
+                  id="tavq-resp-calendar-calendar-check-resp-constraint-rule-24">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5000,10 +5061,10 @@ Elements]</a:documentation>
          <ref name="att.typed.attribute.subtype"/>
          <ref name="att.canonical.attributes"/>
          <ref name="att.datable.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the title according to some convenient typology.
-Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive)</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">classifies the title according to some convenient typology.</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
                </data>
@@ -5023,7 +5084,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-title-calendar-calendar-check-title-constraint-rule-24">
+                  id="tavq-title-calendar-calendar-check-title-constraint-rule-25">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5059,6 +5120,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          <ref name="att.global.attributes"/>
          <ref name="att.datable.attributes"/>
          <ref name="att.canonical.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -5073,7 +5135,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-meeting-calendar-calendar-check-meeting-constraint-rule-25">
+                  id="tavq-meeting-calendar-calendar-check-meeting-constraint-rule-26">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5151,7 +5213,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
    </define>
    <define name="bibl">
       <element name="bibl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(bibliographic citation) contains a loosely-structured bibliographic citation of which the sub-components may or may not be explicitly tagged. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -5170,12 +5232,13 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          <ref name="att.typed.attributes"/>
          <ref name="att.sortable.attributes"/>
          <ref name="att.docStatus.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="biblStruct">
       <element name="biblStruct">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(structured bibliographic citation) contains a structured bibliographic citation, in which only bibliographic sub-elements appear and in a specified order. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="analytic"/>
@@ -5200,12 +5263,13 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          <ref name="att.typed.attributes"/>
          <ref name="att.sortable.attributes"/>
          <ref name="att.docStatus.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="listBibl">
       <element name="listBibl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="model.headLike"/>
@@ -5233,6 +5297,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          <ref name="att.sortable.attributes"/>
          <ref name="att.declarable.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5247,7 +5312,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-relatedItem-targetorcontent1-constraint-rule-26">
+                  id="tavq-relatedItem-targetorcontent1-constraint-rule-27">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:relatedItem">
@@ -5282,7 +5347,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-l-abstractModel-structure-l-in-l-constraint-rule-27">
+                  id="tavq-l-abstractModel-structure-l-in-l-constraint-rule-28">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:l">
@@ -5291,6 +5356,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </pattern>
          <ref name="att.global.attributes"/>
          <ref name="att.fragmentable.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5330,7 +5396,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-lg-atleast1oflggapl-constraint-rule-28">
+                  id="tavq-lg-atleast1oflggapl-constraint-rule-29">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:lg">
@@ -5339,7 +5405,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-lg-abstractModel-structure-lg-in-l-constraint-rule-29">
+                  id="tavq-lg-abstractModel-structure-lg-in-l-constraint-rule-30">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:lg">
@@ -5350,6 +5416,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          <ref name="att.divLike.attributes"/>
          <ref name="att.typed.attributes"/>
          <ref name="att.declaring.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5406,6 +5473,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho
          <ref name="att.global.attributes"/>
          <ref name="att.placement.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the kind of stage direction.
@@ -5445,7 +5513,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
    <define name="teiCorpus">
       <element name="teiCorpus">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml"
-                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="teiHeader"/>
             <zeroOrMore>
@@ -5478,8 +5546,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
          <ref name="att.typed.attribute.subtype"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
                </data>
@@ -5490,7 +5557,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="textLang">
       <element name="textLang">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]</a:documentation>
          <ref name="macro.specialPara"/>
          <ref name="att.global.attributes"/>
          <optional>
@@ -5553,7 +5620,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="teiHeader">
       <element name="teiHeader">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="fileDesc"/>
             <zeroOrMore>
@@ -5631,7 +5698,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-sponsor-calendar-calendar-check-sponsor-constraint-rule-30">
+                  id="tavq-sponsor-calendar-calendar-check-sponsor-constraint-rule-31">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5665,7 +5732,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-funder-calendar-calendar-check-funder-constraint-rule-31">
+                  id="tavq-funder-calendar-calendar-check-funder-constraint-rule-32">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5699,7 +5766,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-principal-calendar-calendar-check-principal-constraint-rule-32">
+                  id="tavq-principal-calendar-calendar-check-principal-constraint-rule-33">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5740,7 +5807,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="extent">
       <element name="extent">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <empty/>
@@ -5784,7 +5851,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="idno">
       <element name="idno">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -5796,34 +5863,13 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          <ref name="att.sortable.attributes"/>
          <ref name="att.datable.attributes"/>
          <ref name="att.typed.attribute.subtype"/>
+         <ref name="att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">categorizes the identifier, for example as an ISBN, Social Security number, etc.
-Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC</a:documentation>
-               <choice>
-                  <value>ISBN</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml"
-                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                        href="https://www.isbn-international.org"> International ISBN Agency.</a>
-                  </a:documentation>
-                  <value>ISSN</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.</a:documentation>
-                  <value>DOI</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.</a:documentation>
-                  <value>URI</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml"
-                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                        href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
-                  <value>VIAF</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.</a:documentation>
-                  <value>ESTC</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.</a:documentation>
-                  <value>OCLC</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">categorizes the identifier, for example as an ISBN, Social Security number, etc.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <optional>
@@ -5840,7 +5886,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-idno-calendar-calendar-check-idno-constraint-rule-33">
+                  id="tavq-idno-calendar-calendar-check-idno-constraint-rule-34">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5901,7 +5947,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-licence-calendar-calendar-check-licence-constraint-rule-34">
+                  id="tavq-licence-calendar-calendar-check-licence-constraint-rule-35">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5959,7 +6005,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="sourceDesc">
       <element name="sourceDesc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]</a:documentation>
          <choice>
             <oneOrMore>
                <ref name="model.pLike"/>
@@ -5979,7 +6025,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="biblFull">
       <element name="biblFull">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <choice>
             <group>
                <group>
@@ -6011,6 +6057,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          <ref name="att.declarable.attributes"/>
          <ref name="att.sortable.attributes"/>
          <ref name="att.docStatus.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6047,7 +6094,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="projectDesc">
       <element name="projectDesc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6058,7 +6105,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="samplingDecl">
       <element name="samplingDecl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6069,7 +6116,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="editorialDecl">
       <element name="editorialDecl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <choice>
                <ref name="model.pLike"/>
@@ -6083,7 +6130,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="correction">
       <element name="correction">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6122,7 +6169,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="normalization">
       <element name="normalization">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6146,13 +6193,13 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="quotation">
       <element name="quotation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <zeroOrMore>
             <ref name="model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-quotation-quotationContents-constraint-rule-35">
+                  id="tavq-quotation-quotationContents-constraint-rule-36">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6182,7 +6229,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="hyphenation">
       <element name="hyphenation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6210,7 +6257,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="segmentation">
       <element name="segmentation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6221,7 +6268,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="stdVals">
       <element name="stdVals">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="model.pLike"/>
          </oneOrMore>
@@ -6404,7 +6451,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
    </define>
    <define name="citeStructure">
       <element name="citeStructure">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="citeData"/>
@@ -6437,7 +6484,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-citeStructure-match-citestructure-outer-match-constraint-rule-36">
+                  id="tavq-citeStructure-match-citestructure-outer-match-constraint-rule-37">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6447,7 +6494,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-citeStructure-match-citestructure-inner-match-constraint-rule-37">
+                  id="tavq-citeStructure-match-citestructure-inner-match-constraint-rule-38">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6470,7 +6517,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="citeData">
       <element name="citeData">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]</a:documentation>
          <empty/>
          <ref name="att.global.attributes"/>
          <ref name="att.citeStructurePart.attributes"/>
@@ -6496,7 +6543,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="prefixDef">
       <element name="prefixDef">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]</a:documentation>
          <zeroOrMore>
             <ref name="model.pLike"/>
          </zeroOrMore>
@@ -6513,7 +6560,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="listPrefixDef">
       <element name="listPrefixDef">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="desc"/>
@@ -6696,7 +6743,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-38">
+                  id="tavq-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6744,7 +6791,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-unitDef-calendar-calendar-check-unitDef-constraint-rule-39">
+                  id="tavq-unitDef-calendar-calendar-check-unitDef-constraint-rule-40">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6779,7 +6826,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-conversion-calendar-calendar-check-conversion-constraint-rule-40">
+                  id="tavq-conversion-calendar-calendar-check-conversion-constraint-rule-41">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6849,7 +6896,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-application-calendar-calendar-check-application-constraint-rule-41">
+                  id="tavq-application-calendar-calendar-check-application-constraint-rule-42">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6922,7 +6969,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-creation-calendar-calendar-check-creation-constraint-rule-42">
+                  id="tavq-creation-calendar-calendar-check-creation-constraint-rule-43">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6937,7 +6984,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
    </define>
    <define name="langUsage">
       <element name="langUsage">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]</a:documentation>
          <choice>
             <oneOrMore>
                <ref name="model.pLike"/>
@@ -7104,23 +7151,10 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="att.sortable.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
-Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded</a:documentation>
-               <choice>
-                  <value>sent</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
-                  <value>received</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
-                  <value>transmitted</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
-                  <value>redirected</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
-                  <value>forwarded</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -7170,7 +7204,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="change">
       <element name="change">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]</a:documentation>
          <ref name="macro.specialPara"/>
          <ref name="att.ascribed.attributes"/>
          <ref name="att.datable.attributes"/>
@@ -7191,7 +7225,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-change-calendar-calendar-check-change-constraint-rule-43">
+                  id="tavq-change-calendar-calendar-check-change-constraint-rule-44">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7218,7 +7252,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="listChange">
       <element name="listChange">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="desc"/>
@@ -7250,7 +7284,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">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml"
-                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="teiHeader"/>
             <choice>
@@ -7312,7 +7346,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="text">
       <element name="text">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="model.global"/>
@@ -7443,7 +7477,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="group">
       <element name="group">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <zeroOrMore>
                <choice>
@@ -7508,6 +7542,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="att.global.attributes"/>
          <ref name="att.declaring.attributes"/>
          <ref name="att.typed.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7562,7 +7597,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-44">
+                  id="tavq-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-45">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:div">
@@ -7573,7 +7608,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="tavq-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-45">
+                  id="tavq-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-46">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:div">
@@ -7608,6 +7643,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="att.typed.attributes"/>
          <ref name="att.placement.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7624,6 +7660,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </choice>
          </zeroOrMore>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7640,6 +7677,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </choice>
          </zeroOrMore>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7661,6 +7699,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </oneOrMore>
          </group>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7674,6 +7713,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             </choice>
          </zeroOrMore>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7696,6 +7736,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </zeroOrMore>
          <ref name="att.global.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7715,6 +7756,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </zeroOrMore>
          <ref name="att.global.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7724,6 +7766,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7733,6 +7776,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="macro.paraContent"/>
          <ref name="att.global.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7762,6 +7806,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </group>
          <ref name="att.global.attributes"/>
          <ref name="att.written.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7822,23 +7867,10 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                        name="type"
                        a:defaultValue="main">
-               <a:documentation>(type) specifies the role of this subdivision of the title.
-Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)</a:documentation>
-               <choice>
-                  <value>main</value>
-                  <a:documentation>(main) main title of the work</a:documentation>
-                  <value>sub</value>
-                  <a:documentation>(subordinate) subtitle of the work</a:documentation>
-                  <value>alt</value>
-                  <a:documentation>(alternate) alternative title of the work</a:documentation>
-                  <value>short</value>
-                  <a:documentation>(short) abbreviated form of title</a:documentation>
-                  <value>desc</value>
-                  <a:documentation>(descriptive) descriptive paraphrase of the work</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation>(type) specifies the role of this subdivision of the title.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -7850,6 +7882,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
          <ref name="att.canonical.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -7892,6 +7925,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(document date) contains the date of a document, as given on a title page or in a dateline. [4.6. Title Pages]</a:documentation>
          <ref name="macro.phraseSeq"/>
          <ref name="att.global.attributes"/>
+         <ref name="att.cmc.attributes"/>
          <ref name="att.datable.attributes"/>
          <ref name="att.calendarSystem.attributes"/>
          <empty/>
diff --git a/Test2/expected-results/testCocoa1.xml b/Test2/expected-results/testCocoa1.xml
index 4568f9aa6..cb2236180 100644
--- a/Test2/expected-results/testCocoa1.xml
+++ b/Test2/expected-results/testCocoa1.xml
@@ -1686,4 +1686,4 @@
          <ab>TOIOND' APEBH TODE PRAGMA.</ab>
       </body>
    </text>
-</TEI>
\ No newline at end of file
+</TEI>
diff --git a/Test2/expected-results/testCocoa2.xml b/Test2/expected-results/testCocoa2.xml
index 4f944352a..21a98454a 100644
--- a/Test2/expected-results/testCocoa2.xml
+++ b/Test2/expected-results/testCocoa2.xml
@@ -3165,4 +3165,4 @@ TICES, SERVANTS<lb/>
          </div>
       </body>
    </text>
-</TEI>
\ No newline at end of file
+</TEI>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 1c703dc4b..0b12ce6d9 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -207,7 +207,7 @@
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e51144-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e50956-constraint">
          <rule context="tei:ab">
             <report test="descendant::*[not(namespace-uri(.) =               ('http://www.loc.gov/mods/v3', 'http://www.tei-c.org/ns/1.0'))]">ab descendants must be in the
               namespaces
@@ -319,7 +319,7 @@
             </choice>
          </zeroOrMore>
       </element>
-      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e51155-constraint">
+      <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="d9e50967-constraint">
          <rule context="tei:ab">
             <report test="descendant::*[not(namespace-uri(.) =               ('http://www.w3.org/2000/svg', 'http://www.tei-c.org/ns/1.0'))]">ab descendants must be in the
               namespaces
@@ -663,6 +663,42 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
          </attribute>
       </optional>
    </define>
+   <define name="t_att.cmc.attributes">
+      <ref name="t_att.cmc.attribute.generatedBy"/>
+   </define>
+   <define name="t_att.cmc.attribute.generatedBy">
+      <optional>
+         <attribute name="generatedBy">
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(generated by) categorizes how the content of an element was generated in a CMC environment.
+Suggested values include: 1] human; 2] template; 3] system; 4] bot; 5] unspecified</a:documentation>
+            <choice>
+               <value>human</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was naturally typed or spoken by a human user</a:documentation>
+               <value>template</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated after a human user activated a template for its insertion</a:documentation>
+               <value>system</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by the system, i.e. the CMC environment</a:documentation>
+               <value>bot</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by a bot, i.e. a non-human agent, typically one that is not part of the CMC environment itself</a:documentation>
+               <value>unspecified</value>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the content was generated by an unknown or unspecified process</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
+            </choice>
+         </attribute>
+      </optional>
+   </define>
+   <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+            id="testPure1-att.cmc-generatedBy-CMC_generatedBy_within_post-constraint-rule-1">
+      <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                context="tei:*[@generatedBy]">
+         <sch:assert test="ancestor-or-self::tei:post">The @generatedBy attribute is for use within a &lt;post&gt; element.</sch:assert>
+      </sch:rule>
+   </pattern>
    <define name="t_att.cReferencing.attributes">
       <ref name="t_att.cReferencing.attribute.cRef"/>
    </define>
@@ -768,7 +804,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.datable.w3c-att-datable-w3c-when-constraint-rule-1">
+            id="testPure1-att.datable.w3c-att-datable-w3c-when-constraint-rule-2">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -778,7 +814,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.datable.w3c-att-datable-w3c-from-constraint-rule-2">
+            id="testPure1-att.datable.w3c-att-datable-w3c-from-constraint-rule-3">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -788,7 +824,7 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       </sch:rule>
    </pattern>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.datable.w3c-att-datable-w3c-to-constraint-rule-3">
+            id="testPure1-att.datable.w3c-att-datable-w3c-to-constraint-rule-4">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1130,7 +1166,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.global.source-source-only_1_ODD_source-constraint-rule-4">
+            id="testPure1-att.global.source-source-only_1_ODD_source-constraint-rule-5">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1496,7 +1532,7 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.measurement-att-measurement-unitRef-constraint-rule-5">
+            id="testPure1-att.measurement-att-measurement-unitRef-constraint-rule-6">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1609,7 +1645,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.typed-subtypeTyped-constraint-rule-6">
+            id="testPure1-att.typed-subtypeTyped-constraint-rule-7">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1641,7 +1677,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.pointing-targetLang-targetLang-constraint-rule-7">
+            id="testPure1-att.pointing-targetLang-targetLang-constraint-rule-8">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1803,7 +1839,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8">
+            id="testPure1-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1847,7 +1883,7 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9">
+            id="testPure1-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3878,6 +3914,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       <choice>
          <ref name="t_model.respLike"/>
          <ref name="t_model.imprintPart"/>
+         <ref name="t_quote"/>
          <ref name="t_series"/>
          <ref name="t_citedRange"/>
          <ref name="t_bibl"/>
@@ -3980,10 +4017,14 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          <ref name="t_model.attributable"/>
       </choice>
    </define>
+   <define name="t_model.cmc">
+      <notAllowed/>
+   </define>
    <define name="t_model.common">
       <choice>
          <ref name="t_model.divPart"/>
          <ref name="t_model.inter"/>
+         <ref name="t_model.cmc"/>
          <ref name="t_q"/>
       </choice>
    </define>
@@ -4108,6 +4149,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          <ref name="t_model.biblLike"/>
          <ref name="t_model.listLike"/>
          <ref name="t_model.annotationLike"/>
+         <ref name="t_xenoData"/>
          <ref name="t_listChange"/>
          <ref name="t_seg"/>
          <ref name="t_listAnnotation"/>
@@ -4231,7 +4273,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-10">
+            id="testPure1-att.calendarSystem-calendar-calendar_attr_on_empty_element-constraint-rule-11">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -4290,7 +4332,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-11">
+                  id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-rule-12">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:p">
@@ -4301,7 +4343,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-12">
+                  id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-rule-13">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:p">
@@ -4314,6 +4356,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_att.declaring.attributes"/>
          <ref name="t_att.fragmentable.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4322,6 +4365,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(foreign) identifies a word or phrase as belonging to some language other than that of the surrounding text. [3.3.2.1. Foreign Words or Expressions]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4330,6 +4374,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(emphasized) marks words or phrases which are stressed or emphasized for linguistic or rhetorical effect. [3.3.2.2. Emphatic Words and Phrases 3.3.2. Emphasis, Foreign Words, and Unusual Language]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4339,6 +4384,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4347,6 +4393,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies any word or phrase which is regarded as linguistically distinct, for example as archaic, technical, dialectal, non-preferred, etc., or as forming part of a sublanguage. [3.3.2.3. Other Linguistically Distinct Material]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the sublanguage or register to which the word or phrase is being assigned</a:documentation>
@@ -4382,6 +4429,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_macro.specialPara"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.ascribed.directed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="aloud">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">may be used to indicate whether the quoted matter is regarded as having been vocalized or signed.</a:documentation>
@@ -4422,6 +4470,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4431,6 +4480,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <ref name="t_macro.specialPara"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.ascribed.directed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) may be used to indicate whether the offset passage is spoken or thought, or to characterize it more finely.
@@ -4465,7 +4515,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
    </define>
    <define name="t_cit">
       <element name="cit">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 10.3.5.1. Examples]</a:documentation>
          <oneOrMore>
             <choice>
                <ref name="t_model.biblLike"/>
@@ -4481,6 +4531,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          </oneOrMore>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4489,6 +4540,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">marks words or phrases mentioned, not used. [3.3.3. Quotation]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4497,16 +4549,17 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(so called) contains a word or phrase for which the author or narrator indicates a disclaiming of responsibility, for example by the use of scare quotes or italics. [3.3.3. Quotation]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_desc">
       <element name="desc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [23.4.1. Description of Components]</a:documentation>
          <ref name="t_macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-13">
+                  id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-14">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:desc[ @type eq 'deprecationInfo']">
@@ -4518,18 +4571,13 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
             </sch:rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.
-Suggested values include: 1] deprecationInfo (deprecation information)</a:documentation>
-               <choice>
-                  <value>deprecationInfo</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(deprecation
-          information) This element describes why or how its parent element is being deprecated, typically including recommendations for alternate encoding.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">characterizes the element in some sense, using any convenient classification scheme or typology.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -4537,13 +4585,14 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
    </define>
    <define name="t_gloss">
       <element name="gloss">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 22.4.1. Description of Components]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(gloss) identifies a phrase or word used to provide a gloss or definition for some other word or phrase. [3.4.1. Terms and Glosses 23.4.1. Description of Components]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.pointing.attributes"/>
          <ref name="t_att.cReferencing.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4558,6 +4607,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <ref name="t_att.canonical.attributes"/>
          <ref name="t_att.sortable.attributes"/>
          <ref name="t_att.cReferencing.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4572,6 +4622,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4602,7 +4653,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-rt-target-rt-target-not-span-constraint-rule-14">
+                  id="testPure1-rt-target-rt-target-not-span-constraint-rule-15">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:rt/@target">
@@ -4619,7 +4670,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-rt-from-rt-from-constraint-rule-15">
+                  id="testPure1-rt-from-rt-from-constraint-rule-16">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:rt/@from">
@@ -4636,7 +4687,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-rt-to-rt-to-constraint-rule-16">
+                  id="testPure1-rt-to-rt-to-constraint-rule-17">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:rt/@to">
@@ -4651,6 +4702,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(Latin for thus or so) contains text reproduced although apparently incorrect or inaccurate. [3.5.1. Apparent Errors]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4661,6 +4713,7 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4682,26 +4735,29 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
             </group>
          </choice>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_reg">
       <element name="reg">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(regularization) contains a reading which has been regularized or normalized in some sense. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus]</a:documentation>
+Normalization 13. Critical Apparatus]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_orig">
       <element name="orig">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(original form) contains a reading which is marked as following the original, rather than being normalized or corrected. [3.5.2. Regularization and
-Normalization 12. Critical Apparatus]</a:documentation>
+Normalization 13. Critical Apparatus]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4718,6 +4774,7 @@ Normalization 12. Critical Apparatus]</a:documentation>
          <ref name="t_att.timed.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.dimensions.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="reason">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reason) gives the reason for omission
@@ -4782,6 +4839,7 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
          <ref name="t_att.placement.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.dimensions.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4793,16 +4851,18 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke
          <ref name="t_att.transcriptional.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.dimensions.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_unclear">
       <element name="unclear">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [11.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(unclear) contains a word, phrase, or passage which cannot be transcribed with certainty because it is illegible or inaudible in the source. [12.3.3.1. Damage, Illegibility, and Supplied Text 3.5.3. Additions, Deletions, and Omissions]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.dimensions.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="reason">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates why the material is hard to transcribe.
@@ -4849,6 +4909,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          <ref name="t_att.datable.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -4863,7 +4924,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-name-calendar-calendar-check-name-constraint-rule-17">
+                  id="testPure1-name-calendar-calendar-check-name-constraint-rule-18">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -4877,11 +4938,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
    </define>
    <define name="t_rs">
       <element name="rs">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) contains a general purpose name or referring string. [13.2.1. Personal Names 3.6.1. Referring Strings]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(referencing string) contains a general purpose name or referring string. [14.2.1. Personal Names 3.6.1. Referring Strings]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.naming.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4895,6 +4957,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(The email address of The Venerable Bede.) </a:documentation>
          </choice>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4913,6 +4976,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke</a:documentation>
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4955,23 +5019,13 @@ Measures]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.ranging.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of numeric value.
-Suggested values include: 1] cardinal; 2] ordinal; 3] fraction; 4] percentage</a:documentation>
-               <choice>
-                  <value>cardinal</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">absolute number, e.g. 21, 21.5</a:documentation>
-                  <value>ordinal</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">ordinal number, e.g. 21st</a:documentation>
-                  <value>fraction</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">fraction, e.g. one half or three-quarters</a:documentation>
-                  <value>percentage</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a percentage</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the type of numeric value.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <optional>
@@ -4996,6 +5050,7 @@ Measures]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.measurement.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <ref name="t_att.ranging.attributes"/>
          <optional>
             <attribute name="type">
@@ -5010,7 +5065,7 @@ Measures]</a:documentation>
    </define>
    <define name="t_measureGrp">
       <element name="measureGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [10.3.4. Dimensions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(measure group) contains a group of dimensional specifications which relate to the same object, for example the height and width of a manuscript page. [11.3.4. Dimensions]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -5036,6 +5091,7 @@ Measures]</a:documentation>
          <ref name="t_att.global.source.attribute.source"/>
          <ref name="t_att.measurement.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="corresp">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(corresponds) points to elements that correspond to the current element in some way.</a:documentation>
@@ -5067,12 +5123,13 @@ Measures]</a:documentation>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.measurement.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_date">
       <element name="date">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.4. Dates]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(date) contains a date in any format. [3.6.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 16.2.3. The Setting Description 14.4. Dates]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -5088,6 +5145,7 @@ Measures]</a:documentation>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.dimensions.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5109,6 +5167,7 @@ Measures]</a:documentation>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.dimensions.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5117,10 +5176,10 @@ Measures]</a:documentation>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(abbreviation) contains an abbreviation of any sort. [3.6.5. Abbreviations and Their Expansions]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) allows the encoder to classify the abbreviation according to some convenient typology.
-Sample values include: 1] suspension (suspension); 2] contraction (contraction); 3] brevigraph; 4] superscription (superscription); 5] acronym (acronym); 6] title (title); 7] organization (organization); 8] geographic (geographic)</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(type) allows the encoder to classify the abbreviation according to some convenient typology.</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
                </data>
@@ -5135,16 +5194,17 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.editLike.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_ptr">
       <element name="ptr">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 17.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-ptr-ptrAtts-constraint-rule-18">
+                  id="testPure1-ptr-ptrAtts-constraint-rule-19">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:ptr">
@@ -5157,16 +5217,17 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.internetMedia.attributes"/>
          <ref name="t_att.pointing.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_ref">
       <element name="ref">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 17.1. Links]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-ref-refAtts-constraint-rule-19">
+                  id="testPure1-ref-refAtts-constraint-rule-20">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:ref">
@@ -5180,6 +5241,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.internetMedia.attributes"/>
          <ref name="t_att.pointing.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5231,7 +5293,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-list-gloss-list-must-have-labels-constraint-rule-20">
+                  id="testPure1-list-gloss-list-must-have-labels-constraint-rule-21">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:list[@type='gloss']">
@@ -5240,6 +5302,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.sortable.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5260,6 +5323,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.placement.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5281,6 +5345,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.placement.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5302,7 +5367,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
    </define>
    <define name="t_note">
       <element name="note">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 9.3.5.4. Notes within Entries]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(note) contains a note or annotation. [3.9.1. Notes and Simple Annotation 2.2.6. The Notes Statement 3.12.2.8. Notes and Statement of Language 10.3.5.4. Notes within Entries]</a:documentation>
          <ref name="t_macro.specialPara"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.placement.attributes"/>
@@ -5310,6 +5375,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.written.attributes"/>
          <ref name="t_att.anchoring.attribute.targetEnd"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5333,6 +5399,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.written.attributes"/>
          <ref name="t_att.anchoring.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5347,6 +5414,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.spanning.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="indexName">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">a single word which follows the rules defining a legal XML name (see ), supplying a name to specify which index (of several) the index entry belongs to.</a:documentation>
@@ -5370,6 +5438,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.resourced.attributes"/>
          <ref name="t_att.declaring.attributes"/>
          <ref name="t_att.timed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <attribute name="mimeType">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(MIME media type) specifies the applicable multimedia internet mail extension (MIME) media type</a:documentation>
             <list>
@@ -5385,7 +5454,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
    </define>
    <define name="t_graphic">
       <element name="graphic">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 11.1. Digital Facsimiles]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(graphic) indicates the location of a graphic or illustration, either forming part of a text, or providing an image of it. [3.10. Graphics and Other Non-textual Components 12.1. Digital Facsimiles]</a:documentation>
          <zeroOrMore>
             <ref name="t_model.descLike"/>
          </zeroOrMore>
@@ -5394,6 +5463,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.resourced.attributes"/>
          <ref name="t_att.declaring.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5405,6 +5475,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <ref name="t_att.media.attributes"/>
          <ref name="t_att.timed.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="encoding">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">The encoding used to encode the binary data. If not specified, this is assumed to be <a xmlns="http://www.w3.org/1999/xhtml"
@@ -5433,6 +5504,7 @@ Elements]</a:documentation>
          <ref name="t_att.edition.attributes"/>
          <ref name="t_att.spanning.attributes"/>
          <ref name="t_att.breaking.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5446,6 +5518,7 @@ Elements]</a:documentation>
          <ref name="t_att.spanning.attributes"/>
          <ref name="t_att.breaking.attributes"/>
          <ref name="t_att.edition.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5459,6 +5532,7 @@ Elements]</a:documentation>
          <ref name="t_att.edition.attributes"/>
          <ref name="t_att.spanning.attributes"/>
          <ref name="t_att.breaking.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5472,6 +5546,7 @@ Elements 7.2.5. Speech Contents]</a:documentation>
          <ref name="t_att.edition.attributes"/>
          <ref name="t_att.spanning.attributes"/>
          <ref name="t_att.breaking.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5485,6 +5560,7 @@ Elements]</a:documentation>
          <ref name="t_att.edition.attributes"/>
          <ref name="t_att.spanning.attributes"/>
          <ref name="t_att.breaking.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5531,7 +5607,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-author-calendar-calendar-check-author-constraint-rule-21">
+                  id="testPure1-author-calendar-calendar-check-author-constraint-rule-22">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5564,7 +5640,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-editor-calendar-calendar-check-editor-constraint-rule-22">
+                  id="testPure1-editor-calendar-calendar-check-editor-constraint-rule-23">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5628,7 +5704,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-resp-calendar-calendar-check-resp-constraint-rule-23">
+                  id="testPure1-resp-calendar-calendar-check-resp-constraint-rule-24">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5646,7 +5722,7 @@ Elements]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-title-calendar-check-title-constraint-rule-24">
+                  id="testPure1-title-calendar-check-title-constraint-rule-25">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5658,6 +5734,7 @@ Elements]</a:documentation>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.canonical.attributes"/>
          <ref name="t_att.datable.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
@@ -5695,7 +5772,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-title-calendar-calendar-check-title-constraint-rule-25">
+                  id="testPure1-title-calendar-calendar-check-title-constraint-rule-26">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5731,6 +5808,7 @@ Elements]</a:documentation>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.datable.attributes"/>
          <ref name="t_att.canonical.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -5745,7 +5823,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-meeting-calendar-calendar-check-meeting-constraint-rule-26">
+                  id="testPure1-meeting-calendar-calendar-check-meeting-constraint-rule-27">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:*[@calendar]">
@@ -5823,7 +5901,7 @@ Elements]</a:documentation>
    </define>
    <define name="t_bibl">
       <element name="bibl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(bibliographic citation) A short bibliographic citation with nothing but author, title, and optional date [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(bibliographic citation) A short bibliographic citation with nothing but author, title, and optional date [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <group>
             <group>
                <ref name="t_author"/>
@@ -5879,12 +5957,13 @@ Elements]</a:documentation>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.sortable.attributes"/>
          <ref name="t_att.docStatus.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_listBibl">
       <element name="listBibl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation list) contains a list of bibliographic citations of any kind. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.headLike"/>
@@ -5912,6 +5991,7 @@ Elements]</a:documentation>
          <ref name="t_att.sortable.attributes"/>
          <ref name="t_att.declarable.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -5926,7 +6006,7 @@ Elements]</a:documentation>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-relatedItem-targetorcontent1-constraint-rule-27">
+                  id="testPure1-relatedItem-targetorcontent1-constraint-rule-28">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:relatedItem">
@@ -5961,7 +6041,7 @@ Elements]</a:documentation>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-l-abstractModel-structure-l-in-l-constraint-rule-28">
+                  id="testPure1-l-abstractModel-structure-l-in-l-constraint-rule-29">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:l">
@@ -5970,6 +6050,7 @@ Elements]</a:documentation>
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.fragmentable.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6009,7 +6090,7 @@ Elements]</a:documentation>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-lg-atleast1oflggapl-constraint-rule-29">
+                  id="testPure1-lg-atleast1oflggapl-constraint-rule-30">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:lg">
@@ -6018,7 +6099,7 @@ Elements]</a:documentation>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-rule-30">
+                  id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-rule-31">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:lg">
@@ -6029,6 +6110,7 @@ Elements]</a:documentation>
          <ref name="t_att.divLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.declaring.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6085,6 +6167,7 @@ Elements]</a:documentation>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.placement.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the kind of stage direction.
@@ -6124,7 +6207,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
    <define name="t_teiCorpus">
       <element name="teiCorpus">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI corpus) contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <code xmlns="http://www.w3.org/1999/xhtml"
-                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements, each containing a single text header and a text. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="t_teiHeader"/>
             <zeroOrMore>
@@ -6156,8 +6239,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove
          <ref name="t_att.global.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.
-Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies what type of generated text division (e.g. index, table of contents, etc.) is to appear.</a:documentation>
                <data type="token">
                   <param name="pattern">[^\p{C}\p{Z}]+</param>
                </data>
@@ -6168,7 +6250,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="t_textLang">
       <element name="textLang">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text language) describes the languages and writing systems identified within the bibliographic work being described, rather than its description. [3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.6.6. Languages and Writing Systems]</a:documentation>
          <ref name="t_macro.specialPara"/>
          <ref name="t_att.global.attributes"/>
          <optional>
@@ -6231,7 +6313,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="t_teiHeader">
       <element name="teiHeader">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI header) supplies descriptive and declarative metadata associated with a digital resource or set of resources. [2.1.1. The TEI Header and Its Components 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="t_fileDesc"/>
             <zeroOrMore>
@@ -6309,7 +6391,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-sponsor-calendar-calendar-check-sponsor-constraint-rule-31">
+                  id="testPure1-sponsor-calendar-calendar-check-sponsor-constraint-rule-32">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6343,7 +6425,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-funder-calendar-calendar-check-funder-constraint-rule-32">
+                  id="testPure1-funder-calendar-calendar-check-funder-constraint-rule-33">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6377,7 +6459,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-principal-calendar-calendar-check-principal-constraint-rule-33">
+                  id="testPure1-principal-calendar-calendar-check-principal-constraint-rule-34">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6418,7 +6500,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="t_extent">
       <element name="extent">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.7.1. Object Description]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(extent) describes the approximate size of a text stored on some carrier medium or of some other object, digital or non-digital, specified in any convenient units. [2.2.3. Type and Extent of File 2.2. The File Description 3.12.2.4. Imprint, Size of a Document, and Reprint Information 11.7.1. Object Description]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <empty/>
@@ -6462,7 +6544,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
    </define>
    <define name="t_idno">
       <element name="idno">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [14.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.12.2.4. Imprint, Size of a Document, and Reprint Information]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -6473,34 +6555,13 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist</a:documentation
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.sortable.attributes"/>
          <ref name="t_att.datable.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">categorizes the identifier, for example as an ISBN, Social Security number, etc.
-Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] OCLC</a:documentation>
-               <choice>
-                  <value>ISBN</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the <a xmlns="http://www.w3.org/1999/xhtml"
-                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                        href="https://www.isbn-international.org"> International ISBN Agency.</a>
-                  </a:documentation>
-                  <value>ISSN</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">International Standard Serial Number: an eight-digit number to uniquely identify a serial publication.</a:documentation>
-                  <value>DOI</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Digital Object Identifier: a unique string of letters and numbers assigned to an electronic document.</a:documentation>
-                  <value>URI</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Uniform Resource Identifier: a string of characters to uniquely identify a resource, following the syntax of <a xmlns="http://www.w3.org/1999/xhtml"
-                        xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                        href="https://datatracker.ietf.org/doc/html/rfc3986">RFC 3986</a>.</a:documentation>
-                  <value>VIAF</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">A data number in the Virtual Internet Authority File assigned to link different names in catalogs around the world for the same entity.</a:documentation>
-                  <value>ESTC</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">English Short-Title Catalogue number: an identifying number assigned to a document in English printed in the British Isles or North America before 1801.</a:documentation>
-                  <value>OCLC</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">OCLC control number (record number) for the union catalog record in WorldCat, a union catalog for member libraries in the Online Computer Library Center global cooperative.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">categorizes the identifier, for example as an ISBN, Social Security number, etc.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <optional>
@@ -6517,7 +6578,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-idno-calendar-calendar-check-idno-constraint-rule-34">
+                  id="testPure1-idno-calendar-calendar-check-idno-constraint-rule-35">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6578,7 +6639,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-licence-calendar-calendar-check-licence-constraint-rule-35">
+                  id="testPure1-licence-calendar-calendar-check-licence-constraint-rule-36">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6776,7 +6837,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_sourceDesc">
       <element name="sourceDesc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as "born digital" for a text which has no previous existence. [2.2.7. The Source Description]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(source description) describes the source(s) from which an electronic text was derived or generated, typically a bibliographic description in the case of a digitized text, or a phrase such as born digital for a text which has no previous existence. [2.2.7. The Source Description]</a:documentation>
          <choice>
             <oneOrMore>
                <ref name="t_model.pLike"/>
@@ -6796,7 +6857,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_biblFull">
       <element name="biblFull">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(fully-structured bibliographic citation) contains a fully-structured bibliographic citation, in which all components of the TEI file description are present. [3.12.1. Methods of Encoding Bibliographic References and Lists of References 2.2. The File Description 2.2.7. The Source Description 16.3.2. Declarable Elements]</a:documentation>
          <choice>
             <group>
                <group>
@@ -6828,6 +6889,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
          <ref name="t_att.declarable.attributes"/>
          <ref name="t_att.sortable.attributes"/>
          <ref name="t_att.docStatus.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6864,7 +6926,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_projectDesc">
       <element name="projectDesc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(project description) describes in detail the aim or purpose for which an electronic file was encoded, together with any other relevant information concerning the process by which it was assembled or collected. [2.3.1. The Project Description 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -6875,7 +6937,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_samplingDecl">
       <element name="samplingDecl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(sampling declaration) contains a prose description of the rationale and methods used in selecting texts, or parts of a text, for inclusion in the resource. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -6886,7 +6948,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_editorialDecl">
       <element name="editorialDecl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <choice>
                <ref name="t_model.pLike"/>
@@ -6900,7 +6962,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_correction">
       <element name="correction">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(correction principles) states how and under what circumstances corrections have been made in the text. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -6939,7 +7001,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_normalization">
       <element name="normalization">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(normalization) indicates the extent of normalization or regularization of the original source carried out in converting it to electronic form. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -6963,13 +7025,13 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_quotation">
       <element name="quotation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(quotation) specifies editorial practice adopted with respect to quotation marks in the original. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <zeroOrMore>
             <ref name="t_model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-quotation-quotationContents-constraint-rule-36">
+                  id="testPure1-quotation-quotationContents-constraint-rule-37">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -6999,7 +7061,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_hyphenation">
       <element name="hyphenation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(hyphenation) summarizes the way in which hyphenation in a source text has been treated in an encoded version of it. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -7027,7 +7089,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_segmentation">
       <element name="segmentation">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(segmentation) describes the principles according to which the text has been segmented, for example into sentences, tone-units, graphemic strata, etc. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -7038,7 +7100,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
    </define>
    <define name="t_stdVals">
       <element name="stdVals">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(standard values) specifies the format used when standardized date or number values are supplied. [2.3.3. The Editorial Practices Declaration 16.3.2. Declarable Elements]</a:documentation>
          <oneOrMore>
             <ref name="t_model.pLike"/>
          </oneOrMore>
@@ -7221,7 +7283,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
    </define>
    <define name="t_citeStructure">
       <element name="citeStructure">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation structure) declares a structure and method for citing the current document. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_citeData"/>
@@ -7254,7 +7316,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-37">
+                  id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-38">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7264,7 +7326,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-38">
+                  id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-39">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7287,7 +7349,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="t_citeData">
       <element name="citeData">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 16.2.5.4. Citation Structures]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(citation data) specifies how information may be extracted from citation structures. [3.11.4. Declaring Reference Systems 17.2.5.4. Citation Structures]</a:documentation>
          <empty/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.citeStructurePart.attributes"/>
@@ -7313,7 +7375,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="t_prefixDef">
       <element name="prefixDef">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]</a:documentation>
          <zeroOrMore>
             <ref name="t_model.pLike"/>
          </zeroOrMore>
@@ -7330,7 +7392,7 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
    </define>
    <define name="t_listPrefixDef">
       <element name="listPrefixDef">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [17.2.3. Using Abbreviated Pointers]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_desc"/>
@@ -7513,7 +7575,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-39">
+                  id="testPure1-unitDecl-calendar-calendar-check-unitDecl-constraint-rule-40">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7561,7 +7623,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-unitDef-calendar-calendar-check-unitDef-constraint-rule-40">
+                  id="testPure1-unitDef-calendar-calendar-check-unitDef-constraint-rule-41">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7596,7 +7658,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-conversion-calendar-calendar-check-conversion-constraint-rule-41">
+                  id="testPure1-conversion-calendar-calendar-check-conversion-constraint-rule-42">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7666,7 +7728,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-application-calendar-calendar-check-application-constraint-rule-42">
+                  id="testPure1-application-calendar-calendar-check-application-constraint-rule-43">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7739,7 +7801,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-creation-calendar-calendar-check-creation-constraint-rule-43">
+                  id="testPure1-creation-calendar-calendar-check-creation-constraint-rule-44">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -7754,7 +7816,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
    </define>
    <define name="t_langUsage">
       <element name="langUsage">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 15.3.2. Declarable Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(language usage) describes the languages, sublanguages, registers, dialects, etc. represented within a text. [2.4.2. Language Usage 2.4. The Profile Description 16.3.2. Declarable Elements]</a:documentation>
          <choice>
             <oneOrMore>
                <ref name="t_model.pLike"/>
@@ -7920,23 +7982,10 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.sortable.attributes"/>
          <optional>
             <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.
-Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5] forwarded</a:documentation>
-               <choice>
-                  <value>sent</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the sending or dispatch of a message.</a:documentation>
-                  <value>received</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the receipt of a message.</a:documentation>
-                  <value>transmitted</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</a:documentation>
-                  <value>redirected</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the redirection of an unread message.</a:documentation>
-                  <value>forwarded</value>
-                  <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">information concerning the forwarding of a message.</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">describes the nature of the action.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -7986,7 +8035,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_change">
       <element name="change">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(change) documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 12.7. Identifying Changes and Revisions]</a:documentation>
          <ref name="t_macro.specialPara"/>
          <ref name="t_att.ascribed.attributes"/>
          <ref name="t_att.datable.attributes"/>
@@ -8007,7 +8056,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-change-calendar-calendar-check-change-constraint-rule-44">
+                  id="testPure1-change-calendar-calendar-check-change-constraint-rule-45">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -8034,7 +8083,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_listChange">
       <element name="listChange">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 12.7. Identifying Changes and Revisions]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_desc"/>
@@ -8166,11 +8215,11 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_s">
       <element name="s">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(s-unit) contains a sentence-like division of a text. [17.1. Linguistic Segment Categories 8.4.1. Segmentation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(s-unit) contains a sentence-like division of a text. [18.1. Linguistic Segment Categories 8.4.1. Segmentation]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-s-noNestedS-constraint-rule-45">
+                  id="testPure1-s-noNestedS-constraint-rule-46">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:s">
@@ -8181,34 +8230,37 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_cl">
       <element name="cl">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(clause) represents a grammatical clause. [17.1. Linguistic Segment Categories]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(clause) represents a grammatical clause. [18.1. Linguistic Segment Categories]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_phr">
       <element name="phr">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(phrase) represents a grammatical phrase. [17.1. Linguistic Segment Categories]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(phrase) represents a grammatical phrase. [18.1. Linguistic Segment Categories]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_w">
       <element name="w">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(word) represents a grammatical (not necessarily orthographic) word. [17.1. Linguistic Segment Categories 17.4.2. Lightweight Linguistic Annotation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(word) represents a grammatical (not necessarily orthographic) word. [18.1. Linguistic Segment Categories 18.4.2. Lightweight Linguistic Annotation]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -8246,6 +8298,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.linguistic.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <attribute name="ana">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml"
                      xmlns:rng="http://relaxng.org/ns/structure/1.0">@ana</code> attribute appears.</a:documentation>
@@ -8262,7 +8315,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_m">
       <element name="m">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(morpheme) represents a grammatical morpheme. [17.1. Linguistic Segment Categories]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(morpheme) represents a grammatical morpheme. [18.1. Linguistic Segment Categories]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -8278,6 +8331,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="baseForm">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies the morpheme's base form.</a:documentation>
@@ -8291,18 +8345,19 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_c">
       <element name="c">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(character) represents a character. [17.1. Linguistic Segment Categories]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(character) represents a character. [18.1. Linguistic Segment Categories]</a:documentation>
          <ref name="t_macro.xtext"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_pc">
       <element name="pc">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(punctuation character) contains a character or string of characters regarded as constituting a single punctuation mark. [17.1.2. Below the Word Level 17.4.2. Lightweight Linguistic Annotation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(punctuation character) contains a character or string of characters regarded as constituting a single punctuation mark. [18.1.2. Below the Word Level 18.4.2. Lightweight Linguistic Annotation]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -8315,6 +8370,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.linguistic.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="force">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the extent to which this punctuation mark conventionally separates words or phrases</a:documentation>
@@ -8347,11 +8403,11 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_span">
       <element name="span">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">associates an interpretative annotation directly with a span of text. [17.3. Spans and Interpretations]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">associates an interpretative annotation directly with a span of text. [18.3. Spans and Interpretations]</a:documentation>
          <ref name="t_macro.phraseSeq.limited"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-target-from-constraint-rule-46">
+                  id="testPure1-span-target-from-constraint-rule-47">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:span">
@@ -8362,7 +8418,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-targetto-constraint-rule-47">
+                  id="testPure1-span-targetto-constraint-rule-48">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:span">
@@ -8373,7 +8429,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-tonotfrom-constraint-rule-48">
+                  id="testPure1-span-tonotfrom-constraint-rule-49">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:span">
@@ -8384,7 +8440,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-span-tofrom-constraint-rule-49">
+                  id="testPure1-span-tofrom-constraint-rule-50">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:span">
@@ -8396,6 +8452,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.interpLike.attributes"/>
          <ref name="t_att.pointing.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="from">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a <code xmlns="http://www.w3.org/1999/xhtml"
@@ -8418,7 +8475,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_spanGrp">
       <element name="spanGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(span group) collects together span tags. [17.3. Spans and Interpretations]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(span group) collects together span tags. [18.3. Spans and Interpretations]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.descLike"/>
@@ -8429,12 +8486,13 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.interpLike.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_interp">
       <element name="interp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(interpretation) summarizes a specific interpretative annotation which can be linked to a span of text. [17.3. Spans and Interpretations]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(interpretation) summarizes a specific interpretative annotation which can be linked to a span of text. [18.3. Spans and Interpretations]</a:documentation>
          <zeroOrMore>
             <choice>
                <text/>
@@ -8445,12 +8503,13 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.interpLike.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_interpGrp">
       <element name="interpGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(interpretation group) collects together a set of related interpretations which share responsibility or type. [17.3. Spans and Interpretations]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(interpretation group) collects together a set of related interpretations which share responsibility or type. [18.3. Spans and Interpretations]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.descLike"/>
@@ -8461,6 +8520,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.interpLike.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -8557,11 +8617,11 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
    </define>
    <define name="t_link">
       <element name="link">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link) defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [17.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-link-linkTargets3-constraint-rule-50">
+                  id="testPure1-link-linkTargets3-constraint-rule-51">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -8573,12 +8633,13 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.pointing.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_linkGrp">
       <element name="linkGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link group) defines a collection of associations or hypertextual links. [16.1. Links]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(link group) defines a collection of associations or hypertextual links. [17.1. Links]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.descLike"/>
@@ -8602,12 +8663,13 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          </pattern>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.pointing.group.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_ab">
       <element name="ab">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [16.3. Blocks, Segments, and Anchors]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) contains any component-level unit of text, acting as a container for phrase or inter level elements analogous to, but without the same constraints as, a paragraph. [17.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="anyElement_ab_02"/>
          <ref name="t_gb"/>
          <optional>
@@ -8717,7 +8779,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_gb"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-51">
+                  id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-rule-52">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -8732,33 +8794,36 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <ref name="t_att.declaring.attributes"/>
          <ref name="t_att.fragmentable.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_anchor">
       <element name="anchor">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 17.5. Correspondence and Alignment]</a:documentation>
          <empty/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_seg">
       <element name="seg">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the chunk level. [16.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(arbitrary segment) represents any segmentation of text below the chunk level. [17.3. Blocks, Segments, and Anchors 6.2. Components of the Verse Line 7.2.5. Speech Contents]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.segLike.attributes"/>
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.written.attributes"/>
          <ref name="t_att.notated.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
    <define name="t_when">
       <element name="when">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [16.4.2. Placing Synchronous Events in Time]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a point in time either relative to other elements in the same timeline tag, or absolutely. [17.4.2. Placing Synchronous Events in Time]</a:documentation>
          <empty/>
          <ref name="t_att.global.attributes"/>
          <optional>
@@ -8829,11 +8894,12 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_timeline">
       <element name="timeline">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [16.4.2. Placing Synchronous Events in Time]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(timeline) provides a set of ordered points in time which can be linked to elements of a spoken text to create a temporal alignment of that text. [17.4.2. Placing Synchronous Events in Time]</a:documentation>
          <oneOrMore>
             <ref name="t_when"/>
          </oneOrMore>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="origin">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">designates the origin of the timeline, i.e. the time at which it begins.</a:documentation>
@@ -8885,12 +8951,13 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_alt">
       <element name="alt">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation) identifies an alternation or a set of choices among elements or passages. [16.8. Alternation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation) identifies an alternation or a set of choices among elements or passages. [17.8. Alternation]</a:documentation>
          <empty/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.pointing.attribute.targetLang"/>
          <ref name="t_att.pointing.attribute.evaluate"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="target">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the destination of the reference by supplying one or more URI References</a:documentation>
@@ -8948,7 +9015,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_altGrp">
       <element name="altGrp">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group)  [16.8. Alternation]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(alternation group)  [17.8. Alternation]</a:documentation>
          <group>
             <optional>
                <choice>
@@ -9133,6 +9200,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.pointing.group.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                        name="mode"
@@ -9151,13 +9219,13 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_standOff">
       <element name="standOff">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [16.10. The standOff Container]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document. [17.10. The standOff Container]</a:documentation>
          <oneOrMore>
             <ref name="t_model.standOffPart"/>
          </oneOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-standOff-nested_standOff_should_be_typed-constraint-rule-52">
+                  id="testPure1-standOff-nested_standOff_should_be_typed-constraint-rule-53">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -9180,7 +9248,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotation&gt;</code>, <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;annotationBlock&gt;</code>, or <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;note&gt;</code>, possibly organized with nested <code xmlns="http://www.w3.org/1999/xhtml"
-                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;listAnnotation&gt;</code> elements. [16.10. The standOff Container]</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;listAnnotation&gt;</code> elements. [17.10. The standOff Container]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.headLike"/>
@@ -9207,7 +9275,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">represents an annotation following the <a xmlns="http://www.w3.org/1999/xhtml"
                xmlns:rng="http://relaxng.org/ns/structure/1.0"
                href="#WADM">Web
-      Annotation Data Model</a>. [16.10. The standOff Container]</a:documentation>
+      Annotation Data Model</a>. [17.10. The standOff Container]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_respStmt"/>
@@ -9301,7 +9369,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> elements may be combined within a <code xmlns="http://www.w3.org/1999/xhtml"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;TEI&gt;</code> (or <code xmlns="http://www.w3.org/1999/xhtml"
-                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+                  xmlns:rng="http://relaxng.org/ns/structure/1.0">&lt;teiCorpus&gt;</code>) element. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <ref name="t_teiHeader"/>
             <choice>
@@ -9363,7 +9431,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_text">
       <element name="text">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(text) contains a single text of any kind, whether unitary or composite, for example a poem or drama, a collection of essays, a novel, a dictionary, or a corpus sample. [4. Default Text Structure 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <zeroOrMore>
                <ref name="t_model.global"/>
@@ -9494,7 +9562,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
    </define>
    <define name="t_group">
       <element name="group">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 15.1. Varieties of Composite Text]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(group) contains the body of a composite text, grouping together a sequence of distinct texts (or groups of such texts) which are regarded as a unit for some purpose, for example the collected works of an author, a sequence of prose essays, etc. [4. Default Text Structure 4.3.1. Grouped Texts 16.1. Varieties of Composite Text]</a:documentation>
          <group>
             <zeroOrMore>
                <choice>
@@ -9559,6 +9627,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.declaring.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9613,7 +9682,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-53">
+                  id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-rule-54">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:div">
@@ -9624,7 +9693,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-54">
+                  id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-rule-55">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       context="tei:div">
@@ -9659,6 +9728,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <ref name="t_att.typed.attributes"/>
          <ref name="t_att.placement.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9675,6 +9745,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </choice>
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9691,6 +9762,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </choice>
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9712,6 +9784,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9725,6 +9798,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </choice>
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9747,6 +9821,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9766,6 +9841,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9775,6 +9851,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9784,6 +9861,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <ref name="t_macro.paraContent"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9813,6 +9891,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          </group>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.written.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9871,23 +9950,10 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <attribute xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
                        name="type"
                        a:defaultValue="main">
-               <a:documentation>(type) specifies the role of this subdivision of the title.
-Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternate); 4] short (short); 5] desc (descriptive)</a:documentation>
-               <choice>
-                  <value>main</value>
-                  <a:documentation>(main) main title of the work</a:documentation>
-                  <value>sub</value>
-                  <a:documentation>(subordinate) subtitle of the work</a:documentation>
-                  <value>alt</value>
-                  <a:documentation>(alternate) alternative title of the work</a:documentation>
-                  <value>short</value>
-                  <a:documentation>(short) abbreviated form of title</a:documentation>
-                  <value>desc</value>
-                  <a:documentation>(descriptive) descriptive paraphrase of the work</a:documentation>
-                  <data type="token">
-                     <param name="pattern">[^\p{C}\p{Z}]+</param>
-                  </data>
-               </choice>
+               <a:documentation>(type) specifies the role of this subdivision of the title.</a:documentation>
+               <data type="token">
+                  <param name="pattern">[^\p{C}\p{Z}]+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -9899,6 +9965,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.canonical.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <empty/>
       </element>
    </define>
@@ -9941,6 +10008,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(document date) contains the date of a document, as given on a title page or in a dateline. [4.6. Title Pages]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <ref name="t_att.datable.attributes"/>
          <ref name="t_att.calendarSystem.attributes"/>
          <empty/>
@@ -10073,13 +10141,14 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
    </define>
    <define name="t_orgName">
       <element name="orgName">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [13.2.2. Organizational Names]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization name) contains an organizational name. [14.2.2. Organizational Names]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.datable.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.personal.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -10094,7 +10163,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-orgName-calendar-calendar-check-orgName-constraint-rule-55">
+                  id="testPure1-orgName-calendar-calendar-check-orgName-constraint-rule-56">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -10109,13 +10178,14 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
    </define>
    <define name="t_persName">
       <element name="persName">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [13.2.1. Personal Names]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(personal name) contains a proper noun or proper-noun phrase referring to a person, possibly including one or more of the person's forenames, surnames, honorifics, added names, etc. [14.2.1. Personal Names]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.datable.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.personal.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -10130,7 +10200,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-persName-calendar-calendar-check-persName-constraint-rule-56">
+                  id="testPure1-persName-calendar-calendar-check-persName-constraint-rule-57">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -10145,13 +10215,14 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
    </define>
    <define name="t_placeName">
       <element name="placeName">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(place name) contains an absolute or relative place name. [13.2.3. Place Names]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(place name) contains an absolute or relative place name. [14.2.3. Place Names]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <ref name="t_att.datable.attributes"/>
          <ref name="t_att.editLike.attributes"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.personal.attributes"/>
          <ref name="t_att.typed.attributes"/>
+         <ref name="t_att.cmc.attributes"/>
          <optional>
             <attribute name="calendar">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
@@ -10166,7 +10237,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
                   xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                  id="testPure1-placeName-calendar-calendar-check-placeName-constraint-rule-57">
+                  id="testPure1-placeName-calendar-calendar-check-placeName-constraint-rule-58">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -10181,7 +10252,7 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
    </define>
    <define name="t_gi">
       <element name="gi">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(element name) contains the name (generic identifier) of an element. [22. Documentation Elements 22.5. Element Specifications]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(element name) contains the name (generic identifier) of an element. [23. Documentation Elements 23.5. Element Specifications]</a:documentation>
          <data type="Name"/>
          <ref name="t_att.global.attributes"/>
          <optional>
@@ -10200,7 +10271,7 @@ Sample values include: 1] TEI; 2] DBK (docbook); 3] XX (unknown); 4] Schematron;
    </define>
    <define name="t_att">
       <element name="att">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(attribute) contains the name of an attribute appearing within running text. [22. Documentation Elements]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(attribute) contains the name of an attribute appearing within running text. [23. Documentation Elements]</a:documentation>
          <data type="Name"/>
          <ref name="t_att.global.attributes"/>
          <optional>
@@ -10219,7 +10290,7 @@ Sample values include: 1] TEI (Text Encoding Initiative); 2] DBK (Docbook); 3] X
    </define>
    <define name="t_val">
       <element name="val">
-         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(value) contains a single attribute value. [22. Documentation Elements 22.5.3. Attribute List Specification]</a:documentation>
+         <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(value) contains a single attribute value. [23. Documentation Elements 23.5.3. Attribute List Specification]</a:documentation>
          <text/>
          <ref name="t_att.global.attributes"/>
          <empty/>
diff --git a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
index 183bc8bf8..4ed6c34df 100644
--- a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
+++ b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
@@ -1,7 +1,7 @@
 /invalidInstances/testPure1InvalidInstance.xml:29:51: error: element "tag" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "bibl", "biblFull", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "desc", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "stage", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w"
 /invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "alt_of_seq_3-4", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer"
-/invalidInstances/testPure1InvalidInstance.xml:44:34: error: attribute "synch" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "decls", "exclude", "hand", "n", "next", "part", "prev", "rend", "rendition", "resp", "sameAs", "select", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
-/invalidInstances/testPure1InvalidInstance.xml:50:33: error: attribute "type" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "exclude", "n", "next", "prev", "rend", "rendition", "resp", "sameAs", "select", "sortKey", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
+/invalidInstances/testPure1InvalidInstance.xml:44:34: error: attribute "synch" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "decls", "exclude", "generatedBy", "hand", "n", "next", "part", "prev", "rend", "rendition", "resp", "sameAs", "select", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
+/invalidInstances/testPure1InvalidInstance.xml:50:33: error: attribute "type" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "exclude", "generatedBy", "n", "next", "prev", "rend", "rendition", "resp", "sameAs", "select", "sortKey", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space"
 /invalidInstances/testPure1InvalidInstance.xml:62:47: error: value of attribute "corresp" is invalid; must be an integer
 /invalidInstances/testPure1InvalidInstance.xml:67:46: error: value of attribute "select" is invalid; must be an integer
 /invalidInstances/testPure1InvalidInstance.xml:78:47: error: value of attribute "copyOf" is invalid; must be an integer matching the regular expression "[0-9][0-9]?"
diff --git a/source/p5subset.xml b/source/p5subset.xml
index 9d9ec7f26..93e648a74 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -7,7 +7,7 @@
       </titleStmt>
       <editionStmt>
         <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.8.0.html">4.8.0a</ref>. Last updated on
-        <date when="2024-05-01">1st May 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/2b31965c4">2b31965c4</ref></edition>
+        <date when="2024-07-04">4th July 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/d1b0282a0">d1b0282a0</ref></edition>
       </editionStmt>
       <publicationStmt>
         <distributor>TEI Consortium</distributor>
@@ -541,7 +541,7 @@ The MS. was lost in transmission by mail from <del rend="overstrike"><gap reason
   <desc versionDate="2007-08-05" xml:lang="en">provides attributes for describing the size of physical objects.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">물리적 대상의 크기를 기술하는 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供符合某種度量值的屬性值。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">物理的対象の大きさを表す属性を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">物理的対象の大きさを表す属性を示す。</desc>
   <desc versionDate="2009-05-25" xml:lang="fr">fournit des attributs
   pour décrire la taille des objets    physiques</desc>
   <desc versionDate="2007-11-06" xml:lang="it">assegna degli attributi che descrivono la grandezza di
@@ -724,8 +724,7 @@ header (see section <ptr target="#PHDH"/>).</valDesc>
   		-->
   		
   		<desc versionDate="2007-12-20" xml:lang="ko">간섭을 만든 당사자의 필적을 나타낸다.</desc>
-  		<desc versionDate="2008-04-05" xml:lang="ja">当該調整を行った主体の筆致を特定する。
-  		</desc>
+  		<desc versionDate="2008-04-05" xml:lang="ja">当該調整を行った主体の筆致を特定する。</desc>
   		<desc versionDate="2008-03-30" xml:lang="fr">signale la main de celui qui est intervenue.</desc>
   		<desc versionDate="2007-01-21" xml:lang="it">indica il responsabile dell'aggiunta o della cancellazione</desc>
   		<desc versionDate="2007-05-04" xml:lang="es">indica el responsable de la adición o de la omisión.</desc>
@@ -744,7 +743,7 @@ header (see section <ptr target="#PHDH"/>).</valDesc>
 <classSpec module="tei" type="atts" ident="att.damaged">
   <desc versionDate="2007-09-05" xml:lang="en">provides attributes describing the nature of any physical damage affecting a reading.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">독법에 영향을 미치는 물리적 손상의 특성을 기술하는 속성을 제공한다.</desc>
-  <desc versionDate="2008-04-21" xml:lang="ja">読みに影響を与える物理的損傷の性格を示す属性を示す。 </desc>
+  <desc versionDate="2008-04-21" xml:lang="ja">読みに影響を与える物理的損傷の性格を示す属性を示す。</desc>
   <desc versionDate="2008-04-06" xml:lang="es">proporciona los atributos que describen la naturaleza de
     cualquier daño físico que afecta a una lectura.</desc>
   <desc versionDate="2008-03-30" xml:lang="fr">fournit des attributs décrivant la nature de tout dommage
@@ -830,8 +829,7 @@ header (see section <ptr target="#PHDH"/>).</valDesc>
       <desc versionDate="2007-01-21" xml:lang="it">indica l'entità del danneggiamento misurato in base a
         una scala funzionale; il marcatore <gi>damage</gi> con l'attributo <att>degree</att>
         dovranno essere utilizzati solo se il testo può essere letto con una certa sicurezza; i
-        testi derivanti da altre fonti andranno marcati come <gi>supplied</gi>
-         </desc>
+        testi derivanti da altre fonti andranno marcati come <gi>supplied</gi></desc>
       <desc versionDate="2007-05-04" xml:lang="es">&gt;indica el grado del daño medido en base a una
         escala funcional; la etiqueta <gi>damage</gi> (daño) con el atributo <att>degree</att>
         (grado) deberán utilizarse sólo si el texto puede ser leído con una cierta certeza; los
@@ -962,6 +960,131 @@ of any adjacent whitespace</desc>
     <ptr target="#CORS5"/>
   </listRef>
 </classSpec>
+<classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="att.cmc" type="atts" module="tei">
+  <gloss xml:lang="en" versionDate="2023-11-24">computer-mediated communication</gloss>
+  <desc xml:lang="en" versionDate="2021-09-07">provides attributes categorizing how the element content was created in a CMC environment.</desc>
+  <attList>
+    <attDef ident="generatedBy" mode="add" module="cmc" usage="opt">
+      <gloss xml:lang="en" versionDate="2021-09-07">generated by</gloss>
+      <desc xml:lang="en" versionDate="2021-09-07">categorizes how the content of an element was generated in a CMC environment.</desc>
+      <datatype minOccurs="1" maxOccurs="1">
+        <dataRef key="teidata.enumerated"/>
+      </datatype>
+      <constraintSpec scheme="schematron" ident="CMC_generatedBy_within_post">
+        <constraint>
+          <sch:rule context="tei:*[@generatedBy]">
+            <sch:assert test="ancestor-or-self::tei:post">The @generatedBy attribute is for use within a &lt;post&gt; element.</sch:assert>
+          </sch:rule>
+        </constraint>
+      </constraintSpec>
+      <valList type="semi">
+        <!-- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -->
+        <!-- This list is duplicated in "CMCcmcatts", so if you make a
+             change here, make it there, too! -->
+        <valItem ident="human">
+          <desc xml:lang="en" versionDate="2021-09-07">the content was
+          <soCalled>naturally</soCalled> typed or spoken by a human user</desc>
+        </valItem>
+        <valItem ident="template">
+          <desc xml:lang="en" versionDate="2021-09-07">the content was
+          generated after a human user activated a template for its
+          insertion</desc>
+        </valItem>
+        <valItem ident="system">
+          <desc xml:lang="en" versionDate="2021-09-07">the content was
+          generated by the system, i.e. the CMC environment</desc>
+        </valItem>
+        <valItem ident="bot">
+          <desc xml:lang="en" versionDate="2024-05-17">the content was
+          generated by a bot, i.e. a non-human agent, typically one
+          that is not part of the CMC environment itself</desc>
+        </valItem>
+        <valItem ident="unspecified">
+          <desc xml:lang="en" versionDate="2024-05-17">the content was
+          generated by an unknown or unspecified process</desc>
+        </valItem>
+      </valList>
+      
+      <exemplum type="Chat2CLARIN" xml:lang="en" versionDate="2021-09-07">
+        <p>automatic system message in chat: user moves on to another
+        chatroom</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" generatedBy="system" who="#system" rend="color:blue">
+            <p>
+              <name type="nickname" corresp="#A02">McMike</name> geht
+              in einen anderen Raum: <name type="roomname">Kreuzfahrt</name>
+            </p>
+          </post>
+        </egXML>
+      </exemplum>
+      
+      <exemplum type="Chat2CLARIN" xml:lang="en" versionDate="2021-09-07">
+        <p>automatic system message in chat: user enters a chatroom</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" generatedBy="system">
+            <p>
+              <name type="nickname" corresp="#A08">c_bo</name> betritt
+            den Raum. </p>
+          </post>
+        </egXML>
+      </exemplum>
+      
+      <exemplum type="Chat2CLARIN" xml:lang="en" versionDate="2021-09-07">
+        <p>automatic system message in chat: user changes his font color</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" generatedBy="system" rend="color:red">
+            <p>
+              <name type="nickname" corresp="#A08">c_bo</name> hat die
+              Farbe gewechselt.
+            </p>
+          </post>
+        </egXML>
+      </exemplum>
+      
+      <exemplum type="wikitalk" xml:lang="en" versionDate="2021-09-07">
+        <p>An automatic signature of user including an automatic timestamp
+        (Wikipedia discussion, anonymized). The specification of
+        <att>generatedBy</att> at the inner element <gi>signed</gi> is
+        meant to override the specification at the outer element
+        <gi>post</gi>. This is generally possible when the outer
+        <att>generatedBy</att> value is "human".</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="standard" generatedBy="human" indentLevel="2" synch="#t00394407" who="#WU00005582">
+            <p> Kurze Nachfrage: Die Hieros für den Goldnamen stammen
+            auch von Beckerath gem. Literatur ? Grüße --</p><signed generatedBy="template" rend="inline"><gap reason="signatureContent"/><time generatedBy="template">18:50, 22. Okt. 2008 (CEST)</time></signed>
+          </post>
+        </egXML>
+      </exemplum>   
+  <!--  2024-07-02 ebb removing this because the post information is lacking and a little confusing. Replacing with an alternative usenet example on post.xml  
+    <exemplum type="usenet" xml:lang="en" versionDate="2021-09-07">
+        <p>Usenet news message: a client-generated line that introduces a
+        quotation from a previous message (similar to email):</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="event" when="2015-04-02T06:30:00Z">
+            <cit type="replyCit" generatedBy="template">
+              <bibl type="introQuote">Am 03.04.2015 um 09:46 schrieb [_NAME_]:</bibl>
+              <quote> ... </quote>
+            </cit>
+          </post>
+        </egXML>
+      </exemplum>-->  
+      <exemplum type="wikitalk" xml:lang="en" versionDate="2021-09-07">
+        <p>Wikipedia talk page: user signature</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+          <post type="written" generatedBy="human"> 
+            <!-- ... main content of posting ... -->
+            <signed generatedBy="template">
+              <gap reason="signatureContent"/>
+              <time generatedBy="template">12:01, 12. Jun. 2009 (CEST)</time>
+            </signed>
+          </post>
+        </egXML>
+      </exemplum>
+      
+    </attDef>
+    
+  </attList>
+</classSpec>
 <classSpec module="tei" type="atts" ident="att.cReferencing">
   <desc versionDate="2021-08-22" xml:lang="en">provides attributes that may be used to supply a
   <term>canonical reference</term> as a means of identifying the
@@ -1076,7 +1199,7 @@ of any adjacent whitespace</desc>
     </attDef>
     <attDef ident="datingPoint" usage="opt">
       <desc versionDate="2011-11-25" xml:lang="en">supplies a pointer to some location defining a named point in time with reference to which the datable item is understood to have occurred</desc>
-      <desc xml:lang="ja" versionDate="2022-05-09">ある時点につけた名前とその事柄が起きたとされる時間をともに定義している場所へのポインタを示す。たとえば、「令和改元」という日付をともなうID付きイベント要素を作成した場合にそのIDに対する参照を行う。 </desc>
+      <desc xml:lang="ja" versionDate="2022-05-09">ある時点につけた名前とその事柄が起きたとされる時間をともに定義している場所へのポインタを示す。たとえば、「令和改元」という日付をともなうID付きイベント要素を作成した場合にそのIDに対する参照を行う。</desc>
       <datatype><dataRef key="teidata.pointer"/></datatype>
     </attDef>
     <attDef ident="datingMethod" usage="opt">
@@ -1754,8 +1877,7 @@ of any adjacent whitespace</desc>
       l'en-tête TEI qui peuvent être choisis indépendamment au moyen de l'attribut
       <att>decls</att>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos para los elementos contenidos en el encabezado que pueden ser seleccionados autónomamente mediante el atributo <att>decls</att> adecuado.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">individua attributi per gli elementi contenuti nell'intestazione che possono essere selezionati autonomamente grazie all'apposito attributo <att>decls</att>
-   </desc>
+  <desc versionDate="2007-01-21" xml:lang="it">individua attributi per gli elementi contenuti nell'intestazione che possono essere selezionati autonomamente grazie all'apposito attributo <att>decls</att></desc>
   <attList>
     <attDef ident="default" usage="opt">
       <desc versionDate="2005-10-10" xml:lang="en">indicates whether or not this element is selected by default when
@@ -1763,8 +1885,7 @@ its parent is selected.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">그 부모가 선택될 때 기본값으로 이 요소가 선택되었는지를 표시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">當父元素被選擇時，指出此元素是否會被選擇。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">親要素が選択された場合に、当該要素がデフォルトとして選択されるか
-      どうかを示す。
-	</desc>
+      どうかを示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique si oui ou non cet élément est affecté par
           défaut quand son élément parent a été sélectionné.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica si el elemento es seleccionado automáticamente o no  cuando es seleccionado el padre</desc>
@@ -2000,8 +2121,7 @@ logique et doivent être traités dans l'ordre séquentiel</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 구역이 원본의 표본이며 어떤 부분인지를 나타낸다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出此區段是否為來源文件的樣本，若為樣本，則說明出自哪一部分。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該区分が、元資料のものを含むかどうか、そうであればその場所はど
-        こかを示す。
-	</desc>
+        こかを示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique si cette division est un échantillon de
           la source originale et dans ce cas, de quelle partie.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica si la división es una muestra de la fuente original y, en ese caso, de que parte de este se trata</desc>
@@ -2014,8 +2134,7 @@ logique et doivent être traités dans l'ordre séquentiel</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 원본의 후반부에서 제시된 자료가 부족하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段的末端無資料</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la división falta el material presente en el extremo en la fuente.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の終わりの部分が欠けている。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の終わりの部分が欠けている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, lacune à la fin de la division</desc>
           <desc versionDate="2007-01-21" xml:lang="it">alla partizione testuale manca del materiale nella parte finale presente nell'originale</desc>
         </valItem>
@@ -2024,8 +2143,7 @@ logique et doivent être traités dans l'ordre séquentiel</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 초반부와 후반부 자료가 부족하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段的起始與末端無資料</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el fragmento carece de material al comienzo y al final.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めと終わりの部分が欠けている。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めと終わりの部分が欠けている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, lacune au
 début et à la fin de la division</desc>
           <desc versionDate="2007-01-21" xml:lang="it">alla partizione testuale manca del materiale nella parte iniziale e in quella finale</desc>
@@ -2035,8 +2153,7 @@ début et à la fin de la division</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 초반부 자료가 부족하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段的起始部分無資料</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el fragmento carece de material en el comienzo.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めの部分が欠けている。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該区分は、元資料の始めの部分が欠けている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, lacune au
 début de la division</desc>
           <desc versionDate="2007-01-21" xml:lang="it">alla partizione manca del materiale nella parte iniziale</desc>
@@ -2046,8 +2163,7 @@ début de la division</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">표본 자료의 원본 내의 위치를 알 수 없다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">來源文件中的樣本資料位置不明</desc>
           <desc versionDate="2008-04-06" xml:lang="es">ubicación del material  de muestra dentro del original desconocido.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">元資料のどの部分かは不明。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">元資料のどの部分かは不明。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">par rapport à la source, position de
 l'échantillon inconnue</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la posizione del materiale prelevato dall'originale all'interno di quest'ultimo è sconosciuta</desc>
@@ -2057,8 +2173,7 @@ l'échantillon inconnue</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">구역이 표본이 아니다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">區段非樣本</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el fragmento no es una muestra.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該領域は、元資料の一部ではない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該領域は、元資料の一部ではない。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">la division n'est pas un échantillon</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la partizione testuale non è stata prelevata da alcun originale</desc>
         </valItem>
@@ -2130,10 +2245,8 @@ associated with a dated element, at the time indicated.</desc>
       <gloss xml:lang="ja" versionDate="2019-05-20">時間幅</gloss>
       <desc versionDate="2007-04-09" xml:lang="en">indicates the length of this element in time.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">시간선상에서 이 요소의 길이를 나타낸다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">指明此元素的時間長度。
-</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">時間幅を示す。
-</desc>
+      <desc versionDate="2007-05-02" xml:lang="zh-TW">指明此元素的時間長度。</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">時間幅を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique la longueur de cet élément dans le
         temps</desc>
       <desc versionDate="2007-11-06" xml:lang="it">indica la durata nel tempo di tale elemento</desc>
@@ -2190,8 +2303,7 @@ associated with a dated element, at the time indicated.</desc>
   <desc versionDate="2007-04-20" xml:lang="en">provides attributes for normalization of elements that contain datable events.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">날짜를 정할 수 있는 사건을 포함하는 요소의 규격화를 위한 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供用於元素規格化的屬性，這些元素包含日期明確的事件。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">時間事象を含む要素の正規化手法を表す属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">時間事象を含む要素の正規化手法を表す属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">fournit des attributs pour la normalisation des
       éléments qui contiennent des mentions d'événements datables</desc>
   <desc versionDate="2007-11-06" xml:lang="it">indica degli attributi per la normalizzazione di elementi che contengono eventi databili</desc>
@@ -2270,7 +2382,7 @@ associated with a dated element, at the time indicated.</desc>
         intervención o la interpretación.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">corrisponde al grado di certezza associato
         all'intervento o interpretazione</desc>
-      <desc xml:lang="ja" versionDate="2019-09-16">介入や解釈に関する確信度を示す。 </desc>
+      <desc xml:lang="ja" versionDate="2019-09-16">介入や解釈に関する確信度を示す。</desc>
       <datatype>
         <dataRef key="teidata.probCert"/>
       </datatype>
@@ -2716,7 +2828,7 @@ the TEI header.</p>
   <desc versionDate="2007-10-02" xml:lang="en">provides attributes common to all elements in the TEI encoding scheme.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">TEI 부호화 스키마의 모든 요소에 공통 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供一組屬性，通用於TEI編碼標準中的所有元素。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">TEI符号化スキーム中の全要素に共通する属性を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">TEI符号化スキーム中の全要素に共通する属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">fournit un jeu d'attributs communs à tous les éléments
     dans le système de codage TEI.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona un conjunto de atributos común a todos los
@@ -2818,16 +2930,13 @@ the TEI header.</p>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">使用<ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC3066</ref>的代碼，指出該元素內容的使用語言</desc>
       <desc xml:lang="ja" versionDate="2019-06-08"><ref target="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">BCP 47</ref>に従って生成された<soCalled>タグ</soCalled>を用いて要素の内容の言語を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique la langue du contenu de l'élément en
-        utilisant les codes du <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC 3066</ref>
-         </desc>
+        utilisant les codes du <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC 3066</ref></desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica la lengua del contenido del elemento
         utilizando los códigos extraídos de <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC
-          3066</ref>
-         </desc>
+          3066</ref></desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica la lingua del contenuto dell'elemento
         utilizzando i codici tratti da <ref target="https://www.ietf.org/rfc/rfc3066.txt">RFC
-        3066</ref>
-         </desc>
+        3066</ref></desc>
       <datatype><dataRef key="teidata.language"/></datatype>
       <exemplum xml:lang="en">
         <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en">
@@ -2997,9 +3106,8 @@ the TEI header.</p>
   <desc versionDate="2007-09-27" xml:lang="en">provides attributes describing aspects of the hand in which a
   manuscript is written.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원고가 쓰여진 필적의 측면을 기술하는 속성을 제공한다.</desc>
-  <desc versionDate="2008-04-06" xml:lang="es">proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito. </desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">手書き資料の筆致に関する情報を表す情報を示す。
-</desc>
+  <desc versionDate="2008-04-06" xml:lang="es">proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito.</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">手書き資料の筆致に関する情報を表す情報を示す。</desc>
   <desc versionDate="2008-03-30" xml:lang="fr">fournit des attributs décrivant les caractéristiques
 de la main par laquelle un manuscrit est écrit.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">indica degli attributi che descrivono aspetti delle mano utilizzata per la scrittura del manoscritto</desc>
@@ -3008,8 +3116,7 @@ de la main par laquelle un manuscrit est écrit.</desc>
       <desc versionDate="2010-09-28" xml:lang="en">gives a name or other identifier for the scribe
 believed to be responsible for this hand.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 필적에 대한 책임이 있다고 간주되는 필기사에 대한 표준명 또는 다른 확인소를 제시한다.</desc>
-      <desc versionDate="2019-09-16" xml:lang="ja">当該筆致に対応すると考えられる筆写者の名前またはその他の識別子を示す。
-</desc>
+      <desc versionDate="2019-09-16" xml:lang="ja">当該筆致に対応すると考えられる筆写者の名前またはその他の識別子を示す。</desc>
       <desc versionDate="2009-05-27" xml:lang="fr">donne un nom normalisé ou un autre
 identifiant pour le scribe reconnu comme responsable de cette main.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">assegna un nome o altro identificatore standard al trascrittore che si ritiene corrisponda alla mano in questione</desc>
@@ -3031,8 +3138,7 @@ this hand, for example <mentioned>secretary</mentioned>, <mentioned>copperplate<
       えば、<mentioned>secretary(書記官スタイル)</mentioned>、
       <mentioned>copperplate(銅板スタイル)</mentioned>、
       <mentioned>Chancery(公文書スタイル)</mentioned>、
-       <mentioned>Italian(イタリアスタイル)</mentioned>など。
-	</desc>
+       <mentioned>Italian(イタリアスタイル)</mentioned>など。</desc>
       <desc versionDate="2009-05-27" xml:lang="fr">caractérise la calligraphie ou le style
         d'écriture particuliers utilisés par cette main, par exemple <mentioned>écriture anglaise</mentioned>,
         <mentioned>de chancellerie</mentioned>, <mentioned>italienne</mentioned>, etc.</desc>
@@ -3051,24 +3157,20 @@ this hand, typically supplied by a <gi>scriptNote</gi> element
     </attDef>
     <attDef ident="medium">
       <desc versionDate="2007-09-27" xml:lang="en">describes the tint or type of ink, e.g. <mentioned>brown</mentioned>, or other
-writing medium, e.g. <mentioned>pencil</mentioned>
-         </desc>
+writing medium, e.g. <mentioned>pencil</mentioned></desc>
       <desc versionDate="2007-12-20" xml:lang="ko"><mentioned>brown</mentioned>와 같이 잉크의 색 또는 유형, 또는 <mentioned>pencil</mentioned>와 같이 글쓰기 방식 기술한다.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">インクの種類や色合い、例えば、<mentioned>茶色</mentioned>
-      や、筆記具の種類、例えば、<mentioned>鉛筆</mentioned>など。
-</desc>
+      や、筆記具の種類、例えば、<mentioned>鉛筆</mentioned>など。</desc>
       <desc versionDate="2009-05-29" xml:lang="fr">décrit la teinte ou le type d'encre, par
         exemple <mentioned>brune</mentioned>, ou un autre outil d'écriture, par exemple un <mentioned>crayon</mentioned>.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">descrive la tinta o il tipo di inchiostro, per esempio <mentioned>marrone</mentioned>, o altri strumenti di scrittura, per esempio <mentioned>matita</mentioned>
-         </desc>
+      <desc versionDate="2007-01-21" xml:lang="it">descrive la tinta o il tipo di inchiostro, per esempio <mentioned>marrone</mentioned>, o altri strumenti di scrittura, per esempio <mentioned>matita</mentioned></desc>
       <desc versionDate="2007-05-04" xml:lang="es">describe la tinta o el tipo de tinta, p.ej. <mentioned>marrón</mentioned>, u otros instrumentos de escritura, p.ej. <mentioned>lápiz</mentioned>.</desc>
        <datatype minOccurs="1" maxOccurs="unbounded"><dataRef key="teidata.enumerated"/></datatype>
     </attDef>
     <attDef ident="scope">
       <desc versionDate="2007-09-27" xml:lang="en">specifies how widely this  hand is used in the manuscript.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 필적이 원고에서 사용된 범위를 명시한다.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該筆致が、当該手書き資料中で、どの程度出現しているかを示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該筆致が、当該手書き資料中で、どの程度出現しているかを示す。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">spécifie la fréquence d'apparition de cette
 main dans le manuscrit.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica in quale misura è utilizzata la mano in questione nel manoscritto</desc>
@@ -3078,8 +3180,7 @@ main dans le manuscrit.</desc>
         <valItem ident="sole">
           <desc versionDate="2007-09-27" xml:lang="en">only this hand is used throughout the manuscript</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 필적만이 원고 전체에 사용되었다.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致だけで全てが書かれている。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致だけで全てが書かれている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">il n'y a que cette main dans le
 manuscrit.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">unica mano utilizzata nel manoscritto</desc>
@@ -3088,8 +3189,7 @@ manuscrit.</desc>
         <valItem ident="major">
           <desc versionDate="2007-09-27" xml:lang="en">this hand is used through most of the manuscript</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 필적이 원고 대부분에서 사용되었다.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、殆どが書かれている。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、殆どが書かれている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette main est utilisée dans la
 majeure partie du manuscrit.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">mano utilizzata nella maggior parte del manoscritto</desc>
@@ -3098,8 +3198,7 @@ majeure partie du manuscrit.</desc>
         <valItem ident="minor">
           <desc versionDate="2007-09-27" xml:lang="en">this hand is used occasionally in the manuscript</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 필적이 원고에서 가끔 사용되었다.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、所々が書かれている。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該筆致で、所々が書かれている。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette main est utilisée
 occasionnellement dans le manuscrit.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">mano utilizzata solo di rado nel manoscritto</desc>
@@ -3124,8 +3223,7 @@ and similarly, either <att>scribe</att> or
   <desc versionDate="2007-10-18" xml:lang="en">provides attributes for specifying the type of a computer
   resource using a standard taxonomy.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">표준 분류법을 사용하는 컴퓨터 자원의 유형을 명시하는 속성을 제시한다.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">標準的な用語による計算機資源の種類を表す属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">標準的な用語による計算機資源の種類を表す属性を示す。</desc>
   <desc versionDate="2009-05-27" xml:lang="fr">fournit des attributs pour spécifier le type de
 ressource informatique selon une taxinomie normalisée.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">indica degli attributi che specificano il tipo di risorsa informatica utilizzando una tassonomia standard</desc>
@@ -3367,8 +3465,7 @@ by the current element.</desc>
   <desc versionDate="2006-01-05" xml:lang="en">provides attributes to represent a regularized or normalized measurement.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">정상화 또는 규격화된 측정 방식을 표상하는 속성을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供屬性，代表一般化或規格化的度量。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">正規化単位を表す属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">正規化単位を表す属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">donne des attributs pour représenter une mesure
       régularisée ou normalisée.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos que representen una medición regularizada o normalizada.</desc>
@@ -4253,12 +4350,43 @@ this name in the form of a set of whitespace-separated values, for example the o
     <ptr target="#PHAD"/>
   </listRef>
 </classSpec>
+<classSpec module="tei" type="atts" ident="att.indentation">
+  <desc versionDate="2024-05-17" xml:lang="en">provides attributes for describing the indentation of a textual
+   element on the source page or object.</desc>
+  <desc versionDate="2024-05-17" xml:lang="es">proporciona atributos para
+  describir el sangrado de un elemento textual en la página fuente o en un objeto.</desc>
+  <desc versionDate="2024-05-17" xml:lang="de">stellt Attribute zur Beschreibung der Einrückung eines Textelements 
+  in der Quelle oder im Objekt bereit.</desc>
+  
+  <attList>
+    <attDef ident="indentLevel" usage="rec">
+      <desc versionDate="2024-05-17" xml:lang="en">specifies the level of indentation of an item using a numeric value.</desc>
+      <datatype maxOccurs="1">
+        <dataRef name="integer"/>
+      </datatype>
+      <exemplum xml:lang="de">
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+         <post type="standard" generatedBy="human" indentLevel="3" synch="#t02622878" who="#WU00018921">
+                <p> Wie du siehst hab ich die Lemma geändert, danke für den Hinweis, ich war nämlich selbst auch etwas unsicher bei der ganzen Sache und bin jetzt damit auch viel glücklicher!--</p>
+                <signed rend="inline" generatedBy="template"><gap reason="signatureContent"/>
+                    <time generatedBy="template">12:01, 12. Jun. 2009 (CEST)</time>
+                </signed>
+            </post>
+        </egXML>
+      </exemplum>
+      <remarks xml:lang="en" versionDate="2024-05-17"><p>This attribute can be used to mark the level of indentation of a post in a thread-like structure (as defined by its author and in relation to the standard level of indentation which should be encoded with <val>0</val>). This is commonly used for Wiki talk pages, but should also be used for genres such as webblog comments when the source was HTML.</p>
+      </remarks>
+    </attDef>
+  </attList>
+  <listRef>
+    <ptr target="#CMCcmcpostatts"/>
+  </listRef>
+</classSpec>
 <classSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tei" xml:id="TYPED" type="atts" ident="att.typed" predeclare="true">
   <desc versionDate="2007-10-02" xml:lang="en">provides attributes that can be used to classify or subclassify elements in any way.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">요소의 분류 또는 하위분류에서 사용될 수 있는 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供可依任何方法將元素分類或次要分類的一般屬性。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">要素を分類するための属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">要素を分類するための属性を示す。</desc>
   <desc versionDate="2009-05-29" xml:lang="fr">fournit des attributs qui peuvent être
       utilisés pour classer ou interclasser des éléments de n'importe quelle façon.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos genéricos utilizables para cualquier clasificación o subclasificación de elementos.</desc>
@@ -4462,8 +4590,7 @@ sub-classification for the element additional to that provided by its
           <desc versionDate="2007-05-02" xml:lang="zh-TW">若指向的元素本身為指標，則該指標的目標會被移除，依此類推，直到找到一個非指標的元素為止。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">si el elemento que señala a sí mismo es un indicador, entonces el target de ese indicador será tomado, y así sucesivamente, hasta que se encuentre un elemento que no sea un indicador.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">参照先の要素がポインターである場合、そのポインターの参照先へ
-	  と展開する。これを、参照先がポインターでなくなるまで続ける。
-	</desc>
+	  と展開する。これを、参照先がポインターでなくなるまで続ける。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">si l'élément pointé est lui-même un pointeur, alors on prendra la cible de ce pointeur, et ainsi de suite jusqu'à trouver un élément qui n'est pas un pointeur.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">se l'elemento puntato è esso stesso un puntatore, allora sarà presa la destinazione di quel puntatore e così via fino a trovare un elemento che non è un puntatore</desc>
         </valItem>
@@ -4475,8 +4602,7 @@ sub-classification for the element additional to that provided by its
           <desc versionDate="2007-05-02" xml:lang="zh-TW">若指向的元素本身為指標，則該指標的目標(無論是否為指標)會作為這項指標的目標。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">si el elemento que señala a sí mismo es un puntero, entonces el target (puntero o no) se toma como el target de este puntero.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">参照先の要素がポインターである場合、(そのポインターの参照先
-	  がどうであれ)そのポインターが参照先になる。
-	</desc>
+	  がどうであれ)そのポインターが参照先になる。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">si l'élément pointé est lui-même un pointeur, alors sa cible (qui est ou non un pointeur) devient la cible retenue.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">se l'elemento puntato è esso stesso un puntatore, allora la sua destinazione (che sia un puntatore o meno) è presa come destinazione del puntatore</desc>
         </valItem>
@@ -4487,8 +4613,7 @@ sub-classification for the element additional to that provided by its
           <desc versionDate="2007-12-20" xml:lang="ko">포인터의 대상에서 명시된 요소를 발견할 필요가 없을 때 더 이상의 대상에 대한 평가는 수행되지 않는다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">尋找指標的目標元素時，未對目標進行不必要的延伸評估。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">no se realiza ninguna otra evaluación de los targets más allá de la necesaria para encontrar el elemento especificado en el target del puntero.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該ポインターの参照先から先にあるリンクへの展開は行わない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該ポインターの参照先から先にあるリンクへの展開は行わない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">aucune évaluation ultérieure des cibles n'est menée au-delà de la recherche de l'élément désigné dans la cible du pointeur.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">non viene condotta altra valutazione delle destinazioni se non quella necessaria a rintracciare l'elemento specificato nella destinazione del puntatore</desc>
         </valItem>
@@ -4589,8 +4714,7 @@ sub-classification for the element additional to that provided by its
           <gi>alt</gi>.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">describe la función de cada uno de los valores del atributo <att>target</att> (metas) de los marcadores correspondientes <gi>link</gi>, <gi>join</gi>, o <gi>alt</gi>.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">descrive la funzione di ognuno dei valori dell'attributo <att>target</att> dei marcatori corrispondenti <gi>link</gi>,
-      <gi>join</gi>, o <gi>alt</gi>
-         </desc>
+      <gi>join</gi>, o <gi>alt</gi></desc>
       <datatype minOccurs="2" maxOccurs="unbounded"><dataRef key="teidata.word"/></datatype>
       <remarks versionDate="2011-07-25" xml:lang="en">
         <p>The number of separate values must match the number of
@@ -4642,7 +4766,7 @@ sub-classification for the element additional to that provided by its
       <desc versionDate="2021-01-30" xml:lang="en">supplies an XPath selection pattern using the
         syntax defined in <ptr target="#XSLT3"/> which identifies a set of nodes, selected within
         the context identified by the <att>target</att> attribute if this is supplied, or within the 
-        context of the parent element if it is not. </desc>
+        context of the parent element if it is not.</desc>
       <desc versionDate="2023-09-27" xml:lang="ja"><ptr target="#XSLT3"/>に定義された構文を用いて、ノードの集合を指し示す任意の XPath 式を記入する。
         選択範囲は <att>target</att> 属性が与えられた場合はそのコンテクスト、
         なければ親要素のコンテクストとなる。</desc>
@@ -4987,8 +5111,7 @@ If no value for the @scheme attribute is provided, then the default assumption s
   <desc versionDate="2006-04-17" xml:lang="en">provides attributes used to decorate rows or cells of a table.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">테이블의 행 또는 셀을 장식하는 속성을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供屬性，用以裝飾表格內的儲存格或列。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">表の行またはセルを修飾する属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">表の行またはセルを修飾する属性を示す。</desc>
   <desc versionDate="2009-05-28" xml:lang="fr">fournit des attributs pour mettre en forme les lignes ou les cellules d'un tableau.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos usados para decorar filas o celdas de una tabla.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">assegna degli attributi utilizzati per decorare righe e celle di una tabella</desc>
@@ -5000,8 +5123,7 @@ If no value for the @scheme attribute is provided, then the default assumption s
 in each cell of this row.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 셀에 또는 이 행의 각 셀에 나타난 정보의 종류를 제시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出此儲存格或列當中，各儲存格所包含的資訊類型。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該セル、または当該行中のセルにある情報の種類を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該セル、または当該行中のセルにある情報の種類を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique le type des
       informations contenues dans cette cellule ou dans chaque cellule de cette ligne.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">especifica el tipo de información contenida en la celda en cuestión o en cada una de las celdas de la fila.</desc>
@@ -5014,8 +5136,7 @@ in each cell of this row.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">표지 또는 기술적 정보만 허용</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">僅為標號或描述性資訊。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">etiquetado o información descriptiva solamente.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">記述的情報またはラベルのみ。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">記述的情報またはラベルのみ。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">uniquement des informations relatives au codage ou à la description</desc>
           <desc versionDate="2007-01-21" xml:lang="it">informazione esclusivamente descrittiva o del tipo etichetta</desc>
         </valItem>
@@ -5024,8 +5145,7 @@ in each cell of this row.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">데이터 값</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">數據值。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">valores de datos.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">日付情報。
-</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">日付情報。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">valeurs de données</desc>
           <desc versionDate="2007-01-21" xml:lang="it">valori di dati</desc>
         </valItem>
@@ -5062,8 +5182,7 @@ el atributo <att>role</att> (papel) del elemento padre <gi>row</gi> (fila).</p>
       <desc versionDate="2006-04-17" xml:lang="en">indicates the number of rows occupied by this cell or row.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 셀 또는 행에 의해 사용된 행의 수를 나타낸다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出此儲存格或列所占的列數。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該セルまたは行を含む行の数を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該セルまたは行を含む行の数を示す。</desc>
       <desc versionDate="2009-05-28" xml:lang="fr">indique le nombre de lignes occupées par la cellule ou la ligne en question.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica el número de filas ocupado por una celda o por la fila en cuestión.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica il numero di righe occupate dalla cella o riga in questione</desc>
@@ -5098,8 +5217,7 @@ to use nested tables.</p>
 	row.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 셀 또는 행에 의해 사용된 열의 수를 나타낸다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出此儲存格或列所佔的欄位數。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該セルまたは行を含む列の数を示す。      
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該セルまたは行を含む列の数を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique le nombre de colonnes occupées par cette cellule ou cette ligne.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica el número de columnas que abraza una celda o fila.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica il numero di colonne occupate dalla cella o riga</desc>
@@ -5212,8 +5330,7 @@ to use nested tables.</p>
   <desc versionDate="2007-12-20" xml:lang="ko">원고 또는 유사 원본을 전사할 때 텍스트의 저작 또는 필사 간섭을 부호화하는 요소에 특징적으로 사용되는 속성을 제시한다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">proporciona a los atributos específicos a los elementos que codifican la intervención authorial o scribal en un texto al transcribir el manuscrito o las fuentes similares.</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">手書き資料や同様の資料を転記する場合、著者や筆写者に関する調整を記録
-  する要素に付与される属性を示す。
-</desc>
+  する要素に付与される属性を示す。</desc>
   <desc versionDate="2008-03-30" xml:lang="fr">fournit des attributs spécifiques au codage d'éléments
 relatifs à l'intervention de l'auteur ou du copiste dans un texte lors de la
 transcription de sources manuscrites ou assimilées.</desc>
@@ -5227,8 +5344,7 @@ transcription de sources manuscrites ou assimilées.</desc>
   <!--  <attDef ident="hand" usage="opt">
       <desc versionDate="2007-09-03" xml:lang="en">indicates the hand of the agent which made the intervention.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">간섭을 만든 당사자의 필적을 나타낸다.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該調整を行った主体の筆致を特定する．
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該調整を行った主体の筆致を特定する．</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">signale la main de celui qui est intervenue.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica il responsabile dell'aggiunta o della cancellazione</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica el responsable de la adición o de la omisión.</desc>
@@ -5245,8 +5361,7 @@ transcription de sources manuscrites ou assimilées.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">indica el resultado de una intervención, por ejemplo en el caso de una cancelación, una tachadura que incluyen demasiado o demasiado poco texto, o en el caso de una adición o una inserción que duplica información ya presente en el texto.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該調整の影響を示す。例えば、削除の際、取消線の範囲が多すぎた
       り少なすぎたりする場合や、追加の際、既にあるテキストの部分をコピー
-      して挿入したりする場合。
-</desc>
+      して挿入したりする場合。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">indique la conséquence de l'intervention, par
 exemple dans le cas d'un effacement, une biffure, qui inclut trop ou pas assez de
 texte, ou dans le cas d'un ajout, une insertion, qui reproduit une portion du
@@ -5265,8 +5380,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">중복이 단어 대 단어로 된 것이지, 아니면 중복이 비교적 덜 정확하게 된 것인지 간에, 삽입으로 표시된 모든 텍스트는 원본의 일부 텍스트를 중복한 것임.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">todo el texto indicado como adición duplica un fragmento de texto presente en el original, siendo la duplicación palabra por palabra o algo menos exacta.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは全て、元資料にあるテキストのコピーを追加するも
-      のである。その程度は、語単位であったりそれより小さいこともある。
-</desc>
+      のである。その程度は、語単位であったりそれより小さいこともある。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">tout le texte indiqué comme étant une addition reprend le texte de l'original, que la duplication soit identique mot pour mot ou moins exacte.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">l'intero testo identificato come aggiunta riproduce parte del testo già presente nell'originale, indipendentemente dal fatto che la riproduzione sia esatta (parola per parola) o meno</desc>
         </valItem>
@@ -5276,8 +5390,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">일부 텍스트가 원본의 일부 텍스트를 중복</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la parte del texto marcado como adición duplica un fragmento de texto presente en el original</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該テキストの部分は、元資料にあるテキストのコピーを追加する
-      ものである。
-</desc>
+      ものである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">la partie du texte indiquée comme
 étant un ajout est redondante avec un texte présent dans l'original.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo identificato come aggiunta riproduce parte del testo già presente nell'originale</desc>
@@ -5289,8 +5402,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있지 않았어야 하는데도, 삭제부의 시작에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del principio de una cancelación se marca como suprimido aunque este no lo haya sido claramente.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の始点は、例えそれが明白な削除ではなくとも、マー
-      クされている。
-</desc>
+      クされている。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé au début de la supression est indiqué comme supprimé bien qu'à l'évidence il ne devrait pas l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo all'inizio della cancellazione è identificata come cancellata anche se chiaramente non dovrebbe esserlo</desc>
         </valItem>
@@ -5301,8 +5413,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있지 않았어야 하는데도, 삭제부의 끝에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del final de una cancelación se marca como suprimido aunque este no lo haya sido claramente.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の終点は、例えそれが明白な削除ではなくとも、マー
-      クされている。
-</desc>
+      クされている。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé à la fin de la supression est indiqué comme supprimé bien qu'à l'évidence il ne devrait pas l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo alla fine della cancellazione è identificata come cancellata anche se chiaramente non dovrebbe esserlo</desc>
         </valItem>
@@ -5312,8 +5423,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있어야 하는데도, 삭제부의 시작에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있지 않다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del inicio de la cancelación no se marca como suprimido aunque claramente haya sido suprimido.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の始点は、例えそれが明白な削除ではなくとも、マー
-      クされていない。
-</desc>
+      クされていない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé au début de la supression n'est pas indiqué comme supprimé bien qu'à l'évidence il devrait l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo all'inizio della cancellazione non è identificata come cancellata anche se chiaramente dovrebbe esserlo</desc>
         </valItem>
@@ -5323,8 +5433,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있어야 하는데도, 삭제부의 끝에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있지 않다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto del final de la cancelación no se marca como suprimido aunque claramente haya sido suprimido.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分の終点は、例えそれが明白な削除ではなくとも、マー
-      クされていない。
-</desc>
+      クされていない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte situé à la fin de la supression n'est pas indiqué comme supprimé bien qu'à l'évidence il devrait l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo alla fine della cancellazione non è identificata come cancellata anche se chiaramente dovrebbe esserlo</desc>
         </valItem>
@@ -5334,8 +5443,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">분명히 그렇게 되어 있어야 하는데도, 삭제부에 있는 어떤 텍스트가 삭제된 것으로 표지되어 있지 않다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un fragmento de texto de la cancelación no se marca como suprimido aunque claramente haya sido suprimido.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分は、例えそれが明白な削除ではなくとも、マークされ
-      ていない。
-</desc>
+      ていない。</desc>
           <desc versionDate="2009-05-28" xml:lang="fr">un passage du texte dans la supression n'est pas indiqué comme disparu bien qu'à l'évidence il devrait l'être.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">una parte del testo all'interno della cancellazione non è identificata come cancellata anche se chiaramente dovrebbe esserlo</desc>
         </valItem>
@@ -5343,8 +5451,7 @@ texte déjà présent.</desc>
           <desc versionDate="2007-09-03" xml:lang="en">the deletion is not faulty.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">삭제가 잘못된 것이 아니다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la cancelación no es defectuosa.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分は、間違いではない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該削除部分は、間違いではない。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">l'indication de suppression n'est pas
 erronée.</desc>
           <desc versionDate="2007-11-06" xml:lang="it">la cancellazione non è erronea</desc>
@@ -5410,8 +5517,7 @@ erronée.</desc>
       the encoded features carrying this attribute are believed to have occurred.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">이 속성을 포함하는 부호화된 자질이 발생했다고 가정되는 순서와 관련된 번호를 할당한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">asigna un número de serie relacionado con el orden en el cual se cree que se han sucedido las características codificadas que llevan este atributo.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該属性が示す素性が出現すると想定されている順番の、番号を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該属性が示す素性が出現すると想定されている順番の、番号を示す。</desc>
       <desc versionDate="2008-03-30" xml:lang="fr">assigne un numéro séquentiel relatif à l'ordre
 dans lequel les traits encodés portant cet attribut sont supposés être apparus.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">stabilisce un numero sequenziale relativo all'ordine in cui si ritiene che ricorrano i tratti codificati ai quali è assegnato tale attributo</desc>
@@ -5774,8 +5880,7 @@ or corporate bodies.</desc>
   <desc versionDate="2007-10-18" xml:lang="en">groups phrase-level elements for simple editorial interventions that may be useful both
 in transcribing and in authoring.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전사와 저작 모두에서 유용할 수 있는 간단한 편집 간섭에 대한 구-층위 요소를 모아 놓는다.</desc>
-  <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集的詞組層次元素用於簡單的編輯更正，且有助於轉錄和編寫
-</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集的詞組層次元素用於簡單的編輯更正，且有助於轉錄和編寫</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">転記や編集の両方で使用される、単純な編集上の調整を示す、句レベルの要
   素をまとめる。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments de niveau expression, utilisés pour de
@@ -6773,13 +6878,11 @@ fin d'une division de texte.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集的元素 (而非選擇本身) 可用於元素<gi>choice</gi>之替換</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">要素<gi>choice</gi>中に現れる(要素<gi>choice</gi>以外の)要素をまとめ る。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments (autres que <gi>choice</gi>) qui
-    peuvent être utilisés en alternance avec <gi>choice</gi>
-   </desc>
+    peuvent être utilisés en alternance avec <gi>choice</gi></desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa los elementos (excluída el propio elemento
-    "choice") que pueden ser usados en alternancia con <gi>choice</gi>.</desc>
+    <q>choice</q>) que pueden ser usados en alternancia con <gi>choice</gi>.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa gli elementi (escluso l'elemento choice) che
-    possono essere usati in alternanza con <gi>choice</gi>
-   </desc>
+    possono essere usati in alternanza con <gi>choice</gi></desc>
   <classes/>
   <listRef>
     <ptr target="#COED"/>
@@ -7087,6 +7190,19 @@ class <term>chunks</term>.</p>
     <ptr target="#STEC"/>
   </listRef>
 </classSpec>
+<classSpec ident="model.cmc" type="model" module="tei">
+    <desc xml:lang="en" versionDate="2021-09-07">includes the CMC-specific element <gi>post</gi> and
+        makes it available on the divPart level. This allows for
+        using (and combining) occurrences of <gi>post</gi>,
+        <gi>u</gi>, <gi>incident</gi>, and <gi>kinesic</gi> in one
+        and the same <gi>div</gi> in order to be able to represent
+        the combined use of written and spoken posts, utterances,
+        and nonverbal acts on the GUI of multimodal CMC
+        environments.</desc>
+    <classes>
+        <memberOf key="model.common"/>
+    </classes>
+</classSpec>
 <classSpec module="tei" xml:id="COMMON" type="model" ident="model.common">
   <desc versionDate="2005-10-10" xml:lang="en">groups common chunk- and inter-level elements.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">공통적인 덩어리 및 상호 층위 요소를 모아 놓는다.</desc>
@@ -7588,7 +7704,7 @@ used for transcribing extant documents.</desc>
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressing a probability.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">확률을 표현하는 속성 값의 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義表示可能性的屬性值範圍</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">出現度を示す属性値の範囲を定義する。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">出現度を示す属性値の範囲を定義する。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs exprimant une
     probabilité.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que exprimen un
@@ -7620,7 +7736,7 @@ used for transcribing extant documents.</desc>
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for numeric values.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">수치에 사용되는 속성 값의 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義用於數值的屬性值範圍</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">数値をとる属性値の範囲を定義する。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">数値をとる属性値の範囲を定義する。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attributs utilisées pour
     des valeurs numériques</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos para valores
@@ -7707,8 +7823,7 @@ used for transcribing extant documents.</desc>
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used for a non-negative
 integer value used as a count.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">계산으로 사용된 음이 아닌 정수 값의 속성 값 범위를 정의한다.</desc>
-  <desc versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍，用於作為總數的非負整數值
-</desc>
+  <desc versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍，用於作為總數的非負整數值</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">非負整数値を採る属性値の範囲を定義する。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs des attributs exprimant une valeur entière et non négative  utilisé pour des calculs.</desc>
@@ -7933,7 +8048,7 @@ value.</desc>
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values used to express a truth value which may be unknown.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">알려지지 않을 수 있는 진리값을 표현하는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍表示一個可能未知的真實值</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">不明の場合もある真偽値をとる属性値の範囲を定義する。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">不明の場合もある真偽値をとる属性値の範囲を定義する。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des
   valeurs d'attributs exprimant une vérité potentiellement inconnue.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
@@ -8249,8 +8364,7 @@ value.</desc>
       W3C.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos usados para
     indicar los nombres de los espacios en XML como establecen las recomendaciones técnicas del W3C
-    para los <ptr target="https://www.w3.org/TR/1999/REC-xml-names-19990114/"/>
-   </desc>
+    para los <ptr target="https://www.w3.org/TR/1999/REC-xml-names-19990114/"/></desc>
   <desc versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per
     indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
     <ref target="https://www.w3.org/TR/1999/REC-xml-names-19990114/">spazi dei nomi in XML</ref>.</desc>
@@ -8631,7 +8745,7 @@ which contain an XPath expression.</desc>
   <desc versionDate="2007-10-18" xml:lang="en">defines the range of attribute values expressed as an XML Name.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">XML 이름으로 표현되는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍以XML名稱或識別符碼表示</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">XML名前としてある属性値の範囲を定義する。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">XML名前としてある属性値の範囲を定義する。</desc>
   <desc versionDate="2009-05-29" xml:lang="fr">définit la gamme des valeurs d'attribut exprimant
     un nom XML</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos expresados como
@@ -8733,7 +8847,7 @@ which contain an XPath expression.</desc>
     the sex of an organism.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">인간 또는 동물의 성을 식별하는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">定義的屬性值範圍用以識別人類或動物的性別</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">人間または動物の性を示す属性値の範囲を定義する。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">人間または動物の性を示す属性値の範囲を定義する。</desc>
   <desc versionDate="2022-05-10" xml:lang="fr">définit la gamme des valeurs d'attributs employés
     pour identifier le sexe d’un organisme.</desc>
   <desc versionDate="2022-05-10" xml:lang="es">define la gama de valores de atributos usados para
@@ -9995,6 +10109,7 @@ distribution of a text.</desc>
     <memberOf key="model.nameLike"/>
     <memberOf key="model.publicationStmtPart.detail"/>
     <memberOf key="model.personPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
 
@@ -10056,12 +10171,11 @@ distribution of a text.</desc>
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="ISBN">
           <desc versionDate="2016-07-02" xml:lang="en">International Standard Book Number: a 13- or
             (if assigned prior to 2007) 10-digit identifying number assigned by the publishing
-            industry to a published book or similar item, registered with the <ref target="https://www.isbn-international.org"> International ISBN Agency.</ref>
-          </desc>
+            industry to a published book or similar item, registered with the <ref target="https://www.isbn-international.org"> International ISBN Agency.</ref></desc>
         </valItem>
         <valItem ident="ISSN">
           <desc versionDate="2016-07-02" xml:lang="en">International Standard Serial Number: an
@@ -10605,17 +10719,17 @@ définissant les droits d'utilisation.</desc>
   <gloss versionDate="2007-11-06" xml:lang="it">descrizione della fonte</gloss>
     <gloss versionDate="2016-11-17" xml:lang="de">Beschreibung der Quellen</gloss>
   <desc versionDate="2008-12-09" xml:lang="en">describes the source(s) from which an electronic text was derived or generated, typically a
-    bibliographic description in the case of a digitized text, or a phrase such as "born digital"
+    bibliographic description in the case of a digitized text, or a phrase such as <q>born digital</q>
     for a text which has no previous existence.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">décrit la source à partir de laquelle un texte électronique a été
     dérivé ou produit, habituellement une description bibliographique pour un texte numérisé, ou une
-    expression comme "document numérique natif " pour un texte qui n'a aucune existence précédente.</desc>
+    expression comme <q>document numérique natif</q> pour un texte qui n'a aucune existence précédente.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전자 파일을 생성하거나 도출한 원전 텍스트에 대한 기술을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供所製電子文件的一個或數個來源文件的書目描述。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">電子テキストが作られた元テキストの情報を示す。</desc>
     <desc versionDate="2016-11-17" xml:lang="de">beschreibt die Quelle, von der sich der elektronische Text ableitet. 
         Üblicherweise eine bibliografische Beschreibung im Falle eines digitalisierten Textes oder eine Bezeichnung wie 
-        "born digital" für einen nur in elektronischer Form vorliegenden Text.  </desc>
+        <q>born digital</q> für einen nur in elektronischer Form vorliegenden Text.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona una descripción del texto (o textos) fuente
     del que un texto electrónico deriva o ha sido generado.</desc>
   <desc versionDate="2007-01-21" xml:lang="it"> fornisce una descrizione relativa alla o alle fonti da
@@ -10694,6 +10808,7 @@ définissant les droits d'utilisation.</desc>
     <memberOf key="att.declarable"/>
     <memberOf key="att.sortable"/>
     <memberOf key="att.docStatus"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate>
@@ -12466,7 +12581,7 @@ the target element</desc>
         syntax defined in <ptr target="#XSLT3"/> which identifies a set of nodes which are 
         citable structural components. The expression may be absolute (beginning with <code>/</code>) or relative. 
         <att>match</att> on a <gi>citeStructure</gi> without a <gi>citeStructure</gi> parent must be an absolute XPath. If it is
-        relative, its context is set by the <att>match</att> of the parent <gi>citeStructure</gi>. </desc>
+        relative, its context is set by the <att>match</att> of the parent <gi>citeStructure</gi>.</desc>
       <datatype>
         <dataRef key="teidata.xpath"/>
       </datatype>
@@ -13771,13 +13886,13 @@ codes used elsewhere in the text.</desc>
     </attDef>
 
   
-      <attDef ident="fromUnit" mode="add" usage="req">
+      <attDef ident="fromUnit" usage="req">
       <desc versionDate="2019-06-26" xml:lang="en">indicates a source unit of measure that is to be converted into another unit indicated in <att>toUnit</att>.</desc>
       <datatype>
         <dataRef key="teidata.pointer"/>
       </datatype>
     </attDef>
-    <attDef ident="toUnit" mode="add" usage="req">
+    <attDef ident="toUnit" usage="req">
       <desc versionDate="2019-06-26" xml:lang="en">the target unit of measurement for a conversion from a source unit referenced in <att>fromUnit</att>.</desc>
       <datatype>
         <dataRef key="teidata.pointer"/>
@@ -14238,7 +14353,7 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
   <desc versionDate="2012-12-27" xml:lang="en">contains a summary or formal
     abstract prefixed to an existing source document by the encoder.</desc>
   <desc versionDate="2018-09-08" xml:lang="es">Contiene un resumen o abstract formal prefijado a una fuente documental por el codificador.</desc>
-  <desc versionDate="2021-10-21" xml:lang="it">contiene un riepilogo o <foreign>abstract</foreign> formale aggiunto, in testa a un dato documento di origine, da chi codifica.   </desc>
+  <desc versionDate="2021-10-21" xml:lang="it">contiene un riepilogo o <foreign>abstract</foreign> formale aggiunto, in testa a un dato documento di origine, da chi codifica.</desc>
   <desc versionDate="2021-10-20" xml:lang="de">enthält eine (formale) Zusammenfassung, die einem bestehenden Quelldokument vorangestellt wird.</desc>
   <desc versionDate="2018-12-18" xml:lang="ja">符号化する人によって既存の元文書の前に付加された要約または正式な要約を含む。</desc>
   <classes>
@@ -14627,8 +14742,7 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集以標準分類架構、索引典等來描述文件性質或主題的資訊。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">標準的な分類スキーム、分類語彙などにより、テキストの性格や話題を示す 情報をまとめる。</desc>
   <desc versionDate="2016-11-24" xml:lang="de">gruppiert Informationen über Art oder Thematik eines Textes unter 
-      Bezug auf ein Standard-Klassifikationsschema, einen Thesaurus o. ä.
-  </desc>
+      Bezug auf ein Standard-Klassifikationsschema, einen Thesaurus o. ä.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">agrupa información que describe la naturaleza o la
     temática de un texto en términos de un esquema de clasificación estándard.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa le informazioni che descrivono la natura o
@@ -14912,8 +15026,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">標明該分類架構，其中相關的類目群組已被定義</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">たとえば<gi>taxonomy</gi>要素あるいはその他の資料によって、当該分類項目が定義されている分類スキームを同定する。</desc>
         <desc versionDate="2016-11-24" xml:lang="de">gibt das Klassifikationsschema an, in dem die entsprechenden Kategorien definiert sind, 
-            z. B. über ein <gi>taxonomy</gi>-Element oder eine andere Ressource. 
-        </desc>
+            z. B. über ein <gi>taxonomy</gi>-Element oder eine andere Ressource.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica el esquema de clasificación al interno del
         cual se define una serie de categorias referidas.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">identifica lo schema di classificazione all'interno
@@ -15284,8 +15397,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
   description of the place, the name of a person/organization and the
   date related to the sending/receiving of a message or any other
   action related to the correspondence.</desc>
-	<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信・受信をはじめとする書簡に関する所作についての場所、人名／組織名、日付の構造的記述を含む。
-	</desc>
+	<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信・受信をはじめとする書簡に関する所作についての場所、人名／組織名、日付の構造的記述を含む。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -15301,38 +15413,32 @@ should be supplied for the <att>scheme</att> attribute.</p>
   <attList>
     <attDef ident="type" mode="change" usage="opt">
       <desc versionDate="2015-01-29" xml:lang="en">describes the nature of the action.</desc>
-	    <desc versionDate="2022-06-02" xml:lang="ja">（書簡に関する）所作の性質を記述する。
-	    </desc>
+	    <desc versionDate="2022-06-02" xml:lang="ja">（書簡に関する）所作の性質を記述する。</desc>
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="sent">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the sending or dispatch of a message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信や発送に関する情報。
-	    </desc>
+		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの送信や発送に関する情報。</desc>
         </valItem>
         <valItem ident="received">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the receipt of a message.</desc>
-		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの受信に関する情報。
-	    </desc>
+		<desc versionDate="2022-06-02" xml:lang="ja">メッセージの受信に関する情報。</desc>
         </valItem>
         <valItem ident="transmitted">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the transmission of a message, i.e. between the dispatch and the next receipt, redirect or forwarding.</desc>
-          <desc versionDate="2024-03-07" xml:lang="ja">メッセージの伝達手段に関する情報。発信とその後の受信・転送等の間の情報。
-	    </desc>
+          <desc versionDate="2024-03-07" xml:lang="ja">メッセージの伝達手段に関する情報。発信とその後の受信・転送等の間の情報。</desc>
 	      </valItem>
         <valItem ident="redirected">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  redirection of an unread message.</desc>
-          <desc versionDate="2024-03-07" xml:lang="ja">〔開封せずに〕未読のままに転送されるメッセージに関する情報。
-	    </desc>
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封せずに〕未読のままに転送されるメッセージに関する情報。</desc>
         </valItem>
         <valItem ident="forwarded">
           <desc versionDate="2015-02-09" xml:lang="en">information concerning the
 	  forwarding of a message.</desc>
-          <desc versionDate="2024-03-07" xml:lang="ja">〔開封後の〕メッセージの転送に関する情報。
-	    </desc>
+          <desc versionDate="2024-03-07" xml:lang="ja">〔開封後の〕メッセージの転送に関する情報。</desc>
         </valItem>
       </valList>
     </attDef>
@@ -15419,6 +15525,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
     <memberOf key="att.declarable"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.teiHeaderPart"/>
+    <memberOf key="model.standOffPart"/>
   </classes>
   <content>
     <alternate>
@@ -15826,7 +15933,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
       <gloss versionDate="2016-11-25" xml:lang="de">Ziel</gloss>
       <gloss versionDate="2023-10-02" xml:lang="ja">対象</gloss>
       <desc versionDate="2011-10-31" xml:lang="en">points to one or more elements that belong to this change.</desc>
-      <desc versionDate="2016-11-25" xml:lang="de">verweist auf ein oder mehrere Elemente, die zu dieser Änderung gehören.  </desc>
+      <desc versionDate="2016-11-25" xml:lang="de">verweist auf ein oder mehrere Elemente, die zu dieser Änderung gehören.</desc>
       <desc versionDate="2023-10-02" xml:lang="ja">この変更の対象となる一つ以上の要素を指す。</desc>
       <datatype minOccurs="1" maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
     </attDef>
@@ -15962,6 +16069,7 @@ supplied to printer.</change>
     <memberOf key="att.declaring"/>
     <memberOf key="att.fragmentable"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -16047,6 +16155,7 @@ supplied to printer.</change>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -16147,6 +16256,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -16218,6 +16328,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.hiLike"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -16264,6 +16375,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -16369,6 +16481,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.attributable"/>
     <memberOf key="att.ascribed.directed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -16536,24 +16649,21 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <gloss versionDate="2009-01-06" xml:lang="fr">citation</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">cita</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">citazione</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">contains a phrase or passage attributed by the narrator or author to some agency external
-        to the text.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko"> 해설자 또는 저자에 의해, 텍스트의 외부 주체에 의해 생성된 것이라 밝혀진 구 또는 단락을
-        포함한다.</desc>
+  <desc versionDate="2005-01-14" xml:lang="en">contains a phrase or passage attributed by the narrator or author to some agency external to the text.</desc>
+  <desc versionDate="2007-12-20" xml:lang="ko"> 해설자 또는 저자에 의해, 텍스트의 외부 주체에 의해 생성된 것이라 밝혀진 구 또는 단락을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含敘述者或作者引用自文本以外來源的字 (句) 詞或段落。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">語り手や著者が、当該テキスト外にあるものに向けた、一節を示す。</desc>
-  <desc versionDate="2009-01-06" xml:lang="fr">contient une expression ou un passage que le
-        narrateur ou l'auteur attribue à une origine extérieure au texte.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene una frase o pasaje atribuido por el narrador o
-        autor a un agente externo al texto.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene una frase o un brano attribuito dall'autore o
-        dal narratore a soggetti esterni al testo</desc>
+  <desc versionDate="2009-01-06" xml:lang="fr">contient une expression ou un passage que le narrateur ou l'auteur attribue à une origine extérieure au texte.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene una frase o pasaje atribuido por el narrador o autor a un agente externo al texto.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene una frase o un brano attribuito dall'autore o dal narratore a soggetti esterni al testo</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.quoteLike"/>
+    <memberOf key="model.biblPart"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.msExcerpt"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -16640,6 +16750,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="model.hiLike"/>
     <memberOf key="model.common"/>
     <memberOf key="att.ascribed.directed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -16853,6 +16964,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.typed"/>
     <memberOf key="model.quoteLike"/>
     <memberOf key="model.entryPart.top"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -16983,6 +17095,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -17029,6 +17142,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.emphLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -17095,6 +17209,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.translatable"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.labelLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.limitedContent"/>
@@ -17117,7 +17232,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   </constraintSpec>
   <attList>
     <attDef ident="type" mode="change">
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="deprecationInfo">
           <gloss versionDate="2018-09-14" xml:lang="en">deprecation
           information</gloss>
@@ -17223,6 +17338,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.pointing"/>
     <memberOf key="att.cReferencing"/>
     <memberOf key="model.identEquiv"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -17287,6 +17403,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.canonical"/>
     <memberOf key="att.sortable"/>
     <memberOf key="att.cReferencing"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -17430,7 +17547,8 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
   <memberOf key="att.global"/>
   <memberOf key="att.typed"/>
   <memberOf key="model.phrase"/>
-</classes>
+    <memberOf key="att.cmc"/>
+  </classes>
   <content>
     <sequence>
       <elementRef key="rb" minOccurs="1" maxOccurs="1"/>
@@ -17551,7 +17669,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
           <att>to</att>.</p>
       </remarks>
     </attDef>
-    <attDef ident="from" usage="opt" mode="add">
+    <attDef ident="from" usage="opt">
       <desc xml:lang="en" versionDate="2021-01-06">points to the starting point of the span of text
         being glossed by this ruby text.</desc>
       <desc versionDate="2021-01-31" xml:lang="ja">ルビテキストの対象範囲の始点を示す。</desc>
@@ -17572,7 +17690,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
         </constraint>
       </constraintSpec>
     </attDef>
-    <attDef ident="to" usage="opt" mode="add">
+    <attDef ident="to" usage="opt">
       <desc xml:lang="en" versionDate="2021-01-06">points to the ending point of the span of text
         being glossed.</desc>
       <desc versionDate="2021-01-31" xml:lang="ja">ルビテキストの対象範囲の終点を示す。</desc>
@@ -17640,6 +17758,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
     <memberOf key="model.choicePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <!--    <rng:ref xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -17744,6 +17863,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -17821,6 +17941,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...</egXML>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.editorial"/>
     <memberOf key="model.linePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
 <content>
   <alternate minOccurs="2" maxOccurs="unbounded">
@@ -17942,13 +18063,14 @@ Normalization</head>
         normalizada en algún sentido.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una lettura è stata regolarizzata o
         normalizzata in qualche modo.</desc>
-    <desc versionDate="2016-11-24" xml:lang="de">enthält eine normalisierte Schreibweise einer Textstelle. </desc>
+    <desc versionDate="2016-11-24" xml:lang="de">enthält eine normalisierte Schreibweise einer Textstelle.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <!--    <rng:ref xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -18048,6 +18170,7 @@ Normalization</head>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
     <memberOf key="model.choicePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <!--    <rng:ref xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -18155,6 +18278,7 @@ Normalization</head>
     <memberOf key="att.timed"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
         <alternate minOccurs="0" maxOccurs="unbounded">
@@ -18495,6 +18619,7 @@ Normalization</head>
     <memberOf key="att.placement"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -18586,6 +18711,7 @@ Normalization</head>
     <memberOf key="att.transcriptional"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -18716,6 +18842,7 @@ Normalization</head>
   <gloss xml:lang="en" versionDate="2009-01-06">unclear</gloss>
   <gloss xml:lang="es" versionDate="2022-02-20">poco claro</gloss>
   <gloss versionDate="2009-01-06" xml:lang="fr">incertain</gloss>
+  <gloss versionDate="2024-06-05" xml:lang="de">unklar</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a word, phrase, or passage which cannot be transcribed with certainty because it
         is illegible or inaudible in the source.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원본에서 읽거나 듣기 어려워서 분명하게 전사할 수 없는 단어, 구, 단락들을 포함한다.</desc>
@@ -18723,13 +18850,11 @@ Normalization</head>
   <desc versionDate="2008-04-05" xml:lang="ja">元資料からは判読できないまたは聞こえないという理由で、確実に転記でき ない語句や一節を示す。</desc>
   <desc versionDate="2009-01-06" xml:lang="fr">contient un mot, une expression ou bien un passage qui
         ne peut être transcrit avec certitude parce qu'il est illisible ou inaudible dans la source.</desc>
-  <desc versionDate="2022-02-20" xml:lang="es">contiene una palabra, frase o pasaje que no puede ser transcrito con certeza porque en la fuente es ilegible o inaudible. </desc>
+  <desc versionDate="2022-02-20" xml:lang="es">contiene una palabra, frase o pasaje que no puede ser transcrito con certeza porque en la fuente es ilegible o inaudible.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una parola, una frase o un brano che non può
         essere trascritto con certezza perché è parzialmente illeggibile o incomprensibile
         nell'originale.</desc>
-  <desc versionDate="2016-11-24" xml:lang="de">
-      enthält ein Wort, einen Satz oder eine Textpassage, welche in der Quelle nicht oder nur schwer lesbar bzw. hörbar ist.
-  </desc>
+  <desc versionDate="2016-11-24" xml:lang="de">enthält ein Wort, einen Satz oder eine Textpassage, welche in der Quelle nicht oder nur schwer lesbar bzw. hörbar ist.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.pPart.transcriptional"/>
@@ -18737,7 +18862,8 @@ Normalization</head>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
-   </classes>
+    <memberOf key="att.cmc"/>
+  </classes>
   <content>
     <macroRef key="macro.paraContent"/>
   </content>
@@ -18829,7 +18955,7 @@ usually each word will refer to a single cause.</p>
           <desc versionDate="2007-06-27" xml:lang="en">damage results from rubbing of the leaf edges</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">책장 모서리의 마모로 인한 훼손</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">損毀起因於書頁邊緣摩擦受損</desc>
-          <desc versionDate="2022-02-20" xml:lang="es">Daños resultantes del frotamiento de los bordes de la hoja. </desc>
+          <desc versionDate="2022-02-20" xml:lang="es">Daños resultantes del frotamiento de los bordes de la hoja.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">葉の端がこすれたことによる損傷。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">des dommages résultent du frottement
                         des bords de la feuille</desc>
@@ -18953,6 +19079,7 @@ concerned, as further discussed in section <ptr target="#PHDH"/>.</p>
     <memberOf key="att.datable"/>
     <memberOf key="att.editLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -19044,6 +19171,7 @@ concerned, as further discussed in section <ptr target="#PHDH"/>.</p>
     <memberOf key="att.naming"/>
     <memberOf key="model.nameLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -19092,6 +19220,7 @@ concerned, as further discussed in section <ptr target="#PHDH"/>.</p>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addressLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -19146,6 +19275,7 @@ concerned, as further discussed in section <ptr target="#PHDH"/>.</p>
     <memberOf key="att.global"/>
     <memberOf key="model.addressLike"/>
     <memberOf key="model.publicationStmtPart.detail"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -19442,6 +19572,7 @@ TOURS</addrLine>
   <gloss versionDate="2009-01-06" xml:lang="fr">code postal</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">Código postal</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">Codice di Avviamento Postale</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Postleitzahl</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a numerical or alphanumeric code used as part of a postal address to simplify
         sorting or delivery of mail.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">우편의 분류 및 배달을 용이하도록 우편 주소의 일부로 사용되는 숫자 또는 문자와 숫자가 혼용된
@@ -19454,6 +19585,8 @@ TOURS</addrLine>
         parte de la dirección postal para simplificar la clasificación o entrega de correo.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene il codice alfanumerico utilizzato
         nell'indirizzo postale per semplificare l'ordine e la distribuzione della posta.</desc>
+  <desc versionDate="2024-04-11" xml:lang="de">enthält einen numerischen oder alphanumerischen Schlüssel,
+        der als Teil einer Postadresse zur Vereinfachung der Sortierung oder Zustellung von Postsendungen verwendet wird.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addrPart"/>
@@ -19513,6 +19646,7 @@ TOURS</addrLine>
   <gloss versionDate="2009-01-06" xml:lang="fr">boîte postale</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">buzón</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">Casella postale</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Postfach</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a number or other identifier for some postal delivery point other than a street
     address.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">주소 이외의 우편 배달 지점을 위한 숫자 또는 다른 확인소를 포함한다.</desc>
@@ -19524,6 +19658,8 @@ TOURS</addrLine>
     de entrega postal distinto a una dirección postal.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene il numero o altro identificatore per un luogo di
     consegna della posta diverso da un indirizzo postale.</desc>
+  <desc versionDate="2024-04-11" xml:lang="de">enthält eine Nummer oder eine andere Kennung für eine Postanschrift,
+    bei der es sich nicht um eine Straßenadresse handelt.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addrPart"/>
@@ -19594,6 +19730,7 @@ Measures</head>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
     <memberOf key="att.ranging"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -19609,7 +19746,7 @@ Measures</head>
       <desc versionDate="2007-01-21" xml:lang="it">indica il tipo di valore numerico</desc>
       <desc versionDate="2016-11-25" xml:lang="de">bestimmt die Art des numerischen Wertes.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="cardinal">
           <desc versionDate="2007-06-27" xml:lang="en">absolute number, e.g. 21, 21.5</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">예를 들어, 21, 21.5와 같은 절대값</desc>
@@ -19763,6 +19900,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
     <memberOf key="att.measurement"/>
+    <memberOf key="att.cmc"/>
     <memberOf key="att.ranging"/>
   </classes>
   <content>
@@ -19877,6 +20015,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.measurement"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -19993,14 +20132,13 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
 <elementSpec module="core" ident="unit">
   <desc versionDate="2018-07-17" xml:lang="en">contains a symbol, a word or a phrase referring to a unit of measurement in any kind of formal or informal system.</desc>
   <desc versionDate="2018-07-17" xml:lang="de">enthält ein Symbol, ein Wort oder eine Phrase, die sich auf eine Maßeinheit in einem formellen oder informellen System bezieht.</desc>
-    <desc versionDate="2023-07-29" xml:lang="ja">
-        公式・非公式に関わらず、単位を表す記号や単語、語句を含む。
-       </desc>
+  <desc versionDate="2023-07-29" xml:lang="ja">公式・非公式に関わらず、単位を表す記号や単語、語句を含む。</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.measureLike"/>
     <memberOf key="att.measurement"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
      <macroRef key="macro.phraseSeq"/>
@@ -20083,6 +20221,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>    
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -20175,6 +20314,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.editLike"/>
     <memberOf key="att.dimensions"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -20225,6 +20365,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="model.pPart.editorial"/>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -20246,7 +20387,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
                 l'abbreviazione secondo una tipologia funzionale.</desc>
       <desc versionDate="2016-11-25" xml:lang="de">erlaubt es, die Abkürzung nach einer geeigneten Typologie zu klassifizieren.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="suspension">
           <gloss xml:lang="en" versionDate="2017-06-25">suspension</gloss>
           <gloss versionDate="2017-06-25" xml:lang="de">Suspension</gloss>
@@ -20496,6 +20637,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="model.pPart.editorial"/>
     <memberOf key="model.choicePart"/>
     <memberOf key="att.editLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -20587,6 +20729,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.typed"/>
     <memberOf key="model.annotationPart.body"/>
     <memberOf key="model.ptrLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <constraintSpec scheme="schematron" ident="ptrAtts">
@@ -20633,6 +20776,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.typed"/>
     <memberOf key="model.annotationPart.body"/>
     <memberOf key="model.ptrLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -20703,6 +20847,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.sortable"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.listLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <!-- 	    <rng:zeroOrMore>
               <rng:ref name="model.global"/>
@@ -20785,7 +20930,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
       <desc versionDate="2014-07-29" xml:lang="en">describes the nature of the items in the list.</desc>
       <desc versionDate="2016-11-25" xml:lang="de">beschreibt die Art der Listenpunkte.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="gloss">
           <gloss xml:lang="en" versionDate="2017-06-25">gloss</gloss>
           <gloss versionDate="2017-06-25" xml:lang="de">Gloss</gloss>
@@ -21235,6 +21380,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
     <memberOf key="att.placement"/>
     <memberOf key="att.written"/>
     <memberOf key="model.labelLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -21579,6 +21725,7 @@ entre les Romains.</label>
     <memberOf key="att.written"/>
     <memberOf key="model.headLike"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -21870,6 +22017,7 @@ entre les Romains.</label>
     <memberOf key="model.correspActionPart"/>
     <memberOf key="model.correspContextPart"/>
     <memberOf key="model.annotationPart.body"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -22003,6 +22151,7 @@ psychological significance.
     <memberOf key="model.correspDescPart"/>
     <memberOf key="model.correspActionPart"/>
     <memberOf key="model.correspContextPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -22060,6 +22209,7 @@ psychological significance.
     <memberOf key="att.global"/>
     <memberOf key="model.global.meta"/>
     <memberOf key="att.spanning"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -22125,6 +22275,7 @@ psychological significance.
     <memberOf key="att.resourced"/>
     <memberOf key="att.declaring"/>
     <memberOf key="att.timed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -22204,9 +22355,10 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.resourced"/>
     <memberOf key="att.declaring"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
-       <classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>   
+    <classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>   
   </content>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
@@ -22304,8 +22456,7 @@ the resource specified by the <att>url</att> attribute.</p>
   </remarks>
   <listRef>
     <ptr target="#COGR" type="div2"/>
-    <ptr target="#PHFAX" type="div2"/>
-    
+    <ptr target="#PHFAX" type="div2"/>    
   </listRef>
 </elementSpec>
 <elementSpec module="core" xml:id="BINARYOBJECT" ident="binaryObject">
@@ -22327,6 +22478,7 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.media"/>
     <memberOf key="att.timed"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <textNode/>
@@ -22403,6 +22555,7 @@ Elements</head>
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <!-- MDH 2012-07-15: Attribute @unit moved to att.milestoneUnit; milestone and refState are now members of 
@@ -22470,6 +22623,7 @@ milestones for line numbers. -->
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
     <memberOf key="att.edition"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -22519,6 +22673,7 @@ milestones for line numbers. -->
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -22646,6 +22801,7 @@ milestones for line numbers. -->
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -22780,6 +22936,7 @@ soi-<lb break="no"/>xante &amp; dixhuytiesme livre.
     <memberOf key="att.edition"/>
     <memberOf key="att.spanning"/>
     <memberOf key="att.breaking"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -23659,6 +23816,7 @@ places, in particular where  multiple names are given.</p>
     <memberOf key="model.msQuoteLike"/>
     <memberOf key="att.canonical"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -23918,7 +24076,7 @@ doit pas être utilisé.</p>
                                         una tipologia conveniente.</desc>
       <desc versionDate="2017-06-04" xml:lang="de">klassifiziert den Titel entsprechend einer geeigneten Typologie.</desc> 
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="main">
           <desc versionDate="2007-06-27" xml:lang="en">main title</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">(주)제목</desc>
@@ -24174,6 +24332,7 @@ epistemology, methodology and history of
     <memberOf key="att.canonical"/>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.respLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.limitedContent"/>
@@ -24629,6 +24788,7 @@ epistemology, methodology and history of
     <!--    <memberOf key="model.personPart"/>-->
     <memberOf key="att.sortable"/>
     <memberOf key="att.docStatus"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -24747,6 +24907,7 @@ epistemology, methodology and history of
     <memberOf key="att.typed"/>
     <memberOf key="att.sortable"/>
     <memberOf key="att.docStatus"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -24880,6 +25041,7 @@ epistemology, methodology and history of
     <!--memberOf key="model.msItemPart"/-->
     <!-- model.listLike is incompatible with membership in model.biblLike since both are referenced from macro.inter -->
     <memberOf key="model.biblLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -25083,6 +25245,7 @@ epistemology, methodology and history of
     <memberOf key="att.metrical"/>
     <memberOf key="att.enjamb"/>
     <memberOf key="att.fragmentable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -25145,6 +25308,7 @@ epistemology, methodology and history of
     <memberOf key="att.divLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.declaring"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -25511,6 +25675,7 @@ epistemology, methodology and history of
     <memberOf key="att.placement"/>
     <memberOf key="att.written"/>
     <memberOf key="model.stageLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.specialPara"/>
@@ -25735,10 +25900,8 @@ by the stage direction.</p>
   <desc versionDate="2017-06-13" xml:lang="de">enthält ein einzelnes TEI-konformes Dokument, das aus einem einzigen TEI-Header und einem oder
     mehreren Mitgliedern der <ident type="class">model.resource</ident>-Klasse besteht. Mehrere
     <gi>TEI</gi>-Elemente können in einem <gi>teiCorpus</gi>-Element zusammengefasst werden.</desc>
-  <desc versionDate="2022-06-02" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando un solo encabezado TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar al interno de un elemento <gi>TEI</gi> o <gi>teiCorpus</gi>.
-</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene un documento TEI-conforme, comprendente un'intestazione e un testo, sia esso isolato o parte di un elemento <gi>teiCorpus</gi>
-   </desc>
+  <desc versionDate="2022-06-02" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando un solo encabezado TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar al interno de un elemento <gi>TEI</gi> o <gi>teiCorpus</gi>.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene un documento TEI-conforme, comprendente un'intestazione e un testo, sia esso isolato o parte di un elemento <gi>teiCorpus</gi></desc>
   <classes>
     <memberOf key="model.describedResource"/>
     <memberOf key="att.global"/>
@@ -26568,6 +26731,7 @@ by the stage direction.</p>
     <memberOf key="model.attributable"/>
     <memberOf key="att.declaring"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -27838,7 +28002,7 @@ by the stage direction.</p>
       <desc versionDate="2007-05-04" xml:lang="es">especifica que tipo de divisón de texto generada aparece (p.ej. índice, tabla de contenidos, etc.)</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica quale tipo di partizione testuale generata (ad esempio indice, sommario, ecc.) apparirà</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="index">
           <desc versionDate="2007-06-27" xml:lang="en">an index is to be generated and inserted at this point.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">색인은 이 지점에서 생성되고 삽입된다.</desc>
@@ -28043,6 +28207,7 @@ by the stage direction.</p>
     <memberOf key="att.placement"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -28118,6 +28283,7 @@ on its title page or at the head or end of the work.</desc>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -28263,6 +28429,7 @@ it may optionally be tagged using the <gi>docAuthor</gi> element.</p>
     <memberOf key="att.global"/>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <!-- MDH 2013-11-11: per http://sourceforge.net/p/tei/feature-requests/472/ adding 
@@ -28365,6 +28532,7 @@ it may optionally be tagged using the <gi>docAuthor</gi> element.</p>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -28422,7 +28590,7 @@ Tubes formed by Lightning — House struck</p>
   the start or end of a section or on a title page.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">절 또는 장의 시작, 또는 제목 페이지에 나타나는 인용, 작자미상, 또는 추정을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一段匿名或署名引文，出現在段落或章節的開頭，或在題名頁中。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">章や節の始め、タイトルページなどにある引用(題辞)を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">章や節の始め、タイトルページなどにある引用(題辞)を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient une citation, anonyme ou attribuée et qui apparaît au
     début d’une section ou d’un chapitre ou sur une page de titre.</desc>
   <desc versionDate="2017-06-13" xml:lang="de">enthält ein anonymes oder jemandem zugeschriebenes Zitat, das am Beginn eines Abschnitts,
@@ -28436,6 +28604,7 @@ Tubes formed by Lightning — House struck</p>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -28502,6 +28671,7 @@ Tubes formed by Lightning — House struck</p>
     <memberOf key="att.global"/>
     <memberOf key="model.divTopPart"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -28602,6 +28772,7 @@ aparecen en la última sección al final de una división, especialmente en una
     <memberOf key="att.global"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -28729,6 +28900,7 @@ aparecen en la última sección al final de una división, especialmente en una
     <memberOf key="att.global"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divWrapper"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -28776,6 +28948,7 @@ dedicatory epistle, or other division of a text.</desc>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
     <memberOf key="model.divTopPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -28824,6 +28997,7 @@ lettre.</desc>
     <memberOf key="att.global"/>
     <memberOf key="att.written"/>
     <memberOf key="model.divBottomPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -29171,7 +29345,7 @@ indicated on a title page.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica il ruolo di tale sezione o partizione all'interno del titolo</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>main</defaultVal>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="main">
           <gloss xml:lang="en" versionDate="2017-06-19">main</gloss>
           <gloss versionDate="2017-06-19" xml:lang="de">Haupttitel</gloss>
@@ -29312,6 +29486,7 @@ title page (often but not always contained in a byline).</desc>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.pLike.front"/>
     <memberOf key="att.canonical"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -29628,6 +29803,7 @@ reserved for the element likely to be used more often.</p>
     <memberOf key="model.titlepagePart"/>
     <memberOf key="model.divWrapper"/>
     <memberOf key="model.pLike.front"/>
+    <memberOf key="att.cmc"/>
     <memberOf key="att.datable"/>
     <memberOf key="att.calendarSystem"/>
   </classes>
@@ -30444,8 +30620,7 @@ otherwise available in the document character set-->.</desc>
   <desc versionDate="2005-01-14" xml:lang="en">contains one or more
 	 characters which are related to the parent character or glyph
 	 in some respect, as specified by the <att>type</att>
-	 attribute.
-</desc>
+	 attribute.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko"><att>type</att> 상위 문자 또는 그림 문자와 관련된 하나 이상의 문자들을 포함한다. 속성으로 명시된다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含與父文字或字體在某方面有所關聯的一個或多個文字，在屬性<att>type</att>中加以說明。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">属性<att>type</att>で示される、親文字またはグリフと関連する、ひとつ
@@ -31782,7 +31957,7 @@ and <val>simplified</val>  for simplified characters. The
 </elementSpec>
 <classSpec ident="att.gaijiProp" module="gaiji" type="atts">
   <desc versionDate="2020-01-28" xml:lang="en">provides attributes for defining the properties of
-  non-standard characters or glyphs. </desc>
+  non-standard characters or glyphs.</desc>
   <desc versionDate="2020-01-28" xml:lang="de">liefert Attribute zur Definition der Eigenschaften
   von nicht standardisierten Zeichen und Glyphen.</desc>
   <desc versionDate="2020-02-05" xml:lang="it">fornisce attributi per definire le proprietà di caratteri o glifi non standard</desc>
@@ -32040,8 +32215,7 @@ and <val>simplified</val>  for simplified characters. The
       <desc versionDate="2007-05-12" xml:lang="en">declaration applies to the rhyme scheme recorded on the <att>rhyme</att> attribute</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">선언은 <att>rhyme</att> 속성에 기록된 운 스키마에 적용한다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la declaración se aplica al esquema de rima
-            registrado en el atributo <att>rima</att>
-               </desc>
+            registrado en el atributo <att>rima</att></desc>
           <desc versionDate="2008-04-05" xml:lang="ja">属性<att>rhyme</att>にある押韻スキームに該当する。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">la déclaration s'applique à la structure métrique
             abstraite <!--A VALIDER : au schéma de rimes décrit dans-->notée par l'attribut
@@ -32468,8 +32642,7 @@ user-defined alternative notations.</p>
           <desc versionDate="2007-12-20" xml:lang="ko">행이 끝을 맺는다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該詩句在行尾結束</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el verso contiene un punto y final.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該行が、最終である。	  
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該行が、最終である。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le vers se termine à la fin de la
 ligne</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il verso finisce a fine riga</desc>
@@ -32590,8 +32763,7 @@ enjambement is not of particular interest.</p>
       <desc versionDate="2008-04-05" xml:lang="ja">当該押韻が起こる韻スキーム部分を特定するラベルを示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">donne une étiquette pour identifier à quelle shéma
         métrique correspond cette alternance de rimes.</desc>
-      <desc versionDate="2022-06-30" xml:lang="es">proporciona una etiqueta (normalmente una sola letra) que identifica qué parte del esquema métrico ejemplifica esta cadena de caracteres en cuestión.
-</desc>
+      <desc versionDate="2022-06-30" xml:lang="es">proporciona una etiqueta (normalmente una sola letra) que identifica qué parte del esquema métrico ejemplifica esta cadena de caracteres en cuestión.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">fornisce un'etichetta che identifica quale parte
         dello schema rimico è rappresentata dalla stringa in questione</desc>
       <datatype><dataRef key="teidata.word"/></datatype>
@@ -32854,6 +33026,7 @@ enjambement is not of particular interest.</p>
 <elementSpec module="drama" ident="prologue">
   <gloss xml:lang="en" versionDate="2007-06-12">prologue</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">prologue</gloss>
+  <gloss versionDate="2023-08-08" xml:lang="de">Prolog</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the prologue to a drama, typically spoken by an actor out of character, possibly in
     association with a particular performance or venue.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전형적으로 등장인물들 중 하나가 말하는, 때로는 특정 공연 또는 행위의 현장과 관련된, 드라마의
@@ -33211,6 +33384,7 @@ enjambement is not of particular interest.</p>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">角色清單</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">reparto</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">distribution </gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Besetzungsliste</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">elenco dei personaggi</gloss>
   <gloss versionDate="2023-10-02" xml:lang="ja">配役リスト</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a single cast list or dramatis personae.</desc>
@@ -33753,13 +33927,13 @@ either a single role or a list of non-speaking roles.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica la voce della lista dei personaggi</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>role</defaultVal>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="role">
           <desc versionDate="2007-06-27" xml:lang="en">the item describes a single role.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">항목이 하나의 배역을 기술한다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該項目為單一角色</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el elemeto describe un único papel.</desc>
-          <desc versionDate="2023-10-02" xml:lang="ja">ひとつの役を示す。	</desc>
+          <desc versionDate="2023-10-02" xml:lang="ja">ひとつの役を示す。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">l'item décrit un simple rôle.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">l'oggetto descrive un solo ruolo.</desc>
         </valItem>
@@ -34125,7 +34299,7 @@ young man would present to his lady love. It makes me blush!
       <desc versionDate="2007-01-21" xml:lang="it">indica il tipo di movimento, ad esempio come entrata
         o uscita.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="entrance">
           <desc versionDate="2007-06-27" xml:lang="en">character is entering the stage.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">등장인물이 무대에 등장하고 있다.</desc>
@@ -34603,6 +34777,7 @@ Out the window the body of a dead man suddenly slams into frame
 <elementSpec module="drama" ident="caption">
   <gloss versionDate="2007-06-12" xml:lang="en">caption</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">sous-titre</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Beschriftung</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains the text of a caption or other text displayed as part of
 a film script or screenplay.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">영화 스크립트 또는 시나리오의 일부로서 제시되는 자막 또는 다른 텍스트를 포함한다.</desc>
@@ -34710,7 +34885,7 @@ meant for the actors.</desc>
           scène.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica l'indicazione di scena tecnica.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="light">
           <desc versionDate="2007-06-27" xml:lang="en">a lighting cue</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">조명 신호</desc>
@@ -34965,7 +35140,7 @@ a public broadcast.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">tipo di registrazione.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>audio</defaultVal>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="audio">
           <desc versionDate="2007-06-27" xml:lang="en">audio recording</desc>
           <desc versionDate="2009-01-05" xml:lang="fr">enregistrement audio</desc>
@@ -35167,8 +35342,7 @@ an audio or video recording used as the source for a spoken text.</desc>
   す。</desc>
   <desc versionDate="2006-10-18" xml:lang="de">gibt die technischen
   Details zu Geräteausstattung und Medien an, welche für die Ton- oder
-  Videoaufnahme als Quelle des gesprochenen Textes benutzt wurden
-</desc>
+  Videoaufnahme als Quelle des gesprochenen Textes benutzt wurden</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona detalles técnicos sobre el equipo y los medios empleados para la grabación de un audio o video usados como fuente de un texto hablado.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">fornisce dettagli tecnici sull'attrezzatura per una registrazione audio o video utilizzata quale fonte di un testo orale.</desc>
   <classes>
@@ -35241,8 +35415,7 @@ an audio or video recording used as the source for a spoken text.</desc>
   <desc versionDate="2009-04-17" xml:lang="fr">décrit une émission utilisée comme source de la parole transcrite.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">구어 텍스트의 원본으로 사용된 방송에 대해 기술한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">描述口說文本的公開播送影音來源相關資訊。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">発話されたテキストの元となる放送を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">発話されたテキストの元となる放送を示す。</desc>
   <desc versionDate="2006-10-18" xml:lang="de">beschreibt eine Sendung,
   die als Quelle eines gesprochenen Textes genutzt wird</desc>
   <desc versionDate="2007-05-04" xml:lang="es">describe la emisión usada como fuente de un texto escrito.</desc>
@@ -35513,6 +35686,7 @@ a <gi>u</gi> is some phonetic production by a given speaker.</p>
     <memberOf key="att.timed"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.ascribed.directed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -35548,6 +35722,7 @@ a <gi>u</gi> is some phonetic production by a given speaker.</p>
     <memberOf key="att.timed"/>
     <memberOf key="att.ascribed.directed"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -35634,6 +35809,7 @@ a <gi>u</gi> is some phonetic production by a given speaker.</p>
     <memberOf key="att.timed"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.ascribed.directed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -35703,8 +35879,7 @@ communication.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">예를 들어 일시적인 소음 또는 의사소통에 영향을 미치는 다른 사건과 같이, 현상 또는 발생이지만 반드시 목소리나 의사소통을 수반하지는 않는다.</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">必ずしも言語化またはコミュニケーションには上らない現象や出来事を示す。
   例えば、偶発的な雑音またはコミュニケーションに影響を与える他の事象な
-  ど。
-</desc>
+  ど。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">tout phénomène ou événement, non nécessairement
 			vocalisé ou destiné à la communication, par exemple des bruits fortuits ou d'autres
 			événements affectant la communication</desc>
@@ -35716,6 +35891,7 @@ communication.</desc>
     <memberOf key="att.timed"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.ascribed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -35765,6 +35941,7 @@ communication.</desc>
     <memberOf key="att.ascribed.directed"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.timed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -35860,6 +36037,7 @@ utterances by any one speaker changes.</desc>
     <memberOf key="att.global"/>
     <memberOf key="model.global.spoken"/>
     <memberOf key="att.ascribed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <constraintSpec ident="shiftNew" scheme="schematron">
@@ -36101,6 +36279,303 @@ very loudly.</p>
     <ptr target="#TSTPAC"/>
   </listRef>
 </elementSpec></div></div>
+<div xmlns:xi="http://www.w3.org/2001/XInclude" type="div1" xml:id="CMC" xml:lang="en"><head>Computer-mediated Communication</head>
+<div type="div2" xml:id="CMCintro"><head>General Considerations</head></div>
+<div type="div2" xml:id="CMCUnits"><head>Basic Units of CMC</head></div>
+<div type="div2" xml:id="CMCcmc"><head>Encoding Unique to CMC</head>
+<div xml:id="CMCcmcpost"><head>CMC Posts</head></div>
+<div xml:id="CMCcmcpostatts"><head>Attributes Specific to CMC <gi>post</gi></head></div>
+<div xml:id="CMCcmcatts"><head>Attributes for General CMC Encoding</head></div></div>
+<div xml:id="CMCmacrometa"><head>CMC Macrostructure</head>
+<div xml:id="CMCmacro"><head>Macrostructure of CMC Collections and Documents</head></div>
+<div xml:id="CMCthreads"><head>Sequences, Sections, Threads</head></div>
+<div xml:id="CMCmultimodal"><head>Multimodal CMC</head></div></div>
+<div xml:id="CMCmetadata"><head>Documenting CMC (and providing general metadata)</head>
+<div xml:id="CMCCorpusSource"><head>Documenting the Source of a Corpus of CMC data</head></div>
+<div xml:id="CMCDocumentSource"><head>Describing the Source of a CMC Document</head></div>
+<div xml:id="CMCSampling"><head>Documenting the Sampling of CMC data</head></div>
+<div xml:id="CMCParticipants"><head>Participants</head></div>
+<div xml:id="CMCTimeline"><head>Timeline</head></div></div>
+<div xml:id="CMCrecs"><head>Recommendations for Encoding CMC Microstructure</head>
+<div xml:id="CMCemos"><head>Emojis and Emoticons</head></div>
+<div xml:id="CMCgraphic"><head>Posts with Graphics</head></div>
+<div xml:id="CMCcirculation"><head>Circulation</head></div>
+<div xml:id="CMCanalysis"><head>Linguistic Annotation</head></div>
+<div xml:id="CMCnames"><head>Named Entities and Anonymization</head></div></div>
+<div xml:id="CMCmodule"><head>The TEI CMC Module</head>
+<moduleSpec ident="cmc">
+        <desc xml:lang="en" versionDate="2021-09-07">Computer-mediated communication</desc>
+        <idno type="FPI">TEI-CMC</idno>
+      </moduleSpec>
+<macroSpec ident="macro.specialPara.cmc" mode="add" module="cmc">
+    <gloss versionDate="2021-03-04" xml:lang="en">'special'
+        paragraph content with added CMC element(s)</gloss>
+    <desc versionDate="2021-03-04" xml:lang="en">defines the
+        content model of the <gi>quote</gi> element, whose content
+        is just like others (such as notes or list items) which
+        either contain a series of component-level elements or else
+        have the same structure as a paragraph, containing a series
+        of phrase-level and inter-level elements, but also contains
+        element(s) for transcription of CMC.</desc>
+    <content>
+        <alternate minOccurs="0" maxOccurs="unbounded">
+            <textNode/>
+            <classRef key="model.gLike"/>
+            <classRef key="model.phrase"/>
+            <classRef key="model.inter"/>
+            <classRef key="model.divPart"/>
+            <classRef key="model.global"/>
+            <classRef key="model.cmc"/>
+        </alternate>    
+    </content>
+</macroSpec>
+<elementSpec ident="post" mode="add" module="cmc">
+    <desc xml:lang="en" versionDate="2022-08-09">a written (or spoken)
+    contribution to a CMC interaction which has been composed
+    (or recorded) by its author in its entirety before being
+    transmitted over a network (e.g., the internet) and made available
+    on the monitor or screen of the other parties en bloc.</desc>
+    <classes>
+        <memberOf key="model.cmc"/>
+        <memberOf key="att.global"/>
+        <memberOf key="att.cmc"/>
+        <memberOf key="att.indentation"/>
+        <memberOf key="att.ascribed"/>
+        <memberOf key="att.datable"/>
+	<memberOf key="att.fragmentable"/>
+        <memberOf key="att.docStatus"/>
+        <memberOf key="att.timed"/>
+        <memberOf key="att.typed"/>
+        <memberOf key="att.canonical"/>
+    </classes>
+    <content>
+        <alternate minOccurs="0" maxOccurs="unbounded">
+            <textNode/>
+            <classRef key="model.headLike"/>
+            <elementRef key="opener"/>
+            <classRef key="model.pLike"/>
+            <classRef key="model.gLike"/>
+            <classRef key="model.phrase"/>
+            <classRef key="model.inter"/>
+            <classRef key="model.global"/>
+            <elementRef key="lg"/>
+            <classRef key="model.lLike"/>
+            <classRef key="model.divBottom"/>
+        </alternate>
+    </content>
+    <attList>
+        <attDef ident="modality" usage="rec" mode="add">
+            <desc xml:lang="en" versionDate="2021-09-07">written or spoken mode</desc>
+            <datatype minOccurs="1" maxOccurs="1">
+                <dataRef key="teidata.enumerated"/>
+            </datatype>
+            <valList xml:lang="en" type="semi">
+                <valItem ident="written">
+                    <desc xml:lang="en" versionDate="2021-09-07">for stretches of text and/or multimodal elements</desc>
+                </valItem>
+                <valItem ident="spoken">
+                    <gloss xml:lang="en" versionDate="2024-06-30">for audio (or audio-visual) posts</gloss>
+                </valItem>
+            </valList>
+            <remarks xml:lang="en" versionDate="2021-09-07">
+                <p>This attribute is intended to convey information about the CMC environment in
+                    which the post was created, as opposed to the MIME type of the content conveyed,
+                    which is indicated by the elements contained within the <gi>post</gi>.</p>
+            </remarks>
+        </attDef>
+        <attDef ident="replyTo" mode="add">
+            <desc xml:lang="en" versionDate="2021-09-07">indicates to which previous post the
+                current post replies or refers to. This attribute should be used to encode
+                <q>technical</q> reply information that is due to a formal reply action (such as
+                activating a <q>reply</q> button in the client software) and that is formally
+                represented in the source, e.g. in the <q>references</q> field of a Usenet message header
+                or in the subject line of a forum post. It should not be used for inferred,
+                or interpreted reply relations based only on ambiguous signs such as linguistic discourse markers or the indentation relations in Wiki talk pages.
+                <!--See Lüngen/Herzberg (2019)--></desc>
+            <datatype minOccurs="1" maxOccurs="unbounded">
+                <dataRef key="teidata.pointer"/>
+            </datatype>
+        </attDef>
+    </attList>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>standard user postings in chat</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post type="standard" generatedBy="human" who="#A05" rend="color:red">
+                <p>oh ja, in die Wärme...</p>
+            </post>
+            <post type="standard" generatedBy="human" who="#A03" rend="color:red">
+                <p>nein, hast du nicht !!</p>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>chat message-type "system": user enters a chatroom, "system" defined in listPerson</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <listPerson>
+                <person xml:id="system">
+                    <persName>system</persName>
+                </person>
+                <!-- ... -->
+            </listPerson>
+            <!-- ... -->
+            <post type="event" generatedBy="system" who="#system" rend="color:navy">
+                <p>
+                    <name type="nickname" corresp="#A07">Interseb</name> betritt den Raum.</p>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>action message in chat</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post type="event" generatedBy="human" who="#A02" rend="color:blue">
+                <p>
+                    <name type="nickname" corresp="#A02">McMike</name> hechtet zum Steuer </p>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>chat messages incl. interaction words (types: inflective and acronym) and an interaction
+            phrase</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post type="standard" generatedBy="human" who="#A03" rend="color:green">
+                <p>
+                    <w type="AKWIND">*</w><w type="AKW" subtype="inflective">schwank</w><w type="AKWIND">*</w>
+                    <!-- ... -->
+                    <w type="AKWIND">*</w><w type="AKW">seekrank</w><w type="AKWIND">*</w>
+                </p>
+            </post>
+            <!-- ... -->
+            <post type="standard" generatedBy="human" who="#A02" rend="color:blue">
+                <p>
+                    <w type="AKWIND">*</w><w type="AKW" subtype="acronym">lol</w><w type="AKWIND">*</w> ... </p>
+            </post>
+            <!-- ... -->
+            <post type="standard" generatedBy="human" who="#A01" rend="color:black">
+                <p>
+                    <phr type="AKW"><w type="AKWIND">*</w><name type="nickname" corresp="#A02">McMike</name> einen fallschirm <w type="AKW" subtype="inflective">umbind</w><w type="AKWIND">*</w></phr>
+                </p>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>user posting incl. an emoticon</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post type="standard" generatedBy="human" who="#A01" rend="color:black">
+                <p> naja, der war gestrandet <w type="emoticon" subtype="ascii">:(</w>
+                </p>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>Twitter: Tweet containing an addressing term and a hashtag expression</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post type="standard" generatedBy="human" who="#A01" when="2015-11-18">
+                <p>
+                    <ref corresp="#A02" target="https://twitter.com/textarchiv">
+                        <w type="ADRIND">@</w><w type="ADR">textarchiv</w></ref> Erfurter
+                    Europäische Welt- und Staats-Geschichte: 20 Ausgaben von 1744 aus dem MKHZ
+                    bereits in DTAQ <ref target="http://www.deutschestextarchiv.de/dtaq/about">
+                        http://www.deutschestextarchiv.de/dtaq/about</ref>
+                    <ref target="https://twitter.com/hashtag/dtaclarin14?src=hash"><w type="hashtag">#dtaclarin14</w></ref>
+                </p>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Chat2CLARIN" xml:lang="mul" versionDate="2021-09-07">
+        <p>example from Wikipedia discussion</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post type="standard" generatedBy="human" indentLevel="3" synch="#t02622878" who="#WU00018921">
+                <p> Wie du siehst hab ich die Lemma geändert, danke für den Hinweis, ich war nämlich
+                    selbst auch etwas unsicher bei der ganzen Sache und bin jetzt damit auch viel
+                    glücklicher!--</p><signed rend="inline" generatedBy="template"><gap reason="signatureContent"/>
+                    <time generatedBy="template">12:01, 12. Jun. 2009 (CEST)</time>
+                </signed>
+            </post>
+        </egXML>
+    </exemplum>
+    <exemplum type="Blog" xml:lang="mul" versionDate="2021-09-07">
+        <p>Blog comment: Die Anthropodizee-Frage. Wer den Himmel leerräumt, schafft die Menschheit
+            ab. by Volker Birk.
+                <ref>https://scilogs.spektrum.de/natur-des-glaubens/die-anthropodizee-frage-wer-himmel/#comment-31899</ref></p>
+
+        <egXML xmlns="http://www.tei-c.org/ns/Examples">
+            <post xml:id="p5" type="comment" who="#u4" synch="#t005" replyTo="#p4">
+                <p>“Wenn Sie diesen Gruppen also “mangelnde Bildung“ attestieren wollen, so
+                    verwenden Sie bereits einen bestimmten, kulturgebundenen Bildungsbegriff.”</p>
+                <p>Ich hoffe doch, wir können beim Bildungsbegriff der Aufklärung bleiben. Wer das
+                    nicht möchte, hat die Wissenschaft verlassen.</p></post>
+        </egXML>
+    </exemplum>
+    <exemplum type="usenet" xml:lang="en" versionDate="2024-07-02">
+        <p>Usenet reply that comments on material quoted in an earlier message.</p>
+        <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#usenet-sgml-tei">
+            <post when="1990-10-11" who="#dmerritt" xml:id="sgml-tei-3" replyTo="#sgml-tei-1">
+                <time generatedBy="system">04:37:51 UTC</time>
+                <p><seg generatedBy="system">In article <ref target="#sgml-tei-1">&lt;2****.**********0@m*******.***.*****.**c.uk&gt;</ref> S.*.*.*****z@e**.*****.**c.uk (Sebastian Rahtz) writes:</seg>
+                    <cit><bibl>[for] Lou Burnard:</bibl>
+                    <quote>the Text Encoding Initiative document is a many-splendoured thing,
+                    redolent of the mysterious east, caribbean evenings and the scent of
+                    fresh pine in the himalayas [...]</quote>
+                   </cit>
+                </p>  
+                <p>Very poetic.</p>  
+                <p>But really, what is it?</p>  
+                <signed generatedBy="human">Doug</signed>
+                <signed generatedBy="template">Doug Merritt ****@e***.********y.edu (ucbvax!eris!doug)
+                    or uunet.uu.net!crossck!dougm</signed>
+            </post>
+        </egXML>
+    </exemplum>
+    <remarks xml:lang="en" versionDate="2021-09-07">
+        <p>Even though in some CMC genres (e.g., WhatsApp), the other parties are informed by an
+            automated alert about the fact that another party is currently composing a new post,
+            they cannot track the process of verbalization, i.e. how the written utterance emerges
+            in the entry form on the user interface of its author. It is not until the author
+            performs a ‘posting’ action (e.g., by hitting the ‘enter’ key or by activating a ‘send’
+            button with the mouse) that the result of the composition process — the post — is made
+            available for the other parties. From the perspective of its addressees/readers, a post
+            is a stretch of text that has been composed in advance. Different from spoken utterances
+            but similar to edited text, (1) the reader of a post does not have access to the
+            verbalization process and (2) the mental processing of a post is not possible until the
+            process of verbalization (the composition) has been finished and the posting action has
+            been performed by the author. Posts occur in a broad range of written CMC genres: as
+            user ‘messages’ in chats and WhatsApp dialogues, as SMS messages, as tweets in Twitter
+            timelines, as individual comments following a status update on Facebook pages, as posts
+            in forum threads, as contributions on Wikipedia talk pages or in the comments section of
+            a weblog. [Element adopted from the <ref target="#TEIcmc2012">DeRiK schema</ref>.
+            Aspects of the model adopted from the <ref target="#descmr">CoMeRe Schema</ref>]. The
+                <gi>post</gi> element is a member of the model class model.common (via model.CMC).
+            This allows for using (and combining) occurrences of <gi>post</gi>, <gi>u</gi>,
+                <gi>incident</gi>, and <gi>kinesic</gi>in one and the same <gi>div</gi> in order to
+            be able to represent the combined use of written and spoken utterances and nonverbal
+            acts on the GUI of multimodal CMC environments.</p>
+	    <p>The use of the <att>modality</att> attribute is
+	    recommended, but not required. Its value is either
+	    <val>written</val> or <val>spoken</val>. Because spoken
+	    language differs fundamentally from written language, when
+	    the value is <val>spoken</val> projects may wish to limit
+	    the content of the <gi>post</gi> to character data and
+	    only those elements available in the <gi>u</gi> element,
+	    thus avoiding elements like <gi>p</gi> or <gi>head</gi>
+	    that are used for the encoding of written text.</p>
+        <!-- p>References: <bibl>Lüngen, Harald, and Herzberg,
+            Laura (2018): Reply relations in CMC: Types and
+            annotation. In: <ref
+            target="https://www.uantwerpen.be/images/uantwerpen/container49896/files/proceedings_CMCcorpora2018.pdf"
+            > >Proceedings of the 6th Conference on Computer-Mediated
+            Communication (CMC) and Social Media Corpora (CMC-corpora
+            2018) 17-18 September 2018, University of
+            Antwerp</ref></bibl
+            <bibl>Lüngen, Harald, and Herzberg, Laura (2019): Types and annotation of reply
+                relations in computer-mediated communication In <ref
+                    target="https://doi.org/10.1515/eujal-2019-0006">European Journal of Applied
+                    Linguistics, Vol.7(2),</ref> pp.305-331.</bibl>
+        </p -->
+    </remarks>
+    <listRef>
+        <ptr target="#CMCcmcpost"/>
+    </listRef>
+</elementSpec></div></div>
 <div type="div1" xml:id="DI" n="12"><head>Dictionaries</head>
 <div type="div2" xml:id="DIBO"><head>Dictionary Body and Overall Structure</head>
 <classSpec module="dictionaries" xml:id="COMPDICT" type="model" ident="model.entryLike" predeclare="true">
@@ -36141,7 +36616,7 @@ very loudly.</p>
   #370. Note that same problems is present in att.textCritical. -->
   <attList>
     <attRef class="att.typed" name="subtype"/>
-    <attDef ident="type" usage="opt" mode="add">
+    <attDef ident="type" usage="opt">
       <desc versionDate="2005-10-10" xml:lang="en">indicates type of entry, in dictionaries with multiple types.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">다중 유형을 포함하는 사전에서, 표제 항목 유형을 나타낸다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出複合類型字典中的辭條類型。</desc>
@@ -36194,8 +36669,7 @@ very loudly.</p>
             <mentioned>esthete</mentioned> to <mentioned>aesthete</mentioned>).</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">다른 주 표제 항목을 지시하는 기능만을 수행하도록 제한된 표제 항목(예를 들어, 불규칙
             동사형 또는 다양한 철자법; <mentioned>be</mentioned>를 지시하는 <mentioned>was</mentioned>, 또는
-              <mentioned>aesthete</mentioned>를 지시하는 <mentioned>esthete</mentioned>
-               </desc>
+              <mentioned>aesthete</mentioned>를 지시하는 <mentioned>esthete</mentioned></desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">縮減的辭條，其唯一作用為指向另一個主要辭條 (例如不規則動辭形式或不同拼法的字)</desc>
           <desc versionDate="2018-09-08" xml:lang="es">una breve entrada cuya única función es apuntar a otra entrada principal (p.ej. para formas de un verbo irregular o para otras variantes ortográficas: <mentioned>was</mentioned> señala a <mentioned>be</mentioned>, o <mentioned>esthete</mentioned> a <mentioned>aesthete</mentioned>).</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">相互参照。主項目への参照。例えば、不規則変化動詞の場合には、
@@ -37006,7 +37480,7 @@ l'original apparaît comme une forme fusionnée.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">字典辭條的片段，包含自由組合的詞組層次字典元素。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">句レベルの辞書要素をとる辞書項目を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient la partie d'une entrée de dictionnaire
-			dans laquelle d'autres éléments de niveau "expression" sont librement associés.</desc>
+			dans laquelle d'autres éléments de niveau <q>expression</q> sont librement associés.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">engloba una parte de la entrada del diccionario en la que otros elementos de nivel sintagmático del diccionario se combinan de forma libre.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">include una parte di una voce di dizionario in cui sono combinati liberamente altri elementi di dizionario a livello sintagmatico</desc>
   <classes>
@@ -37140,7 +37614,7 @@ l'original apparaît comme une forme fusionnée.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">clasifica la forma como simple, compuesta, etc.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica la forma in simplice, composta, ecc.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="simple">
           <desc versionDate="2007-06-27" xml:lang="en">single free lexical item</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">단일 자립 어휘 항목</desc>
@@ -37611,7 +38085,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="pos">
           <gloss versionDate="2007-08-25" xml:lang="en">part of speech</gloss>
           <gloss versionDate="2007-12-20" xml:lang="ko">품사</gloss>
@@ -37964,6 +38438,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
 <elementSpec module="dictionaries" ident="case">
   <gloss versionDate="2007-06-12" xml:lang="en">case</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">cas</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Fall</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains grammatical case information given by a dictionary for a given form.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">주어진 형식에 대하여 사전에 제시된 문법적 격 정보를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含文法上格的資訊。</desc>
@@ -37971,6 +38446,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
   <desc versionDate="2007-06-12" xml:lang="fr">contient des informations sur le cas grammatical présenté par le dictionnaire pour une forme donnée.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene la información del caso gramatical.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene informazioni grammaticali sul caso fornite dal dizionario per una determinata froma.</desc>
+  <desc versionDate="2024-04-11" xml:lang="de">enthält grammatikalische Kasusinformationen, die von einem Wörterbuch für eine bestimmte Form geliefert werden.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.morphLike"/>
@@ -38399,7 +38875,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
         abbreviate solite (ad esempio <mentioned>inv</mentioned>)e altri tipi di indicatori, quali
         codici speciali per fare riferimento al tipo di coniugazione, ecc.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="abbrev">
           <desc versionDate="2007-06-27" xml:lang="en">abbreviated indicator</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">축약 지시자</desc>
@@ -38521,8 +38997,7 @@ list of values. Typical values might be <mentioned>IPA</mentioned>,
   <desc versionDate="2007-05-04" xml:lang="es">agrupa los elementos permitidos al interno de un elemento
       <gi>form</gi> en un diccionario.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">in un dizionario, raggruppa gli elementi ammesi
-    all'inerno di un elemento <gi>form</gi>
-   </desc>
+    all'inerno di un elemento <gi>form</gi></desc>
   <classes/>
 
   <listRef>
@@ -39150,7 +39625,7 @@ headword  such as noun, verb, or adjective.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">clasifica la información sobre el uso aplicando una tipología funcional.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica le informazioni sull'uso secondo una tipologia funzionale.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="geo">
           <gloss versionDate="2007-07-04" xml:lang="en">geographic</gloss>
           <gloss versionDate="2007-12-20" xml:lang="ko">지리적</gloss>
@@ -39417,7 +39892,7 @@ headword  such as noun, verb, or adjective.</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">語形のラベルを示す。例えば、翻訳、短縮形などの各種省略形など。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">étiquette pour la forme d’un mot, pour un exemple, pour
     une traduction, ou pour tout autre type d’information, par exemple "abréviation pour",
-    "contraction de", "littéralement", "approximativement", "synonymes", etc.</desc>
+    <q>contraction de</q>, <q>littéralement</q>, <q>approximativement</q>, <q>synonymes</q>, etc.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">en diccionarios, contiene una etiqueta para una forma,
     ejemplo, traducción u otra información, p.ej. abreviatura para, contracción de, literal.,
     aproximadamente, sinónimo, etc.</desc>
@@ -39559,7 +40034,7 @@ headword  such as noun, verb, or adjective.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica il tipo di riferimento incrociato secondo una
         tipologia funzionale</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="syn">
           <gloss versionDate="2007-07-04" xml:lang="en">synonym</gloss>
           <gloss versionDate="2007-12-20" xml:lang="ko">유의어</gloss>
@@ -40153,7 +40628,7 @@ headword  such as noun, verb, or adjective.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica il tipo di modifica tipografica del lemma in
         un riferimento.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="cap">
           <gloss versionDate="2007-07-04" xml:lang="en">capital</gloss>
           <gloss versionDate="2007-12-20" xml:lang="ko">대문자</gloss>
@@ -40656,7 +41131,7 @@ the inner bounding line, reading from top to bottom.</catchwords>
       <desc versionDate="2007-05-04" xml:lang="es">indica que aspecto del objeto se mide.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica quale aspetto dell'oggetto viene misurato</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="leaves">
           <desc versionDate="2007-06-27" xml:lang="en">dimensions relate to one or more leaves (e.g. a single leaf, a gathering, or a separately bound part)</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">하나 이상의 종이의 장과 관련된 차원(예, 한 장, 접지 모음, 또는 각각 분리되어 엮여진 부분)</desc>
@@ -40672,8 +41147,7 @@ preparation for writing.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">글쓰기를 준비하기 위해 줄 그은 종이 부분과 관련된 차원</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">頁面上劃好線以備書寫的範圍大小。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se refieren al área de una hoja que se ha preparado para la escritura.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">書記の準備として罫が引かれている領域を示す。       
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">書記の準備として罫が引かれている領域を示す。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone de la réglure d'une feuille.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono alla porzione di un foglio sulla quale sono state disegnate delle righe al fine di scriverci</desc>
         </valItem>
@@ -40691,8 +41165,7 @@ preparation for writing.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">글의 첫 번째 줄 상단부터 마지막 줄 하단까지 측정된 높이를 통해 한 장의 글 쓴 영역과 관련된 차원</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">頁面上已書寫文字的範圍大小，高度由最頂行文字的頂端測量至最底行文字的底端。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones se refiere al área de una hoja que ha sido escrita, con la altura medida desde la línea superior de escritura a la parte inferior de la última línea de la escritura.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">書記領域を示す。先頭文字行から最終文字行までの高さ。
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">書記領域を示す。先頭文字行から最終文字行までの高さ。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent la zone écrite de la feuille, dont la hauteur est mesurée depuis le haut des blancs sur la ligne d'écriture supérieure jusqu'au dernier des blancs sur la dernière ligne écrite.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono ad un'area del foglio su cui è stato scritto e la cui altezza è misurata dalla cima degli uncini sulla prima riga scritta fino al fondo degli uncini sull'ultima riga scritta</desc>
         </valItem>
@@ -40701,8 +41174,7 @@ preparation for writing.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">원고의 축소형과 관련된 차원</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">手稿中圖畫的尺寸大小</desc>
           <desc versionDate="2008-04-06" xml:lang="es">las dimensiones relativas a las miniaturas del manuscrito</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該手書き資料の彩飾図の大きさを示す。
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該手書き資料の彩飾図の大きさを示す。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">les dimensions concernent les miniatures contenues dans le manuscrit.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">le dimensioni si riferiscono alle miniature contenute nel manoscritto</desc>
         </valItem>
@@ -40961,8 +41433,7 @@ facing the observer, and perpendicular to that indicated by the
   <gloss xml:lang="en" versionDate="2007-06-12">heraldry</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">héraldique</gloss>
   <desc versionDate="2005-12-13" xml:lang="en" xml:id="heraldry.desc">contains a heraldic formula
-or phrase, typically found as part of a blazon, coat of arms, etc. 
-</desc>
+or phrase, typically found as part of a blazon, coat of arms, etc.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">보통 문장이 새겨진 방패의 일부로 사용되는 문장 형식 또는 구를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一個紋章學的常規或詞彙，通常是裝飾、或盾形紋章等的一部分。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">紋章学的記述を含む。例えば、紋章記述や紋章など。</desc>
@@ -41524,8 +41995,7 @@ printing.</p>
   <gloss versionDate="2008-04-06" xml:lang="es">segundo folio</gloss>
   <gloss versionDate="2008-03-30" xml:lang="fr">deuxième folio</gloss>
   <gloss versionDate="2007-11-06" xml:lang="it">secondo foglio</gloss>
-  <desc versionDate="2012-12-27" xml:lang="en" xml:id="secfol.desc">marks the word or words taken from a fixed point in a codex (typically the beginning of the second leaf) in order to provide a unique identifier for it.
-</desc>
+  <desc versionDate="2012-12-27" xml:lang="en" xml:id="secfol.desc">marks the word or words taken from a fixed point in a codex (typically the beginning of the second leaf) in order to provide a unique identifier for it.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">고유한 확인소를 제공하기 위해 미제본 원고의 고정 위치(일반적으로 두 번째 장의 시작)에서 얻어진 단어 또는 단어군</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">從手抄本中固定位置所拿開的一個或多個字 (通常在第二張書頁的開頭) ，目的是提供一個專有的識別符號。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">ユニークな識別子を示すために、冊子中の特定点にある単語を示す。</desc>
@@ -42260,8 +42730,7 @@ proporti<gap/>
       connus du même texte, ses <term>protographes</term>, <term>antigraphes</term> et
         <term>apographes</term>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene información referente a la filiación de un manuscrito, p.ej. su relación con otros manuscritos supervivientes del mismo texto, es decir, sus <term>protógrafos</term>, <term>antígrafos</term> y <term>apógrafos</term>.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">contiene informazioni relative alla <term>filiazione</term> del manoscritto, cioè la sua relazione con altri manoscritti sopravvissuti per lo stesso testo, cioè i suoi <term>protografi</term>, <term>antigrafi</term> e <term>apografi</term>
-   </desc>
+  <desc versionDate="2007-01-21" xml:lang="it">contiene informazioni relative alla <term>filiazione</term> del manoscritto, cioè la sua relazione con altri manoscritti sopravvissuti per lo stesso testo, cioè i suoi <term>protografi</term>, <term>antigrafi</term> e <term>apografi</term></desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -42407,8 +42876,7 @@ d'amours est toute enclose.</finalRubric>
   ストの書き出しにある語句で、これに先行してある朱書き部分を除いた、当
   該作品を特定するに充分な文量の部分である。
   冒頭語句は、タイトル部分において、作品への参照を示す手段としてよく使
-  用されていた。
-</desc>
+  用されていた。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient l'<term>incipit</term> d'une section d'un
       manuscrit, c'est-à-dire les mots commençant le texte proprement dit, à l'exclusion de toute
         <term>rubrique</term> qui pourrait les précéder, la transcription étant de longueur
@@ -43050,8 +43518,7 @@ fonts.</typeNote>
     en un manuscrito (no se ha de confundir con la descripción contenida en el elemento
       <gi>langUsage</gi>. ****</desc>
   <desc versionDate="2007-01-21" xml:lang="it">descrive le lingue e i sistemi di scrittura usati da un
-    manoscritto (da non confondere con la descrizione contenuta nell'elemento <gi>langUsage</gi>
-   </desc>
+    manoscritto (da non confondere con la descrizione contenuta nell'elemento <gi>langUsage</gi></desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.msItemPart"/>
@@ -43145,8 +43612,7 @@ element in the TEI header.
   <desc versionDate="2007-10-18" xml:lang="en">provides attributes used to describe excerpts from a manuscript placed in a description thereof.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">원고의 발췌본을 기술하는 속성을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供用來描述關於手稿摘錄的屬性</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">手書き資料からの引用を記述するための属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">手書き資料からの引用を記述するための属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">fournit des attributs pour décrire les extraits d'un manuscrit.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">assegna degli attributi utilizzati per descrivere estratti di un manoscritto inseriti in una descrizione dello stesso</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos usados para describir extractos de un manuscrito ******</desc>
@@ -43157,8 +43623,7 @@ element in the TEI header.
       <desc versionDate="2007-12-20" xml:lang="ko">인용 어구의 결합 여부를 표시한다. 즉, 손실 또는 손상을 통한 불완전성</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">指出所引用的段落是否不完全，例如因遺失或損毀而不完全。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">当該部分に問題があるかどうかを示す。例えば、欠損や損傷による不完
-      全さなど。
-</desc>
+      全さなど。</desc>
       <desc versionDate="2009-05-28" xml:lang="fr">indique si le passage décrit est fautif, i.e. incomplet en raison d'une lacune ou d'une détérioration.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">indica se il brano citato sia o meno incompleto a causa di perdite o danni</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica si el pasaje que se describe es completo o no, p.ej. si ha sufrido pérdidas o daños.</desc>
@@ -43201,7 +43666,7 @@ element in the TEI header.
       <attDef ident="class">
          <desc versionDate="2013-12-21" xml:lang="en">identifies the text types or classifications applicable to this
             item by pointing to other elements or resources defining the
-            classification concerned. </desc>
+            classification concerned.</desc>
          <desc versionDate="2007-12-20" xml:lang="ko">이 항목에 적용할 수 있는 텍스트 유형 또는 분류를 식별한다.</desc>
          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明適合的文字類型或分類。</desc>
          <desc versionDate="2022-08-26" xml:lang="ja">関連する分類を定義する他の要素またはリソースを指すことによって、この項目に適用可能なテキストタイプまたは分類を特定する。</desc>
@@ -44286,8 +44751,7 @@ on f. 24, but the evidence for this is insubstantial.</p>
   <gi>decoNote</gi>で示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient la description de la décoration du
       manuscrit, soit en une série de paragraphes <term>p</term>, soit sous la forme d'une série
-      d'éléments thématiques <gi>decoNote</gi>
-   </desc>
+      d'éléments thématiques <gi>decoNote</gi></desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una descripción de la decoración de un manuscrito en forma de secuencia de párrafos o de secuencia de elementos <gi>decoNote</gi> organizados por el argumento.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una descrizione della decorazione di un manoscritto in forma di sequenza di paragrafi oppure di sequenza di elementi <gi>decoNote</gi> organizzati per argomento</desc>
   <classes>
@@ -44791,8 +45255,7 @@ endbands; the edges of the leaves and boards gilt.Boxed.</p>
       d'éléments <gi>seal</gi>, complétés éventuellement par des éléments <gi>decoNote</gi>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">describe los sellos u otros objetos externos aplicados a un manuscrito mediante una serie de párrafos o una serie de diversos elementos <gi>seal</gi> (sellos), eventualmente con ulteriores elementos <gi>decoNote</gi>.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">descrive i sigilli o altri oggetti esterni applicati a un manoscritto sotto forma di una sequenza di paragrafi o una serie di diversi elementi <gi>seal</gi>, 
-eventualmente con ulteriori elementi <gi>decoNote</gi>
-   </desc>
+eventualmente con ulteriori elementi <gi>decoNote</gi></desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.physDescPart"/>
@@ -44945,14 +45408,14 @@ Parchment tag on which is written: <q>Woldorp Iohanne G</q>.</p>
   <gloss versionDate="2007-05-04" xml:lang="es">material adicional</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">materiale allegato</gloss>
   <gloss versionDate="2018-12-18" xml:lang="ja">添付資料</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Begleitmaterial</gloss>
   <desc versionDate="2019-01-17" xml:lang="en" xml:id="accmat.desc">contains details of any significant additional
 material which may be closely associated with the manuscript or object being
 described, such as non-contemporaneous documents or fragments bound in
 with it at some earlier historical period.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">기술하고 있는 원고와 밀접히 관련된 중요한 부가적 자료를 세밀하게 기술한다. 예를 들어, 어떤 이전 시기에 원고와 함께 제본된 비동시대의 문서  또는 문서 일부.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含可能與該手稿關係密切的重要附加資料之細節，例如非同時期的文件或是在早期與手稿裝訂一起的片段。</desc>
-  <desc versionDate="2022-06-07" xml:lang="ja">当該手書き資料と密接に関連していると考えられる重要な追加資料、例えば、時代を異にする文書、歴史的に早い時期に手書き資料と合わされた断片などの詳細を示す。
-</desc>
+  <desc versionDate="2022-06-07" xml:lang="ja">当該手書き資料と密接に関連していると考えられる重要な追加資料、例えば、時代を異にする文書、歴史的に早い時期に手書き資料と合わされた断片などの詳細を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">donne des détails sur tout matériel d'accompagnement
       étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec
       le manuscrit à une époque antérieure.</desc>
@@ -45165,6 +45628,7 @@ old Flemish original, between 1802 and 1845, according to <persName xml:id="AMH"
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="PROVENANCE" ident="provenance">
   <gloss xml:lang="en" versionDate="2007-06-12">provenance</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">provenance</gloss>
+  <gloss versionDate="2023-08-08" xml:lang="de">Provenienz</gloss>
   <desc versionDate="2019-01-17" xml:lang="en" xml:id="prov.desc">contains any descriptive or other information
 concerning a single identifiable episode during the history of a manuscript, manuscript part, or other object after its creation but before its acquisition.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">생성된 후부터 획득되기 전까지 원고 또는 원고 일부의 이력에 대해 확인가능한 에피소드에 관련한 기술적 또는 기타 정보를 포함한다.</desc>
@@ -45243,6 +45707,7 @@ concerning a single identifiable episode during the history of a manuscript, man
   <gloss versionDate="2007-06-12" xml:lang="en">acquisition</gloss>
   <gloss versionDate="2022-06-16" xml:lang="es">adquisición</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">acquisition</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Akquise</gloss>
   <desc versionDate="2019-01-17" xml:lang="en" xml:id="acquisn.desc">contains any descriptive or other information
 concerning the process by which a manuscript or manuscript part or other object entered the holding
 institution.</desc>
@@ -45252,7 +45717,7 @@ institution.</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">contient des informations sur les modalités et
       circonstances de l'entrée du manuscrit ou de la partie du manuscrit dans l'institution qui le
       détient</desc>
-  <desc versionDate="2022-06-16" xml:lang="es">contiene cualquier descripción u otra información concerniente al proceso de adquisición del manuscrito o de una de sus partes o cualquier otro objeto que haya ingresado en la institución </desc>
+  <desc versionDate="2022-06-16" xml:lang="es">contiene cualquier descripción u otra información concerniente al proceso de adquisición del manuscrito o de una de sus partes o cualquier otro objeto que haya ingresado en la institución</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene informazioni relative al processo di acquisizione di un manoscritto o di una sua parte</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -45444,6 +45909,7 @@ it, with curatorial or administrative information.</desc>
   <gloss versionDate="2007-05-04" xml:lang="es">información administrativa.</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">informazioni amministrative</gloss>
   <gloss versionDate="2018-12-28" xml:lang="ja">管理情報</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">administrative Information</gloss>
   <desc versionDate="2019-01-17" xml:lang="en" xml:id="adminfo.desc">contains information about the present
 custody and availability of the manuscript or other object, and also about the record
 description itself.</desc>
@@ -46134,8 +46600,7 @@ a set of images rather than as transcribed or encoded text.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">전사 또는 부호화된 텍스트 형태보다는 이미지 집합의 형태로 기록 원본의 표상을 포함한다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">contiene una representación de una cierta fuente escrita bajo la forma de conjunto de las imágenes algo que como texto transcrito o codificado.</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">転記または符号化されたテキストではなく、画像データ中にある、書記資料の
-表現を示す。
-</desc>
+表現を示す。</desc>
   <desc versionDate="2009-11-16" xml:lang="fr">contient une représentation d'une source écrite
 quelconque sous la forme d'un ensemble d'images plutôt que sous la forme d'un texte transcrit
 ou encodé.</desc>
@@ -46316,8 +46781,7 @@ that space, zones of interest within that space, and, when using an embedded tra
   <desc versionDate="2007-12-20" xml:lang="ko">직사각형의 좌표 공간과 그 내부에서 기록 표면부를 정의한다. 수의적으로 그 공간의 하나 이상의 그림 표상과 관심 있는 직사각형 공간을 모아놓는다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">define una superficie escrita en coordinadas rectangulares, agrupando opcionalmente una o más representaciones gráficas de ese espacio, y las zonas rectangulares de interés dentro de él.</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">矩形の座標により、書記の表面を定義する。選択的に、空間や矩形範囲中のひ
-とつ以上の図表表現をまとめる。
-</desc>
+とつ以上の図表表現をまとめる。</desc>
   <desc versionDate="2008-03-30" xml:lang="fr">définit une surface écrite comme un rectangle décrit par ses coordonnées spatiales, en regroupant éventuellement une ou plusieurs représentations
 graphiques de cet espace et des zones rectangulaires intéressantes à l'intérieur de
 celui-ci.</desc>
@@ -46493,8 +46957,7 @@ or surface.</desc>
 rectangular space.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">직사각형 공간의 좌측 상단에 대한 x 좌표 값을 제시한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">proporciona el valor de la coordinada X para el ángulo superior izquierdo de un espacio rectangular.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">矩形における左上点のX軸の値を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">矩形における左上点のX軸の値を示す。</desc>
       <desc versionDate="2009-11-16" xml:lang="fr">donne la valeur x de l'abscisse du
         coin supérieur gauche d'un rectangle.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">assegna il valore x all'angolo superiore sinistro di uno spazio rettangolare</desc>
@@ -46505,8 +46968,7 @@ rectangular space.</desc>
 rectangular space.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">직사각형 공간의 좌측 상단에 대한 y 좌표 값을 제시한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">proporciona el valor de la coordinada Y para el ángulo superior izquierdo de un espacio rectangular.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">矩形における左上点のY軸の値を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">矩形における左上点のY軸の値を示す。</desc>
       <desc versionDate="2009-11-16" xml:lang="fr">donne la valeur y de l'ordonnée du coin supérieur gauche d'un rectangle.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">assegna il valore y all'angolo superiore sinistro di uno spazio rettangolare</desc>
       <datatype><dataRef key="teidata.numeric"/></datatype>
@@ -46516,8 +46978,7 @@ rectangular space.</desc>
 rectangular space.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">직사각형 공간의 오른쪽 하단에 대한 x 좌표 값을 제시한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">proporciona el valor de la coordinada X para el ángulo inferior derecho de un espacio rectangular</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">矩形における右下点のX軸の値を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">矩形における右下点のX軸の値を示す。</desc>
       <desc versionDate="2009-11-16" xml:lang="fr">donne la valeur x de l'abscisse du coin inférieur droit d'un rectangle.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">assegna il valore x all'angolo inferiore destro di uno spazio rettangolare</desc>
       <datatype><dataRef key="teidata.numeric"/></datatype>
@@ -46527,8 +46988,7 @@ rectangular space.</desc>
 rectangular space.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">직사각형 공간의 오른쪽 하단에 대한 y 좌표 값을 제시한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">proporciona el valor de la coordinada Y para el ángulo inferior izquierdo de un espacio rectangular</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">矩形における右下点のY軸の値を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">矩形における右下点のY軸の値を示す。</desc>
       <desc versionDate="2009-11-16" xml:lang="fr">donne la valeur y de l'ordonnée du coin inférieur droit d'un rectangle.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">assegna il valore y all'angolo inferiore destro di uno spazio rettangolare</desc>
       <datatype><dataRef key="teidata.numeric"/></datatype>
@@ -46579,8 +47039,7 @@ element.</desc>
       <desc versionDate="2018-04-15" xml:lang="de">gibt das Ausmaß der Drehung (im Uhrzeigersinn) dieser <gi>zone</gi> an.
         Als Bezugspunkt gilt dabei die natürliche Ausrichtung des <gi>surface</gi>-Elternelements, die entweder
         im <gi>msDesc</gi>-Element beschrieben ist oder durch die Koordinaten des <gi>surface</gi>-Elements selbst.
-        Die Drehung wird in Bogengrad angegeben. 
-      </desc>
+        Die Drehung wird in Bogengrad angegeben.</desc>
       <datatype minOccurs="1" maxOccurs="1"><dataRef key="teidata.count"/></datatype>
       <defaultVal>0</defaultVal>
     </attDef>
@@ -46798,6 +47257,7 @@ en-tête et un texte, constitue un document TEI.</desc>
   <gloss versionDate="2007-05-04" xml:lang="es">fragmento de texto añadido</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">porzione di testo aggiunta</gloss>
   <gloss versionDate="2018-12-28" xml:lang="ja">追加テキストの範囲</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">hinzugefügter Textabschnitt</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <gi>add</gi>).</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">저자, 필기사, 주석자, 또는 교정자에 의해 추가된 긴 연쇄의 텍스트 시작부를 표시한다.(<gi>add</gi> 참조)</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標記由作者、抄寫者、註解者或更正者所加入的較長連續文字之開端  (參照<gi>add</gi>) 。</desc>
@@ -46958,7 +47418,7 @@ appropriate for which circumstance.</p>
   <desc versionDate="2007-09-03" xml:lang="en">marks the beginning of a longer sequence of text which is damaged in some way but still legible.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">어떤 방식으로 손상되었지만 여전히 읽을 수 있는 긴 텍스트 연쇄 시작부를 표시한다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">marca el inicio de una secuencia de texto larga dañada de alguna manera pero aún legible.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">読める程度の損傷がある、一連のテキストの始点を示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">読める程度の損傷がある、一連のテキストの始点を示す。</desc>
   <desc versionDate="2009-11-16" xml:lang="fr">marque le début d'une longue partie de texte, endommagée d'une manière quelconque mais toujours lisible.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">segnala l'inizio di una sequenza più estesa di testo danneggiata ma ancora leggibile</desc>
   <classes>
@@ -47255,13 +47715,12 @@ the resumption <anchor xml:id="a23"/> of the text. ...</p>
       <desc versionDate="2007-05-04" xml:lang="es">clasifica las convenciones usadas según una tipología funcional.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica le convenzioni usate secondo una tipologia funzionale</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="header">
           <desc versionDate="2007-04-02" xml:lang="en">a running title at the top of the page</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">페이지 상단의 현 제목</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">頁面頂端的欄外標題</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">天にタイトル。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">天にタイトル。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">un titre courant en haut de la page</desc>
           <desc versionDate="2007-05-04" xml:lang="es">título o asunto en el encabezamiento de la página</desc>
           <desc versionDate="2007-01-21" xml:lang="it">titolo nell'intestazione di pagina</desc>
@@ -47270,8 +47729,7 @@ the resumption <anchor xml:id="a23"/> of the text. ...</p>
           <desc versionDate="2007-04-02" xml:lang="en">a running title at the bottom of the page</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">페이지 하단의 제목</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">頁面底端的欄外標題</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">地にあるタイトル。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">地にあるタイトル。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">un titre courant en bas de la page</desc>
           <desc versionDate="2007-05-04" xml:lang="es">título o asunto a pie de página</desc>
           <desc versionDate="2007-01-21" xml:lang="it">titolo nel piè di pagina</desc>
@@ -47285,8 +47743,7 @@ the resumption <anchor xml:id="a23"/> of the text. ...</p>
           <desc versionDate="2007-04-02" xml:lang="en">a page number or foliation symbol</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">페이지 숫자 또는 페이지 기호</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">編頁數號或是編張符號</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">ノンブル。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">ノンブル。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">un numéro de page ou un symbole de foliotation</desc>
           <desc versionDate="2007-11-06" xml:lang="it">numero di pagina o simbolo di foliazione</desc>
           <desc versionDate="2007-05-04" xml:lang="es">número de página o símbolo de la foliación</desc>
@@ -47300,8 +47757,7 @@ the resumption <anchor xml:id="a23"/> of the text. ...</p>
           <desc versionDate="2007-07-04" xml:lang="en">a line number, either of prose or poetry</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">산문 또는 시에서 행 번호</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un número de línea, en prosa o verso</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">韻文・散文における行番号。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">韻文・散文における行番号。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">numéro d'une ligne en prose ou en vers</desc>
           <desc versionDate="2007-11-06" xml:lang="it">numero di riga di testo in prosa o componimento poetico</desc>
         </valItem>
@@ -47314,8 +47770,7 @@ the resumption <anchor xml:id="a23"/> of the text. ...</p>
           <desc versionDate="2007-12-20" xml:lang="ko">서명 혹은 서명 기호</desc>
           <desc versionDate="2008-10-02" xml:lang="fr">signature ou marque de cahier</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">簽名或是聚集符號</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">折丁記号。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">折丁記号。</desc>
           <desc versionDate="2007-05-04" xml:lang="es">firma o símbolo común</desc>
           <desc versionDate="2007-01-21" xml:lang="it">firma o simbolo comune</desc>
         </valItem>
@@ -47328,8 +47783,7 @@ the resumption <anchor xml:id="a23"/> of the text. ...</p>
           <desc versionDate="2007-04-02" xml:lang="en">a catch-word</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">색인어</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">標語</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">柱。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">柱。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">une réclame</desc>
           <desc versionDate="2007-05-04" xml:lang="es">reclamo</desc>
           <desc versionDate="2007-01-21" xml:lang="it">reclamo</desc>
@@ -49601,8 +50055,7 @@ and <gi>rdg</gi>, and also within any of their constituent elements. </p>
 which attest to a given reading.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">제시된 독법을 증명하는 비교 대상 텍스트를 나타내는 하나 이상의 포인터 목록을 포함한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一個或多個指標的一份列表，連結到已知對應本的版本。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該解釈を証す文献を示す1つ以上のポインタのリストを示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該解釈を証す文献を示す1つ以上のポインタのリストを示す。</desc>
       <desc versionDate="2009-05-28" xml:lang="fr">contient une liste comprenant un ou plusieurs pointeurs qui désignent
 					les témoins attestant d'une leçon donnée.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">contiene una lista de uno o más indicadores que muestran los testimonios que presentan una determinada lectura.</desc>
@@ -49666,7 +50119,7 @@ supplied as the content of a child <gi>wit</gi> element.</p>
   Also see TEI ticket #1867. -->
   <attList>
     <attRef class="att.typed" name="subtype"/>
-    <attDef ident="type" usage="opt" mode="add">
+    <attDef ident="type" usage="opt">
       <desc versionDate="2005-10-10" xml:lang="en">classifies the reading according to some useful typology.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">유용한 유형에 따라 독법을 분류한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">用合宜的分類法將對應本分類。</desc>
@@ -49732,8 +50185,7 @@ sequence, when there is reason to presume a sequence to the variants.
       <desc versionDate="2007-12-20" xml:lang="ko">어떤 연쇄를 임의의 레마에 관한 이문으로 추정하는 이유가 있을 때, 어떤 연쇄에서 이 독본의 위치를 나타내는 수를 제공한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">當有理由假設任一主題的一系列變異對應本時，則提供一個數字，指出此對應本於連續系列中的位置。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">1つの対象語に対する一連の異形を想定する理由がある場合、当該解釈
-        がある場所を番号で示す。
-	</desc>
+        がある場所を番号で示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">fournit un nombre indiquant la position
 					de la leçon dans une séquence, lorsqu'on peut supposer un ordre pour les
 					variantes de chaque lemme.</desc>
@@ -49841,6 +50293,7 @@ different witnesses.
     <memberOf key="att.editLike"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -49925,6 +50378,7 @@ different witnesses.
     <memberOf key="att.editLike"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50014,6 +50468,7 @@ different witnesses.
     <memberOf key="model.persNamePart"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50045,13 +50500,14 @@ different witnesses.
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含名字或教名。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">人物に与えられた名前のうち、名の部分、すなわち個人を表す部分を示す。</desc>
   <desc versionDate="2009-03-19" xml:lang="fr">contient un prénom, qu'il soit donné ou un nom de baptême.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">contiene el nombre de pila asignado en el bautismo. </desc>
+  <desc versionDate="2007-05-04" xml:lang="es">contiene el nombre de pila asignado en el bautismo.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene un prenome assegnato o un nome di battesimo</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.persNamePart"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50110,6 +50566,7 @@ different witnesses.
     <memberOf key="model.persNamePart"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50177,7 +50634,7 @@ different witnesses.
   <desc versionDate="2008-04-05" xml:lang="ja">名前の中で使われているが、その一部としては見られない、関連する句やリ ンクを示す。例えば、<mentioned>van der</mentioned>や
         <mentioned>of</mentioned>など。</desc>
   <desc versionDate="2009-03-19" xml:lang="fr">contient une particule ou une expression exprimant un lien, utilisés dans un nom mais considérés comme
-        n'en faisant pas partie, comme "van der" ou "de".</desc>
+        n'en faisant pas partie, comme <q>van der</q> ou <q>de</q>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene un afijo de conexión al interno del nombre no considerado parte del nombre, como p.ej. Van Der,
         o De Las.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene un affisso di connessione all'interno del nome non considerato parte del nome, come van der
@@ -50186,6 +50643,7 @@ different witnesses.
     <memberOf key="att.global"/>
     <memberOf key="model.persNamePart"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50260,6 +50718,7 @@ different witnesses.
     <memberOf key="model.persNamePart"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50312,6 +50771,7 @@ different witnesses.
     <memberOf key="model.persNamePart"/>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50391,6 +50851,7 @@ different witnesses.
     <memberOf key="att.typed"/>
     <memberOf key="model.placeNamePart"/>
     <memberOf key="model.settingPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50527,6 +50988,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50611,6 +51073,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50697,6 +51160,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50778,6 +51242,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50862,6 +51327,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.datable"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -50972,7 +51438,8 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.offsetLike"/>
-    <memberOf key="att.dimensions"/>    
+    <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -51046,6 +51513,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.placeNamePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -51132,7 +51600,8 @@ different witnesses.
     <memberOf key="att.typed"/>
     <memberOf key="model.offsetLike"/>
     <memberOf key="att.dimensions"/>
- </classes>
+    <memberOf key="att.cmc"/>
+  </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
   </content>
@@ -51222,7 +51691,7 @@ different witnesses.
             <listPlace type="affected">
               <place>
                 <placeName xml:lang="pl">Gdańsk</placeName>
-                <location><geo>54.350556, 18.652778</geo></location>
+                <location><geo>54.350556 18.652778</geo></location>
               </place>
             </listPlace>
           </event>
@@ -51332,6 +51801,7 @@ different witnesses.
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="affiliation">
   <gloss versionDate="2008-12-09" xml:lang="en">affiliation</gloss>
   <gloss versionDate="2008-12-09" xml:lang="fr">affiliation</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Affiliation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains an informal description of a person's present or past affiliation with some
         organization, for example an employer or sponsor.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">고용주 또는 후원자와 같이 개인의 현재 또는 과거 소속 조직에 대한 비공식적 기술을 포함한다.</desc>
@@ -51346,6 +51816,8 @@ different witnesses.
   <desc versionDate="2007-01-21" xml:lang="it">contiene una descrizione informale dell'appartenenza
         presente o passata di una persona a una determinata organizzazione, per esempio un'azienda o
         un ente finanziatore</desc>
+  <desc versionDate="2024-04-11" xml:lang="de">enthält eine informelle Beschreibung der gegenwärtigen
+        oder früheren Zugehörigkeit einer Person zu einer Organisation, z. B. eines Arbeitgebers oder Sponsors.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.addressLike"/>
@@ -51354,6 +51826,7 @@ different witnesses.
     <memberOf key="att.datable"/>
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -51396,7 +51869,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="sponsor"/>
 	<valItem ident="recommend"/>
 	<valItem ident="discredit"/>
@@ -51519,7 +51992,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="western"/>
 	<valItem ident="sui"/>
 	<valItem ident="subjective"/>
@@ -51660,7 +52133,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="caesarean">
 	  <gloss xml:lang="en" versionDate="2017-06-23">caesarean section</gloss>
 	  <gloss xml:lang="ja" versionDate="2023-09-27">帝王切開</gloss>
@@ -51734,6 +52207,7 @@ different witnesses.
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.placeStateLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -51899,7 +52373,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="proclaimed"/>
 	<valItem ident="assumed"/>
 	<valItem ident="verified"/>
@@ -52003,7 +52477,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="primary"/>
 	<valItem ident="secondary"/>
 	<valItem ident="undergraduate"/>
@@ -52328,7 +52802,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="practicing"/>
 	<valItem ident="clandestine"/>
 	<valItem ident="patrilineal"/>
@@ -52537,6 +53011,7 @@ different witnesses.
     <memberOf key="att.global"/>
     <memberOf key="att.declaring"/>
     <memberOf key="model.measureLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <textNode/>
@@ -52596,11 +53071,9 @@ different witnesses.
   <desc versionDate="2009-03-19" xml:lang="fr">synthétise l'état des connaissances linguistiques d'une personne, soit en texte libre soit par une liste
         d'éléments <gi>langKnown</gi>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">resume los conocimientos lingüísticos de una persona de forma descriptiva o a través de una lista de
-        elementos <gi>langKnown</gi>
-   </desc>
+        elementos <gi>langKnown</gi></desc>
   <desc versionDate="2007-01-21" xml:lang="it">riassume la conoscenza linguistica di una persona in forma descrittiva o tramite una lista di elementi
-            <gi>langKnown</gi>
-   </desc>
+            <gi>langKnown</gi></desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.persStateLike"/>
@@ -52655,7 +53128,7 @@ different witnesses.
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="listening"/>
 	<valItem ident="speaking"/>
 	<valItem ident="reading"/>
@@ -52867,7 +53340,7 @@ different witnesses.
   <desc versionDate="2007-12-20" xml:lang="ko">식별 가능한 조직에 관한 정보를 제공하며, 각각에 대한 기술 목록을 포함한다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">contiene una lista de descripciones, que proporciona a
         la información sobre una organización identificable.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">特定可能な団体に関する情報を示す解説のリストを示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">特定可能な団体に関する情報を示す解説のリストを示す。</desc>
   <desc versionDate="2008-12-09" xml:lang="fr">contient une liste d'éléments, chacun d'eux fournissant
         des informations sur une organisation identifiable.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">contiene una lista di descrizioni, ognuna delle quali
@@ -52879,6 +53352,7 @@ different witnesses.
     <memberOf key="att.sortable"/>
     <memberOf key="model.listLike"/>
     <memberOf key="model.orgPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -52956,6 +53430,7 @@ different witnesses.
     <memberOf key="att.sortable"/>
     <memberOf key="model.listLike"/>
     <memberOf key="model.eventLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -53048,6 +53523,7 @@ raiders and saved the town from capture.</desc>
     <memberOf key="att.sortable"/>
     <memberOf key="model.listLike"/>
     <memberOf key="model.orgPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -53135,6 +53611,7 @@ raiders and saved the town from capture.</desc>
     <memberOf key="att.sortable"/>
     <memberOf key="model.listLike"/>
     <memberOf key="model.orgPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -53194,6 +53671,7 @@ raiders and saved the town from capture.</desc>
     <memberOf key="att.sortable"/>
     <memberOf key="model.biblPart"/>
     <memberOf key="model.listLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -53327,6 +53805,7 @@ raiders and saved the town from capture.</desc>
     <memberOf key="model.placeStateLike"/>
     <memberOf key="att.datable"/>
     <memberOf key="att.editLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -53477,7 +53956,7 @@ raiders and saved the town from capture.</desc>
       <datatype>
 	<dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
 	<valItem ident="birth"/>
 	<valItem ident="naturalised"/>
 	<valItem ident="self-assigned"/>
@@ -53563,7 +54042,7 @@ raiders and saved the town from capture.</desc>
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="primary"/>
         <valItem ident="other"/>
         <valItem ident="paid"/>
@@ -53597,8 +54076,7 @@ raiders and saved the town from capture.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">identifica un código relativo a la ocupación definido en el sistema de clasificación o taxonomía
                 establecido por el atributo <att>scheme</att>.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">corrisponde a un codice relativo all'occupazione definito nel sistema di classificazione o
-                tassonomia stabiliti dall'attributo <att>scheme</att>
-         </desc>
+                tassonomia stabiliti dall'attributo <att>scheme</att></desc>
       <datatype><dataRef key="teidata.pointer"/></datatype>
     </attDef>
   </attList>
@@ -54175,6 +54653,7 @@ specification.</p></remarks>
     <memberOf key="att.typed"/>
     <memberOf key="model.persStateLike"/>
     <memberOf key="model.persNamePart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -54412,6 +54891,7 @@ specification.</p></remarks>
     <memberOf key="att.typed"/>
     <memberOf key="model.placeStateLike"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -54732,7 +55212,7 @@ specification.</p></remarks>
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="primary"/>
         <valItem ident="secondary"/>
         <valItem ident="temporary"/>
@@ -54977,15 +55457,14 @@ specification.</p></remarks>
       <desc versionDate="2007-05-04" xml:lang="es">identifica un código relativo a la condición socio-económica definido en el sistema de
                 clasificación o taxonomía establecidos por el attributo <att>source</att>.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">corrisponde a un codice relativo alla condizione socio-economica definito nel sistema di
-                classificazione o tassonomia stabiliti dall'attributo <att>source</att>
-         </desc>
+                classificazione o tassonomia stabiliti dall'attributo <att>source</att></desc>
       <datatype><dataRef key="teidata.pointer"/></datatype>
     </attDef>
     <attDef ident="type" usage="opt" mode="change">
       <datatype>
         <dataRef key="teidata.enumerated"/>
       </datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="atBirth"/>
         <valItem ident="atDeath"/>
         <valItem ident="dependent"/>
@@ -55058,6 +55537,7 @@ specification.</p></remarks>
     <memberOf key="model.orgStateLike"/>
     <memberOf key="model.placeStateLike"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -55191,6 +55671,7 @@ specification.</p></remarks>
     <memberOf key="att.naming"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.placeStateLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -55294,6 +55775,7 @@ specification.</p></remarks>
     <memberOf key="model.persStateLike"/>
     <memberOf key="model.placeStateLike"/>
     <memberOf key="att.dimensions"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -55418,6 +55900,7 @@ specification.</p></remarks>
     <memberOf key="att.personal"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.nameLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -55573,7 +56056,7 @@ specification.</p></remarks>
               <settlement>Cairo</settlement>
               <country>Egypt</country>
               <location>
-                <geo>30.047778, 31.233333</geo>
+                <geo>30.047778 31.233333</geo>
               </location>
             </address>
           </objectIdentifier>
@@ -55672,6 +56155,7 @@ specification.</p></remarks>
     <memberOf key="att.sortable"/>
     <memberOf key="model.listLike"/>
     <memberOf key="model.objectLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -55896,7 +56380,7 @@ specification.</p></remarks>
   <desc versionDate="2007-04-12" xml:lang="en">contains a list of nyms, that is, standardized names for any thing.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">어떤 사물에 대한 표준화된 이름 목록을 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含一正式名稱列表，即任何事物的標準名稱。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">別名、すなわち、一般的に使われている名前のリストを示す。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">別名、すなわち、一般的に使われている名前のリストを示す。</desc>
   <desc versionDate="2009-03-19" xml:lang="fr">contient une liste de noms normalisés pour tous types d'objets.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">contiene una lista di nym, cioè nomi standard per qualsiasi cosa</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene una lista de nyms, es decir, nombres estándard para cualquier cosa.</desc>
@@ -55906,6 +56390,7 @@ specification.</p></remarks>
     <memberOf key="att.declarable"/>
     <memberOf key="att.sortable"/>
     <memberOf key="model.listLike"/>
+    <memberOf key="att.cmc"/>
   </classes>
 <content>
  <sequence>
@@ -56400,8 +56885,7 @@ one initial.</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme des valeurs d'attribut qui sont capables
     d''exprimer une valeur temporelle comme une date, une période, ou une combinaison des deux qui
     se conforment au standard international <title>Data elements and interchange formats –
-      Information interchange – Representation of dates and times</title>
-   </desc>
+      Information interchange – Representation of dates and times</title></desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos que expresan una
     expresión temporal como una fecha, una hora, o una combinación de estas, de acuerdo a un
     estándard internacional <title>Elementos de datos y formatos de intercambio - Intercambio de
@@ -56445,7 +56929,7 @@ one initial.</desc>
     using ISO 8601 standard formats</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。 </desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">ISO 8601にある標準形式を使い、時間幅を表現する当該属性値の範囲を定義 する。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define la gama de valores de atributos posibles para
     representar la duración en el tiempo usando formatos estàndards ISO 8601.</desc>
@@ -56553,7 +57037,8 @@ one initial.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.listLike"/>
-    <memberOf key="att.typed"/>    
+    <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -56891,6 +57376,7 @@ one initial.</desc>
     <memberOf key="att.global"/>
     <memberOf key="model.graphicLike"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
        <alternate minOccurs="0" maxOccurs="unbounded">
@@ -56943,6 +57429,7 @@ one initial.</desc>
     <memberOf key="att.global"/>
     <memberOf key="att.placement"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
       <alternate minOccurs="0" maxOccurs="unbounded">
@@ -57005,6 +57492,7 @@ one initial.</desc>
     <memberOf key="att.placement"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -57468,7 +57956,7 @@ for a spoken one, radio, telephone, face-to-face, etc.</desc>
           <desc versionDate="2007-07-04" xml:lang="en">e.g. dictation</desc>
           <gloss versionDate="2023-10-02" xml:lang="ja">書き起こし</gloss>
           <desc versionDate="2007-12-20" xml:lang="ko">예, 받아쓰기</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">為寫而說 (例如聽寫) 　</desc>
+          <desc versionDate="2007-05-02" xml:lang="zh-TW">為寫而說 (例如聽寫)</desc>
           <desc versionDate="2008-04-06" xml:lang="es">p.ej. dictado</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">発話されたものを書いたもの。例えば書き起こしなど。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">une dictée par exemple.</desc>
@@ -57484,7 +57972,7 @@ for a spoken one, radio, telephone, face-to-face, etc.</desc>
           <gloss versionDate="2023-10-02" xml:lang="ja">台本</gloss>
           <desc versionDate="2007-07-04" xml:lang="en">e.g. a script</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">예, 스크립트</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">為說而寫 (例如稿子) 　</desc>
+          <desc versionDate="2007-05-02" xml:lang="zh-TW">為說而寫 (例如稿子)</desc>
           <desc versionDate="2008-04-06" xml:lang="es">p.ej. un guión</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">書かれたものを発話したもの。例えば、台本など。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un script par exemple.</desc>
@@ -57557,7 +58045,7 @@ as fragmentary, complete, etc.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica come era costituito il testo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <defaultVal>single</defaultVal>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="single">
           <desc versionDate="2007-06-27" xml:lang="en">a single complete text</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">단일 완전 텍스트</desc>
@@ -57676,14 +58164,13 @@ the <att>org</att> attribute on <gi>div</gi> and the
       <desc versionDate="2007-05-04" xml:lang="es">caracteriza la derivación del texto</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica la provenienza del testo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="original">
           <desc versionDate="2007-06-27" xml:lang="en">text is original</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 원본이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本為原創文本</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto es original</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストはオリジナルである。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストはオリジナルである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est un texte original.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è originale</desc>
         </valItem>
@@ -57692,8 +58179,7 @@ the <att>org</att> attribute on <gi>div</gi> and the
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 다른 텍스트의 수정본이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本為另一文本的修訂版</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto es una revisión de algún otro texto</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを元にした改訂である。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを元にした改訂である。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est une révision d'un autre
 texte.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è una revisione di qualche altro testo</desc>
@@ -57703,8 +58189,7 @@ texte.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 다른 텍스트의 번역본이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本為另一文本的翻譯版</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto es una traducción de algún otro texto</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを翻訳したものである。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを翻訳したものである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est une traduction d'un autre
 texte.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è la traduzione di qualche altro testo</desc>
@@ -57714,8 +58199,7 @@ texte.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스가 다른 텍스트의 요약본이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本為另一文本的刪節版</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto es una versión abreviada de algún otro texto</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを簡約したものである。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを簡約したものである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est une version abrégée d'un
 autre texte.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è una versione ridotta di qualche altro testo</desc>
@@ -57725,8 +58209,7 @@ autre texte.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 다른 텍스트의 표절본이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本抄襲自另一文本</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto es un plagio de algún otro texto</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを剽窃したものである。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、他のテキストを剽窃したものである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est un plagiat d'un autre
 texte.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è un plagio di qualche altro testo</desc>
@@ -57738,8 +58221,7 @@ texte.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本無明確來源，但和其他文本有共同的衍生來歷</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto no tiene ninguna fuente obvia, pero es uno de los derivados de algún antepasado común</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、元資料が不明であるが、何かしらを元にたテキス
-	  トである。
-	</desc>
+	  トである。</desc>
           <desc versionDate="2009-03-20" xml:lang="fr">le texte n'a pas de source évidente mais
 est l'un des nombreux textes dérivés d'un ancêtre commun.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è privo di una specifica fonte, ma è uno dei testi derivati da una fonte comune</desc>
@@ -57826,7 +58308,7 @@ education, religion, etc.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">clasifica el campo de uso.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica l'ambito di uso.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="art">
           <desc versionDate="2007-06-27" xml:lang="en">art and entertainment</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">예술과 연예</desc>
@@ -57973,14 +58455,13 @@ or a non-fictional world.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">clasifica la objetividad de un texto</desc>
       <desc versionDate="2007-01-21" xml:lang="it">classifica la fattualità del testo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="fiction">
           <desc versionDate="2007-06-27" xml:lang="en">the text is to be regarded as entirely imaginative</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 전적으로 상상적이라 간주된다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">文本為完全虛構</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto debe ser considerado como enteramente imaginativo</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、想像の産物である。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、想像の産物である。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est à considérer comme
 purement imaginaire.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo deve essere considerato interamente fittizio</desc>
@@ -57990,8 +58471,7 @@ purement imaginaire.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 전적으로 정보적이거나 사실적이라고 간주된다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">文本完全根據事實</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto debe ser considerado como enteramente informativo o efectivo</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、事実的なものである。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、事実的なものである。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est à considérer comme
 entièrement informatif ou basé sur des faits.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo deve essere considerato interamente informativo e basato su fatti</desc>
@@ -58001,8 +58481,7 @@ entièrement informatif ou basé sur des faits.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 사실과 허구의 혼합이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">文本內容部分虛構、部分根據事實</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto contiene una mezcla de realidad y de ficción</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、フィクション、ノンフィクションが混在している。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該テキストは、フィクション、ノンフィクションが混在している。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte contient un mélange de faits
 et de fiction.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo contiene un misto di fatti e finzione</desc>
@@ -58013,8 +58492,7 @@ et de fiction.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">사실과 허구의 구별은 이 텍스트에 적절치 않은 것으로 간주된다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該文本不適宜使用虛構／真實的區分方法</desc>
           <desc versionDate="2008-04-06" xml:lang="es">la distinción ficción/realidad no se considera útil o apropiada para este texto</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">フィクション、ノンフィクションの区別は問題にならない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">フィクション、ノンフィクションの区別は問題にならない。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">la distinction entre faits et fiction
 n'est pas considérée comme utile ou appropriée pour ce texte.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la distinzione fittivo reale non è considerata utile o appropriata per il testo</desc>
@@ -58127,14 +58605,13 @@ form of response or interjection, commentary, etc.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">describe el grado de interacción entre los participantes activos y pasivos en un texto.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica il grado di interazione tra partecipanti attivi e passivi all'interno del testo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="none">
           <desc versionDate="2007-06-27" xml:lang="en">no interaction of any kind, e.g. a monologue</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">종류의 상호작용이 없다. 예, 독백.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">無任何互動，例如獨白</desc>
           <desc versionDate="2008-04-06" xml:lang="es">no hay ninguna interacción de ningún tipo, p.ej. un monólogo</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">相互作用ではない。例えば、独白など。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">相互作用ではない。例えば、独白など。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">pas la moindre interaction, un
 monologue par exemple.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">mancanza di qualsiasi interazione, ad esempio un monologo</desc>
@@ -58144,8 +58621,7 @@ monologue par exemple.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">어느 정도의 상호작용, 예, 고정된 반응을 유발하는 독백</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">某種程度上的互動，例如具有背景回應的獨白</desc>
           <desc versionDate="2008-04-06" xml:lang="es">cierto grado de interacción, p.ej. un monólogo con las respuestas de grupo</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">ある程度の相互作用。例えば、反応する人がいる状況での独白など。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">ある程度の相互作用。例えば、反応する人がいる状況での独白など。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un certain degré d'interaction, par
 exemple un monologue avec une série de réponses.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">qualche grado di interazione, ad esempio un monologo con risposte stabilite</desc>
@@ -58155,8 +58631,7 @@ exemple un monologue avec une série de réponses.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">완전한 상호작용, 예, 대면 대화</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">完全性的互動，例如面對面交談</desc>
           <desc versionDate="2008-04-06" xml:lang="es">interacción completa, p.ej. una conversación cara a cara</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">完全なる相互作用。例えば、直接対話など。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">完全なる相互作用。例えば、直接対話など。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">une interaction complète, par exemple
 une conversation en tête-à-tête.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">interazione completa. ad esempio conversazione faccia a faccia</desc>
@@ -58166,8 +58641,7 @@ une conversation en tête-à-tête.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 매개변인은 이 경우에 부적절하거나 적용불가능하다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">這項特性在此不適當或不適用</desc>
           <desc versionDate="2008-04-06" xml:lang="es">este parámetro es inadecuado o inaplicable en este caso</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該パラメータは、不適切、または使用が相応しくない。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該パラメータは、不適切、または使用が相応しくない。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">ce paramètre est inapproprié ou
 inapplicable dans ce cas.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il parametro è inappropriato o inapplicabile in questo caso</desc>
@@ -58191,8 +58665,7 @@ inapplicable dans ce cas.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">단일 화자</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">一位傳達者</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un solo interlocutor</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">個人の参加者。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">個人の参加者。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un seul émetteur.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">un singolo partecipante attivo</desc>
         </valItem>
@@ -58201,8 +58674,7 @@ inapplicable dans ce cas.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">다수의 화자</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">多位傳達者</desc>
           <desc versionDate="2008-04-06" xml:lang="es">muchos interlocutores</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">複数の参加者。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">複数の参加者。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">plusieurs émetteurs.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">molti partecipanti attivi</desc>
         </valItem>
@@ -58211,8 +58683,7 @@ inapplicable dans ce cas.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">집단적 화자</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">集體傳達者</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un interlocutor colectivo</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">団体としての参加者。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">団体としての参加者。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un émetteur collectif.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">un partecipante attivo collettivo</desc>
         </valItem>
@@ -58221,8 +58692,7 @@ inapplicable dans ce cas.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">미지의 또는 미명시된 화자의 수</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">傳達人數未知或未指明</desc>
           <desc versionDate="2008-04-06" xml:lang="es">número de interlocutores desconocidos o inespecificables</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">参加者は不明または特定不可能。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">参加者は不明または特定不可能。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un nombre d'émetteurs inconnu ou
 impossible à spécifier.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">un numero di partecipanti attivi sconosciuto o non specificabile</desc>
@@ -58248,8 +58718,7 @@ impossible à spécifier.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 창작자에게 전달된다. 예, 일기.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">文本內容傳遞給原創作者，例如日記</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto se dirige a su creador, p.ej. un diario</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">テキストは作成者に向けられたもの。例えば、日記など。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">テキストは作成者に向けられたもの。例えば、日記など。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est adressé à soi-même, comme
 un journal intime par exemple.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è indirizzato a colui chè l'ha prodotto, ad esempio un diario</desc>
@@ -58259,8 +58728,7 @@ un journal intime par exemple.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">텍스트가 다른 한 사람에게 전달된다. 예, 개인적 편지</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">文本內容傳遞給另一個人，例如私人信件</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto se dirige a cualquier otra persona, p.ej. una carta personal</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">テキストは他の人物に向けられたもの。例えば、個人書簡など。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">テキストは他の人物に向けられたもの。例えば、個人書簡など。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">le texte est adressé à une seule autre
 personne, comme une lettre personnelle par exemple.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo è indirizzato ad una sola altra persona, ad esempio una lettera privata</desc>
@@ -58359,7 +58827,7 @@ prepared or spontaneous.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">una palabra clave que caracteriza el tipo de preparación.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">una parola chiava che caratterizza il grado di spontaneità</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="none">
           <desc versionDate="2007-06-27" xml:lang="en">spontaneous or unprepared</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">자발적 또는 준비되지 않은</desc>
@@ -58447,7 +58915,7 @@ text.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">especifica un tipo particular de finalidad</desc>
       <desc versionDate="2007-01-21" xml:lang="it">specifica un tipo particolare di scopo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="persuade">
           <desc versionDate="2007-06-27" xml:lang="en">didactic, advertising, propaganda, etc.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">설교, 광고, 선전 등</desc>
@@ -58663,6 +59131,7 @@ place concerned, for example: a room, a restaurant, a park bench, etc.</desc>
   <gloss xml:lang="en" versionDate="2009-04-17">activity</gloss>
   <gloss xml:lang="es" versionDate="2022-06-16">actividad</gloss>
   <gloss xml:lang="fr" versionDate="2009-04-17">activité</gloss>
+  <gloss versionDate="2024-04-11" xml:lang="de">Aktivität</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">contains a brief informal description of what a participant in a
 language interaction is doing other than speaking, if anything.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">언어 상호작용 참여자의 발화 외의 다른 행위에 대한 간단한 일상적 기술을 포함한다.</desc>
@@ -58752,6 +59221,7 @@ Information with a Text</head>
     <memberOf key="att.pointing"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <constraintSpec ident="linkTargets3" scheme="schematron">
@@ -58808,6 +59278,7 @@ Information with a Text</head>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing.group"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -58935,7 +59406,7 @@ Information with a Text</head>
   <desc versionDate="2007-12-20" xml:lang="ko">의미적 부담 없이, 문단과 유사한 구 또는 상호층위 요소에 대한 익명 전달체로 기능하는 임의적 성분-층위 단위를 포함한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">包含文件中任何隨機組合性層次的單元，匿名收容類似一個段落、但不包含段落語義的字詞或中間層元素。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">任意の部分的テキスト単位を示す。特定の意味はなくとも、段落に相当する、 句レベル・挿入レベルの単位として無名単位になる。</desc>
-  <desc versionDate="2009-10-05" xml:lang="fr">contient une unité de texte quelconque, de niveau "composant", faisant office de contenant anonyme pour une expression ou des éléments de niveau intermédiaire, analogue à un paragraphe mais sans sa portée sémantique.</desc>
+  <desc versionDate="2009-10-05" xml:lang="fr">contient une unité de texte quelconque, de niveau <q>composant</q>, faisant office de contenant anonyme pour une expression ou des éléments de niveau intermédiaire, analogue à un paragraphe mais sans sa portée sémantique.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">contiene cualquier unidad textual a nivel de componente que actua como un contenedor anónimo de sintagmas o de elementos de internivel similares al párrafo pero sin la carga semántica de este último.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una qualsiasi unità testuale a livello di componente che funge da contenitore anonimo di sintagmi o elementi interlivello simili al paragrafo ma senza il bagaglio semantico di quest'ultimo</desc>
   <classes>
@@ -58945,6 +59416,7 @@ Information with a Text</head>
     <memberOf key="att.declaring"/>
     <memberOf key="att.fragmentable"/>
     <memberOf key="att.written"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.abContent"/>
@@ -59007,6 +59479,7 @@ Information with a Text</head>
     <memberOf key="att.global"/>
     <memberOf key="model.milestoneLike"/>
     <memberOf key="att.typed"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <exemplum xml:lang="en">
@@ -59077,6 +59550,7 @@ Information with a Text</head>
     <memberOf key="att.typed"/>
     <memberOf key="att.written"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.paraContent"/>
@@ -59206,8 +59680,7 @@ Information with a Text</head>
       <desc versionDate="2008-04-05" xml:lang="ja">親要素<gi>timeLine</gi>から継承されない場合、属性 <att>interval</att>で示される時間の単位を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">spécifie l'unité de temps dans laquelle la valeur de l'attribut <att>interval</att> est exprimée, si elle n'est pas héritée de l'élément parent <gi>timeLine</gi>.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">especifica la unidad temporal en la que se expresa el valor <att>interval</att>, si este valor no es heredado del padre <gi>timeline</gi>.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">specifica l'unità temporale nel quale è espresso l'attributo <att>interval</att>, se questo non è ereditato dal genitore <gi>timeline</gi>
-         </desc>
+      <desc versionDate="2007-01-21" xml:lang="it">specifica l'unità temporale nel quale è espresso l'attributo <att>interval</att>, se questo non è ereditato dal genitore <gi>timeline</gi></desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <valList type="semi">
         <valItem ident="d">
@@ -59320,6 +59793,7 @@ Information with a Text</head>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -59460,6 +59934,7 @@ Information with a Text</head>
     <memberOf key="att.pointing"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>    
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -59662,6 +60137,7 @@ Information with a Text</head>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing.group"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -59741,6 +60217,7 @@ Information with a Text</head>
     <memberOf key="att.pointing"/>
     <memberOf key="att.typed"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content><empty/></content>
   <attList>
@@ -59883,6 +60360,7 @@ Information with a Text</head>
     <memberOf key="att.global"/>
     <memberOf key="att.pointing.group"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -60020,7 +60498,7 @@ Information with a Text</head>
 <div type="div2" xml:id="SASOann"><head>Annotations</head>
 <elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="standOff" mode="add" module="linking">
   <desc xml:lang="en" versionDate="2018-10-31">Functions as a container element for linked data, contextual information, and stand-off annotations embedded in a TEI document.</desc>
-  <desc xml:lang="ja" versionDate="2023-07-29">リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。 </desc>
+  <desc xml:lang="ja" versionDate="2023-07-29">リンクト・データや文脈情報、TEI文書に埋め込まれたスタンドオフ・アノテーションをコンテナ化する要素として機能する。</desc>
   <classes>
     <memberOf key="model.resource"/>
     <memberOf key="att.global"/>
@@ -60030,7 +60508,7 @@ Information with a Text</head>
   <content>
     <classRef key="model.standOffPart" minOccurs="1" maxOccurs="unbounded"/>
   </content>
-  <constraintSpec ident="nested_standOff_should_be_typed" scheme="schematron" mode="add">
+  <constraintSpec ident="nested_standOff_should_be_typed" scheme="schematron">
     <constraint>
       <sch:rule context="tei:standOff">
         <sch:assert test="@type or not(ancestor::tei:standOff)">This
@@ -60146,7 +60624,7 @@ Information with a Text</head>
     <ptr target="#SASOstdf"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="listAnnotation" mode="add" module="linking">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="listAnnotation" module="linking">
   <desc versionDate="2020-03-08" xml:lang="en">contains a list of annotations, typically encoded as
       <gi>annotation</gi>, <gi>annotationBlock</gi>, or <gi>note</gi>, possibly organized with
     nested <gi>listAnnotation</gi> elements.</desc>
@@ -60279,7 +60757,7 @@ Information with a Text</head>
     <ptr target="#SASOstdf"/>
   </listRef>
 </elementSpec>
-<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="annotation" mode="add" module="linking">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" ident="annotation" module="linking">
   <desc versionDate="2020-07-31" xml:lang="en">represents an annotation following the <ref target="#WADM">Web
       Annotation Data Model</ref>.</desc>
   <classes>
@@ -60672,6 +61150,7 @@ Information with a Text</head>
     <memberOf key="att.segLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <!-- NOTE: MDH reversing horrible change to content model mandated
@@ -60760,6 +61239,7 @@ Information with a Text</head>
     <memberOf key="att.segLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -60824,6 +61304,7 @@ etc. as appropriate.</p>
     <memberOf key="att.segLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq"/>
@@ -60890,6 +61371,7 @@ etc. as appropriate.</p>
     <memberOf key="att.typed"/>
     <memberOf key="att.linguistic"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -60980,6 +61462,7 @@ etc. as appropriate.</p>
     <memberOf key="att.segLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -61073,6 +61556,7 @@ etc. as appropriate.</p>
     <memberOf key="att.segLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.notated"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.xtext"/>
@@ -61137,6 +61621,7 @@ etc. as appropriate.</p>
     <memberOf key="att.segLike"/>
     <memberOf key="att.typed"/>
     <memberOf key="att.linguistic"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -61436,8 +61921,7 @@ etc. as appropriate.</p>
     <attDef ident="msd" usage="opt">
       <desc versionDate="2005-10-10" xml:lang="en">(morphosyntactic description) supplies
         morphosyntactic information for a token, usually according to some official reference
-        vocabulary (e.g. for German: <ref target="http://www.ims.uni-stuttgart.de/forschung/ressourcen/lexika/TagSets/stts-1999.pdf">STTS-large tagset</ref>; for a feature description system designed as (pragmatically) universal, see <ref target="http://universaldependencies.org/u/feat/index.html">Universal Features</ref>).
-      </desc>
+        vocabulary (e.g. for German: <ref target="http://www.ims.uni-stuttgart.de/forschung/ressourcen/lexika/TagSets/stts-1999.pdf">STTS-large tagset</ref>; for a feature description system designed as (pragmatically) universal, see <ref target="http://universaldependencies.org/u/feat/index.html">Universal Features</ref>).</desc>
       <datatype><dataRef key="teidata.text"/></datatype>
 
       <exemplum xml:lang="en">
@@ -61548,10 +62032,8 @@ element on which the <att>ana</att> attribute appears.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">属性<att>ana</att>を伴う要素の解釈を含む要素を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">indique un ou plusieurs éléments contenant des
           interprétations de l'élément qui porte l'attribut <att>ana</att>.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">indica uno o más elementos que contienen interpretaciones del elemento en el cual aparece el atributo <att>ana</att>
-         </desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica uno o più elementi che contengono interpretazioni dell'elemento specificato dall'attributo <att>ana</att>
-         </desc>
+      <desc versionDate="2007-05-04" xml:lang="es">indica uno o más elementos que contienen interpretaciones del elemento en el cual aparece el atributo <att>ana</att></desc>
+      <desc versionDate="2007-01-21" xml:lang="it">indica uno o più elementi che contengono interpretazioni dell'elemento specificato dall'attributo <att>ana</att></desc>
       <datatype maxOccurs="unbounded"><dataRef key="teidata.pointer"/></datatype>
 
 
@@ -61594,6 +62076,7 @@ contexts.</p>
     <memberOf key="att.interpLike"/>
     <memberOf key="att.pointing"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <macroRef key="macro.phraseSeq.limited"/>
@@ -61697,14 +62180,14 @@ contexts.</p>
   <desc versionDate="2007-12-20" xml:lang="ko">범위 태그를 모아놓는다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">匯集文字段標籤。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">要素<gi>span</gi>をまとめる。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments <gi>span</gi>
-   </desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">regroupe des éléments <gi>span</gi></desc>
   <desc versionDate="2007-05-04" xml:lang="es">Agrupa las etiquetas del periodo</desc>
   <desc versionDate="2007-01-21" xml:lang="it">raggruppa i marcatori di porzione</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.interpLike"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>   
     <sequence>
@@ -61762,6 +62245,7 @@ contexts.</p>
     <memberOf key="att.global"/>
     <memberOf key="att.interpLike"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <alternate minOccurs="0" maxOccurs="unbounded">
@@ -61823,6 +62307,7 @@ contexts.</p>
     <memberOf key="att.global"/>
     <memberOf key="att.interpLike"/>
     <memberOf key="model.global.meta"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     <sequence>
@@ -61936,8 +62421,7 @@ Feature Value</head></div>
   <desc versionDate="2008-04-05" xml:lang="ja">ひとつ以上の素性構造宣言または素性構造宣言へのリンクを含む、素性シス
   テム宣言を示す。</desc>
   <desc versionDate="2018-07-18" xml:lang="de">bietet eine Deklaration des Merkmalsystems, die aus einer oder mehreren 
-    Merkmalstrukturdeklarationen oder Links zu Merkmalstrukturdeklarationen besteht.
-   </desc>
+    Merkmalstrukturdeklarationen oder Links zu Merkmalstrukturdeklarationen besteht.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">indica la declaración del sistema de rasgos que contiene definiciones para un tipo particular de estructura de rasgos.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">identifica la dichiarazione del sistema di tratti che contiene le definifioni di un particolare tipo di struttura di tratti.</desc>
   <classes>
@@ -62046,8 +62530,7 @@ Feature Value</head></div>
 	derived by combining those specified explicitly within this
 	element with those implied by the <att>baseTypes</att>
 	attribute. When no <att>baseTypes</att> attribute is specified, no
-	feature specification or constraint is inherited.
-</desc>
+	feature specification or constraint is inherited.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">유형으로부터 상속받은 자질 명세와 제약으로 구성된 하나 이상의 유형화된 자질 구조의 이름을 제시한다; 만약 이 유형이 속성에 의해 명시된 것과 동일한 이름을 갖는 자질 명세를 포함한다면, 또는 동일 이름의 하나 이상의 명세가 상속된다면, 가능한 값의 집합은 통합에 의해 정의된다. 비슷하게 적용가능한 제약 집합이 <att>baseTypes</att> 속성에 의해 지시된 제약을 가진 요소 내에서 명백하게 명시된 제약의 결합에 의해 도출된다. <att>baseTypes</att>이 명시되지 않았다면, 어떤 자질 명세 또는 제약도 상속되지 않는다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">提供一個或多個已分類的功能結構名稱，此類型從該功能結構中獲得功能細節與限制；若該類型包含的功能細節名稱同於此屬性所標明的任一功能細節，或者該類型獲得一個以上同名的功能細節，則所有可能的屬性值是為統一定義。同樣地，適用限制的衍生，是將此元素中所明確標明的和屬性<att>baseTypes</att>所標明的結合。若未使用屬性<att>baseTypes</att>，則沒有獲得任何功能細節或限制。</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">ひとつ以上の素性構造を示す。ここから、属性typeは素性定義・制約を
@@ -62203,9 +62686,8 @@ inter-level elements.</p>
 structure declaration for it.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">자질 구조 선언에 유형화된 자질 구조의 이름을 관련시킨다.</desc>
   <desc versionDate="2008-04-06" xml:lang="es">asocia el nombre de una estructura de rasgos dada con una declaración de la estructura de rasgos para ella.</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">素性構造宣言により素性構造の名前を示す。
-</desc>
-  <desc versionDate="2009-04-16" xml:lang="fr">associe le nom d'une structure de traits "type" à
+  <desc versionDate="2008-04-05" xml:lang="ja">素性構造宣言により素性構造の名前を示す。</desc>
+  <desc versionDate="2009-04-16" xml:lang="fr">associe le nom d'une structure de traits <q>type</q> à
 sa déclaration de structure de traits.</desc>
   <desc versionDate="2007-11-06" xml:lang="it">associa il nome di una struttura di tratti alla dichiarazione relativa</desc>
   <classes>
@@ -62220,8 +62702,7 @@ sa déclaration de structure de traits.</desc>
 feature structure.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">기록된 자질 구조의 유형을 식별한다; 이것은 적어도 하나 이상의 자질 구조에 대한 <att>유형</att> 값이 될 것이다.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">解説される素性構造を示す。少なくともひとつの素性構造に関する属性
-      <att>type</att>の値が付与される。
-</desc>
+      <att>type</att>の値が付与される。</desc>
       <desc versionDate="2007-01-21" xml:lang="it">identifica il tipo di dichiarazione del sistema di tratti attraverso il FSD, sarà il valore dell'attributo <att>type</att> di almeno una struttura di tratti.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">identifica el tipo de estructura de rasgos documentada por el FSD; éste será el valor del atributo <att>type</att> al menos en una estructura de rasgos.</desc>
       <desc versionDate="2009-04-16" xml:lang="fr">identifie le type de structure de traits à documenter ; ce sera la valeur de l’attribut <att>type</att> d’au moins une structure de traits.</desc>
@@ -62232,8 +62713,7 @@ feature structure.</desc>
       (<gi>fsDecl</gi>) element within the current document or elsewhere.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">현 문서 내 또는  다른 문서에서 자질 구조 선언 (<gi>fsDecl</gi>) 요소에 대한 포인터를 제공한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">proporciona un puntero a una declaración de estructura de rasgos (elemento <gi>fsDecl</gi>) al interno del documento actual u otro.</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">素性構造宣言要素(<gi>fsDecl</gi>)へのポインタが示される。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">素性構造宣言要素(<gi>fsDecl</gi>)へのポインタが示される。</desc>
       <desc versionDate="2009-04-16" xml:lang="fr">fournit un pointeur vers un élément de
         déclaration de structure de traits (<gi>fsDecl</gi>) dans le document courant ou
 ailleurs.</desc>
@@ -62999,6 +63479,7 @@ structural unit.</desc>
     <memberOf key="model.featureVal.complex"/>
     <memberOf key="model.global.meta"/>
     <memberOf key="att.datcat"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -63651,8 +64132,7 @@ bag (multiset).</desc>
           <desc versionDate="2008-04-06" xml:lang="es">indica que los valores dados están ordenados como una bolsa (conjunto múltiple).</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">バック(順序なし、重複あり)としてある値を示す。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">indique que les valeurs données sont
-organisées en paquet (de plusieurs ensembles).
-</desc>
+organisées en paquet (de plusieurs ensembles).</desc>
           <desc versionDate="2007-01-21" xml:lang="it">indica che i valori dati sono organizzati in una borsa (insieme multiplo).</desc>
         </valItem>
         <valItem ident="list">
@@ -63993,8 +64473,7 @@ sont organisées en ensemble.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">結果として得られた値の構造が、バック(順序なし、重複あり)であ
         ることを示す。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">indique que les valeurs résultantes
-sont organisées en paquet (de plusieurs ensembles).
-</desc>
+sont organisées en paquet (de plusieurs ensembles).</desc>
           <desc versionDate="2007-01-21" xml:lang="it">indica che i valori risultanti dall'unificazione sono organizzati in una borsa (insieme multiplo).</desc>
         </valItem>
         <valItem ident="list">
@@ -64073,6 +64552,7 @@ with the set of values masculine, neuter and feminine.</p>
     <memberOf key="att.global"/>
     <memberOf key="model.global.meta"/>
     <memberOf key="model.fsdDeclPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -64155,6 +64635,7 @@ name to categorize the library's contents.</p>
     <memberOf key="att.global"/>
     <memberOf key="model.global.meta"/>
     <memberOf key="model.fsdDeclPart"/>
+    <memberOf key="att.cmc"/>
   </classes>
   <content>
     
@@ -64279,14 +64760,13 @@ connect the nodes.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">describe el tipo de gráfico</desc>
       <desc versionDate="2007-01-21" xml:lang="it">descrive il tipo di grafo</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="undirected">
           <desc versionDate="2007-06-27" xml:lang="en">undirected graph</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">무방향 그래프</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">無方向圖形</desc>
           <desc versionDate="2008-04-06" xml:lang="es">gráfico no-dirigido</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">無向グラフ。
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">無向グラフ。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">graphe non orienté.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">grafo non orientato</desc>
         </valItem>
@@ -64295,8 +64775,7 @@ connect the nodes.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">방향 그래프</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">有方向圖形</desc>
           <desc versionDate="2008-04-06" xml:lang="es">gráfico dirigido</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">有向グラフ。
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">有向グラフ。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">graphe orienté.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">grafo orientato</desc>
         </valItem>
@@ -64305,8 +64784,7 @@ connect the nodes.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">시작과 종료 노드가 구분되는 방향 그래프</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">清楚標明起始節點與末端節點的有向圖形</desc>
           <desc versionDate="2008-04-06" xml:lang="es">un gráfico dirigido con los nodos iniciales y finales distinguidos</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">遷移ネットワーク。初期ノードと最終ノードを分けた有向グラフ。
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">遷移ネットワーク。初期ノードと最終ノードを分けた有向グラフ。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un graphe orienté avec un nœud
             initial et un nœud terminal bien distincts.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">grafo orientato con nodi finale e iniziale distinti.</desc>
@@ -64316,8 +64794,7 @@ connect the nodes.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">각 호에 두 개의 표지를 부착한 전이망</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">每條連線上最多兩個標籤的過境網絡</desc>
           <desc versionDate="2008-04-06" xml:lang="es">una red de transición con hasta dos escrituras de la etiqueta en cada arco</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">トランスデューサ。各矢に高々2つのラベルを持つ遷移ネットワーク。
-        </desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">トランスデューサ。各矢に高々2つのラベルを持つ遷移ネットワーク。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">un réseau de transition avec jusqu'à
 deux étiquettes par arc.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">rete di transizione con un massimo di due etichette per arco</desc>
@@ -64505,7 +64982,7 @@ other analytic element.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">define un tipo de nodo.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">definisce un tipo di nodo</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="initial">
           <desc versionDate="2007-06-27" xml:lang="en">initial node in a transition network</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">전이망에서 시작 노드</desc>
@@ -65741,8 +66218,7 @@ be encoded with the <gi>eTree</gi> element.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">내포 수형도의 단말 노드를 명시적으로 제공한다. 내포 수형도는 또한 eTree 요소로 부호화될 수 있다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">為嵌入樹狀結構的葉節點所明確提供的元素，也可用元素<gi>eTree</gi>來標記。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">部分木における葉を示す。要素eTree中で使用される。</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">la feuille d'un arbre englobant, qui peut aussi être encodée au moyen d'un élément <gi>eTree</gi>
-   </desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">la feuille d'un arbre englobant, qui peut aussi être encodée au moyen d'un élément <gi>eTree</gi></desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona explícitamente una hoja de un árbol integrado, que puede ser codificado también con el elemento eTree.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">definisce esplicitamente una foglia di un albero integrato, che può essere codificato anche con l'elemento eTree.</desc>
   <classes>
@@ -65911,8 +66387,7 @@ trees (triangles).</p>
       <desc versionDate="2011-12-02" xml:lang="en">identifies the type of the forest group.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">수형도군의 유형을 식별한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">標明森林群組的類型。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該森集合の種類を示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">当該森集合の種類を示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">précise le type du groupe de forêts.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">identifica el tipo de grupo de bosque</desc>
       <desc versionDate="2007-01-21" xml:lang="it">identifica il tipo di gruppo di foresta</desc>
@@ -66102,7 +66577,7 @@ trees (triangles).</p>
     <attDef ident="type" usage="opt" mode="change">
       <desc versionDate="2021-01-28" xml:lang="en">characterizes the element in some sense, using any convenient
          classification scheme or typology; sample categorization of annotations of uncertainty might use following values:</desc>
-      <valList type="open" mode="add">
+      <valList type="open">
         <valItem ident="ignorance"/>
         <valItem ident="incompleteness"/>
         <valItem ident="credibility"/>
@@ -66529,8 +67004,7 @@ markup of particular element(s).</desc>
       <!-- anywhere: -->
       <respons target="sgrp05" locus="name" resp="../contextual/persons.xml#rcapolung.ewo">
         <desc>Ashley did not know what to do with this; I have decided it
-    best fits as a braced <gi>spGrp</gi>
-            </desc>
+    best fits as a braced <gi>spGrp</gi></desc>
       </respons>
       <respons target="sgrp05" match=".//@rend" locus="value" resp="../contextual/persons.xml#sbauman.emt">
         <desc>fixed <att>rend</att> attributes</desc>
@@ -67226,7 +67700,7 @@ provided</item>
       <desc versionDate="2009-01-23" xml:lang="fr">indique quel type de balise XML est prévu.</desc>
       <desc versionDate="2008-04-08" xml:lang="it">indica di quale tipo di marcatore XML si tratta</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="start">
           <desc versionDate="2008-04-05" xml:lang="en">a start-tag, with delimiters &lt; and &gt; is intended</desc>
           <desc versionDate="2009-01-23" xml:lang="fr">une balise de début, délimitée par les signes
@@ -67624,14 +68098,13 @@ provided</item>
         <valItem ident="sequenceOptional">
           <desc versionDate="2013-11-21" xml:lang="en">a single occurrence of
           one or more members
-          of the class may appear in sequence
-          </desc>
+          of the class may appear in sequence</desc>
           <desc versionDate="2024-02-28" xml:lang="ja">クラスの1つ以上のメンバーが順に1回ずつ出現し得る。</desc>
         </valItem>
         <valItem ident="sequenceOptionalRepeatable">
           <desc versionDate="2013-11-21" xml:lang="en">one or more
           occurrences of one or more members of the class
-          may appear in sequence. </desc>
+          may appear in sequence.</desc>
           <desc versionDate="2024-02-28" xml:lang="ja">クラスの1つまたは複数のメンバーが1回以上、順に出現し得る。</desc>
         </valItem>
         <valItem ident="sequenceRepeatable">
@@ -68625,7 +69098,7 @@ that is a group of
       <desc versionDate="2007-05-04" xml:lang="es">indica si se trata de una clase de modelos o de atributos.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica se si tratta di una classe di modelli o di attributi</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="closed" mode="add">
+      <valList type="closed">
         <valItem ident="model">
           <gloss versionDate="2007-07-04" xml:lang="en">content model</gloss>
           <gloss versionDate="2007-12-20" xml:lang="ko">내용 모델</gloss>
@@ -68679,8 +69152,7 @@ that is a group of
           <desc versionDate="2007-04-15" xml:lang="en">members of the class are alternatives</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">부류의 원소들은 선택가능 항목이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素是替換元素</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、選択的である。	  
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、選択的である。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">les membres de la classe
 							constituent des alternatives</desc>
           <desc versionDate="2007-05-04" xml:lang="es">los miembros de las clase estan en relación de alternancia.</desc>
@@ -68690,8 +69162,7 @@ that is a group of
           <desc versionDate="2007-04-15" xml:lang="en">members of the class are to be provided in sequence</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">부류의 원소는 차례대로 제시된다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素會依序呈現</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストとしてある。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストとしてある。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">les membres de la classe doivent
 							tous être donnés dans l'ordre indiqué</desc>
           <desc versionDate="2007-05-04" xml:lang="es">los miembros de las clase se indican en secuencia.</desc>
@@ -68702,8 +69173,7 @@ that is a group of
 	    but are optional</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">부류의 원소는 차례대로 제시될 수 있지만 수의적이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素可依序呈現，但非必須</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストから選択される。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストから選択される。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">les membres de la classe peuvent
 							être donnés, dans l'ordre indiqué, mais sont facultatifs</desc>
           <desc versionDate="2007-05-04" xml:lang="es">los miembros de la clase pueden proporcionarse en modo de secuencia pero son opcionales.</desc>
@@ -68714,8 +69184,7 @@ that is a group of
 	    times, in sequence, but are optional.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">부류의 원소들은 한 번 이상 그리고 차례대로 제시될 수 있지만 수의적이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素可一次或多次依序呈現，但非必須</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストから1つ以上が選択される。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストから1つ以上が選択される。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">les membres de la classe peuvent
 							être donnés une ou plusieurs fois, dans l'ordre indiqué, mais sont
 							facultatifs</desc>
@@ -68726,8 +69195,7 @@ that is a group of
           <desc versionDate="2007-04-15" xml:lang="en">members of the class may be provided one or more times, in sequence</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">부류의 원소들은 차례대로 한 번 이상 제시될 수 있다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該元素集的元素可一次或多次依序呈現</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストから1つ以上が選択される。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該クラスの構成要素は、リストから1つ以上が選択される。</desc>
           <desc versionDate="2007-06-12" xml:lang="fr">les membres de la classe doivent
 							être donnés au moins une fois, dans l'ordre indiqué.</desc>
           <desc versionDate="2007-05-04" xml:lang="es">miembros de la clase pueden ser indicados una o más veces en secuencia.</desc>
@@ -68900,8 +69368,7 @@ the associated TEI header.</p>
 portion of an ODD document.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">ODD 문서의 번역 가능 부분의 상태를 나타내는 속성을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供的屬性指出ODD文件中可翻譯部分的狀態。</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">ODD文書中の翻訳可能部分の状態を表す属性を示す。
-</desc>
+  <desc versionDate="2008-04-05" xml:lang="ja">ODD文書中の翻訳可能部分の状態を表す属性を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">fournit les attributs utilisés pour indiquer le statut
       d'une partie traduisible d'un document ODD.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos utilizados para indicar el estatus de un fragmento traducibile de un documento aislado.</desc>
@@ -68911,8 +69378,7 @@ portion of an ODD document.</desc>
       <desc versionDate="2012-05-23" xml:lang="en">specifies the date on which the source text was extracted and sent to the translator</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">번역 버전이 도출된 원본의 버전 이름 또는 수를 명시한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">說明該翻譯版本來源的版本名稱或版本數</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">翻訳対象となった元資料のバージョンを示す。
-</desc>
+      <desc versionDate="2008-04-05" xml:lang="ja">翻訳対象となった元資料のバージョンを示す。</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">spécifie le nom de la version ou le numéro de la
           source dont la version traduite a été tirée.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica nombre o número de versión del original del cual deriva la versione traducida</desc>
@@ -69186,8 +69652,7 @@ module parent.</desc>
     name in the current definition</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 선언은 현 정의에서 동일 이름의 선언을 변경한다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">esta declaración cambia la declaración del mismo nombre en la definición actual</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該宣言は、現行定義中にある同名宣言を修正する。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該宣言は、現行定義中にある同名宣言を修正する。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette déclaration modifie la
 déclaration de même nom dans la définition courante.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la dichiarazione modifica la dichiarazione con lo stesso nome nella definizione corrente</desc>
@@ -69197,8 +69662,7 @@ déclaration de même nom dans la définition courante.</desc>
     name in the current definition</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 선언은 현 정의에서 동일 이름의 선언을 대체한다.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">esta declaración substituye la declaración del mismo nombre en la definición actual</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該宣言は、現行定義中の同名宣言に置き換わる。
-	</desc>
+          <desc versionDate="2008-04-05" xml:lang="ja">当該宣言は、現行定義中の同名宣言に置き換わる。</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette déclaration remplace la
 déclaration de même nom dans la définition courante.</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la dichiarazione sostituisce la dichiarazione con lo stesso nome nella definizione corrente</desc>
@@ -69752,7 +70216,7 @@ déclaration de même nom dans la définition courante.</desc>
         </valItem>
         <valItem ident="graphic">
           <desc versionDate="2015-08-21" xml:lang="en">if <ident>url</ident> is present, uses it to
-            display graphic, else display a placeholder image. </desc>
+            display graphic, else display a placeholder image.</desc>
           <equiv name="img"/>
           <paramList>
             <paramSpec ident="url">
@@ -69774,7 +70238,7 @@ déclaration de même nom dans la définition courante.</desc>
           </paramList>
         </valItem>
         <valItem ident="heading">
-          <desc versionDate="2015-08-21" xml:lang="en">creates a heading. </desc>
+          <desc versionDate="2015-08-21" xml:lang="en">creates a heading.</desc>
           <equiv name="span"/>
           <paramList>
             <paramSpec ident="content"/>
@@ -70374,13 +70838,13 @@ déclaration de même nom dans la définition courante.</desc>
           <desc xml:lang="en" versionDate="2017-05-11">when used with behaviour
               <ident>alternate</ident>, a parameter of this name supplies one of the pair of possible
             values; for example the regularized form rather than the original form within a
-              <gi>choice</gi> element. </desc>
+              <gi>choice</gi> element.</desc>
         </valItem>
         <valItem ident="default">
           <desc xml:lang="en" versionDate="2017-05-11">when used with behaviour
               <ident>alternate</ident>, a parameter of this name supplies one of the pair of possible
             values; for example the original form rather than the regularized form within a
-              <gi>choice</gi> element. </desc>
+              <gi>choice</gi> element.</desc>
         </valItem>
         <!--  <valItem ident="content">
           <desc xml:lang="en" versionDate="2016-03-29" >an expression evaluating to content to process by a behaviour (used with all
@@ -70396,7 +70860,7 @@ déclaration de même nom dans la définition courante.</desc>
         <valItem ident="height">
           <desc xml:lang="en" versionDate="2016-03-29">when used with behaviour
               <ident>graphic</ident>, a parameter of this name supplies a value for the height of
-            the graphic e.g. "300px", "50%". </desc>
+            the graphic e.g. <q>300px</q>, <q>50%</q>.</desc>
         </valItem>
         <valItem ident="id">
           <desc xml:lang="en" versionDate="2016-03-29">a parameter of this name should supply a
@@ -70407,7 +70871,7 @@ déclaration de même nom dans la définition courante.</desc>
           <desc xml:lang="en" versionDate="2016-03-29">a parameter of this name should supply an
             expression to be used to label something, for example <code>concat('Page ', @n)</code>
             for a page break or <code>@n</code> for a footnote reference; typically used with the
-              <ident>note</ident> or <ident>break</ident> behaviours </desc>
+              <ident>note</ident> or <ident>break</ident> behaviours</desc>
         </valItem>
         <valItem ident="level">
           <desc xml:lang="en" versionDate="2016-03-29">when used with the <ident>heading</ident>
@@ -70417,20 +70881,19 @@ déclaration de même nom dans la définition courante.</desc>
         <valItem ident="link">
           <desc xml:lang="en" versionDate="2016-03-29">when used with the <ident>link</ident>
             behaviour, a parameter of this name should supply a URL to be used as the target of a
-            link. <!-- why not call it target then? -->
-          </desc>
+            link. <!-- why not call it target then? --></desc>
         </valItem>
         <valItem ident="place">
           <desc xml:lang="en" versionDate="2017-05-11">when used with the <ident>note</ident>
             behaviour, a parameter of this name should provide a string which describes the intended
-            placement of some text; typical values include "margin", "footnote", "endnote",
-            "inline", "bottom" </desc>
+            placement of some text; typical values include <q>margin</q>, <q>footnote</q>, <q>endnote</q>,
+            <q>inline</q>, <q>bottom</q></desc>
         </valItem>
         <valItem ident="type">
           <desc xml:lang="en" versionDate="2017-05-11">a parameter of this name can be used to
             categorize the specified behaviour in any way; for example the kind of break (when used
             with the <ident>break</ident> behaviour) or the kind of index to be generated (if used
-            with the <ident>index</ident> behaviour) etc. </desc>
+            with the <ident>index</ident> behaviour) etc.</desc>
         </valItem>
         <valItem ident="url">
           <desc xml:lang="en" versionDate="2016-03-29">when used with behaviour
@@ -70440,7 +70903,7 @@ déclaration de même nom dans la définition courante.</desc>
         <valItem ident="width">
           <desc xml:lang="en" versionDate="2016-03-29">when used with behaviour
               <ident>graphic</ident>, a parameter of this name supplies a value for the width of the
-            graphic e.g. "400px", "70%".</desc>
+            graphic e.g. <q>400px</q>, <q>70%</q>.</desc>
         </valItem>
       </valList>
     </attDef>
@@ -71027,7 +71490,7 @@ déclaration de même nom dans la définition courante.</desc>
       when a <gi>constraintSpec</gi> warns about a deprecated
       construct.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="semi" mode="add">
+      <valList type="semi">
         <valItem ident="deprecationWarning">
           <desc xml:lang="en" versionDate="2018-09-17">Indicates that
           this constraint specification warns that some other
@@ -71579,7 +72042,7 @@ déclaration de même nom dans la définition courante.</desc>
       </attDef>
       <attDef ident="name">
         <desc versionDate="2010-05-14" xml:lang="en">the name of a datatype in the list provided by 
-        <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref> </desc>
+        <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref></desc>
         <datatype><dataRef key="teidata.xmlName"/></datatype>
       </attDef>
       <attDef ident="ref">
@@ -71629,8 +72092,7 @@ déclaration de même nom dans la définition courante.</desc>
 </elementSpec>
 <elementSpec module="tagdocs" ident="dataFacet">
   <desc versionDate="2016-11-21" xml:lang="en">Restricts the value of the strings used to represent values of a datatype, 
-    according to <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>.
- </desc>
+    according to <ref target="#XSD2">XML Schema Part 2: Datatypes Second Edition</ref>.</desc>
   <classes>
     <memberOf key="att.global"/>
   </classes>
@@ -71760,8 +72222,7 @@ an attribute may take, additional to the information carried by the
   を示す。</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">précise toute contrainte sémantique ou syntaxique
 			sur la valeur que peut prendre un attribut, en supplément de l'information portée par
-			l'élément <gi>datatype</gi>.
-		</desc>
+			l'élément <gi>datatype</gi>.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">especifica cualquier vínculo de tipo semántico o sintáctico respecto al valor que un atributo puede asumir, añadiendo informaciones referentes al elemento datatype.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">specifica un qualsiasi
   vincolo di tipo semantico o sintattico rispetto al valore che un
@@ -72099,8 +72560,7 @@ an attribute may take, additional to the information carried by the
   <attList org="choice">
     <attDef ident="require">
       <desc versionDate="2016-11-28" xml:lang="en">supplies a list of namespaces to one of which the
-        permitted elements must belong.
-       </desc>
+        permitted elements must belong.</desc>
       <desc xml:lang="ja" versionDate="2018-12-28">許可された要素が属していなければならない名前空間のリストを提供する。</desc>
       <datatype minOccurs="1" maxOccurs="unbounded">
         <dataRef key="teidata.namespace"/>
@@ -72625,6 +73085,7 @@ should correspond to an existing module, via a moduleSpec or
 <bibl xml:id="fr-ex-Belloy"/>
 <bibl xml:id="DS-eg-06"/>
 <bibl xml:id="STGA-eg-4"/>
+<bibl xml:id="usenet-sgml-tei"/>
 <bibl xml:id="Burnard-db"/>
 <bibl xml:id="fr-ex-TEI-simpl"/>
 <bibl xml:id="COXR-eg-164"/>
@@ -73046,10 +73507,22 @@ should correspond to an existing module, via a moduleSpec or
 <bibl xml:id="SELF"/>
 <bibl xml:id="UND"/></div>
 <div><head>Works Cited Elsewhere in the Text of these Guidelines</head>
+<bibl xml:id="BIB_smiley"/>
 <biblStruct xml:id="KNUTH"/>
 <biblStruct xml:id="mazz-NDPERSbp"/>
 <biblStruct xml:id="rubin-NDPERSEpc"/>
 <biblStruct xml:id="PETTY"/>
+<biblStruct xml:id="STTS_IBK"/>
+<biblStruct xml:id="BIB_CMC_Core"/>
+<biblStruct xml:id="BIB_scilog1"/>
+<bibl xml:id="BIB_WPTalkEiffel"/>
+<bibl xml:id="BIB_WPTalkAstronomicalObject"/>
+<bibl xml:id="BIB_WPTalkFKM"/>
+<biblStruct xml:id="BIB_MoCoDa2"/>
+<biblStruct xml:id="BIB_DCK"/>
+<biblStruct xml:id="BIB_CoMeRe"/>
+<biblStruct xml:id="BIB_Cotgrove"/>
+<biblStruct xml:id="BIB_ChanierWigham2015"/>
 <biblStruct xml:id="AB-eg-01"/>
 <biblStruct xml:id="Burnard1995b"/>
 <biblStruct xml:id="TD-BIBL-01"/>

From 3d9493447b1b9b0c01d118afd26fd7e6db4978e8 Mon Sep 17 00:00:00 2001
From: helenasabel <helena.b.sabel@gmail.com>
Date: Mon, 8 Jul 2024 10:13:52 +0200
Subject: [PATCH 48/50] update of the p5 subset

---
 source/p5subset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/p5subset.xml b/source/p5subset.xml
index 93e648a74..d6090495e 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -7,7 +7,7 @@
       </titleStmt>
       <editionStmt>
         <edition>P5 <ref target="#ABTEI4">Version</ref> <ref target="../../readme-4.8.0.html">4.8.0a</ref>. Last updated on
-        <date when="2024-07-04">4th July 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/d1b0282a0">d1b0282a0</ref></edition>
+        <date when="2024-07-07">7th July 2024</date>, revision <ref target="https://github.com/TEIC/TEI/commit/bbf5eb2ef">bbf5eb2ef</ref></edition>
       </editionStmt>
       <publicationStmt>
         <distributor>TEI Consortium</distributor>

From b2e5ac33f7e1454d62f488bb9c1143737703dee9 Mon Sep 17 00:00:00 2001
From: helenasabel <helena.b.sabel@gmail.com>
Date: Mon, 8 Jul 2024 10:23:10 +0200
Subject: [PATCH 49/50] bump version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 1fd592fad..354b185fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-7.57.0a
+7.57.0
 

From 1c1f9e96b8602f07519b3175943888ea3240f188 Mon Sep 17 00:00:00 2001
From: helenasabel <helena.b.sabel@gmail.com>
Date: Mon, 8 Jul 2024 10:24:08 +0200
Subject: [PATCH 50/50] update changelog

---
 ChangeLog | 637 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 637 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f2ee99bfb..d3b4569fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,640 @@
+2024-07-08  helenasabel  <helena.b.sabel@gmail.com>
+
+	bump version
+
+	update of the p5 subset
+
+2024-07-07  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #690 from TEIC/issue_687_duplicate_deleted_attr
+	fix complex merging of attrs, #687
+
+2024-07-07  ebeshero  <ebbondar@gmail.com>
+
+	updating branch from dev
+
+2024-07-05  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	P5subset update (#689)
+	* update p5subset and expected results
+
+2024-06-24  Syd Bauman  <s.bauman@northeastern.edu>
+
+	With @joeytakeda and @ebeshero, fix odd2odds so that it does not "justcopy" attDef elements that are not defined in the source class. This is a bit complicated, see @joeytakeda’s explanation in #687 itself.
+
+2024-06-24  trishaoconnor  <trishaoconnor88@gmail.com>
+
+	Merge pull request #681 from TEIC/iss678_duplicateIdents
+	Fix regression: duplicate idents in `*Spec`s
+
+2024-05-21  Peter Stadler  <stadlerpeter@yahoo.fr>
+
+	Merge pull request #685 from gyulakalcso/patch-1
+	Update mediawiki-to-tei.xsl
+
+2024-05-16  Gyula Kalcsó  <38312965+gyulakalcso@users.noreply.github.com>
+
+	Update mediawiki-to-tei.xsl
+	correcting typo (appy -> apply) in row 36
+
+2024-05-14  Peter Stadler  <stadlerpeter@yahoo.fr>
+
+	Merge pull request #684 from jbampton/fix-spelling
+	Fix typo in `tei-to-text.xsl`
+
+2024-05-11  John Bampton  <jbampton@gmail.com>
+
+	Fix typo in `tei-to-text.xsl`
+
+2024-05-06  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	Relaxing cardinality restraint
+
+	Attempt to fix #678
+	Refining how the zero-th pass for ODD processing handles gathering up duplicate named specs
+
+2024-05-01  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Updated P5 subset: Initially with @trishaoconnor, updated p5subset to current version from TEI dev branch. This required reverting commit 61247e54d5412e5f1a2e46adb76ef92879c66b3a from TEI issue 2498, PR 2520, and lots of work, including discussion at SVF2F.
+
+2024-04-13  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	Merge pull request #675 from TEIC/issue_319
+	Reverse order of `<constraintSpec>` and `<datatype>` in output of odd2odd when merging attributes
+
+2024-04-13  Elisa Beshero-Bondar  <ebeshero@users.noreply.github.com>
+
+	Merge pull request #676 from bansp/patch-3
+	link fix
+
+	Merge pull request #674 from jbampton/fix-spelling
+	Fix spelling
+
+2024-03-28  Piotr Banski  <bansp@users.noreply.github.com>
+
+	link fix
+
+2024-03-27  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Work on #319 point 2: @trishaoconnor and I found (what we think is) the spot in odd2odd.xsl that caused the output constraintSpec element to appear before the output datatype element, and swapped it with the immediately following constructor in the "odd2odd-mergeAttribute" template. This fixed the error in the output of running odd2odd.xsl on tei_simplePrint.odd, and all tests in both Test/ and Test2/ pass (except I do not have xelatex on my system).
+
+2024-03-23  John Bampton  <jbampton@gmail.com>
+
+	Fix spelling
+
+2024-03-16  trishaoconnor  <trishaoconnor88@gmail.com>
+
+	Corrected typo for issue ´#584´  (#670)
+	* Corrected typo from sup to sub
+
+2024-03-16  Elisa Beshero-Bondar  <ebeshero@users.noreply.github.com>
+
+	Merge pull request #633 from TEIC/sydb_627
+	make att.repeatable work for `<sequence>`, `<alternate>`, and `<anyElement>`
+
+2024-03-15  Syd Bauman  <sydb@users.noreply.github.com>
+
+	Merge pull request #651 from TEIC/sydb_598
+	tidy up FPI generation
+
+2024-03-15  Syd Bauman  <s.bauman@northeastern.edu>
+
+	suck in latest from dev
+
+2024-03-15  Syd Bauman  <sydb@users.noreply.github.com>
+
+	Merge pull request #672 from jbampton/fix-spelling
+	Fix spelling
+
+	Merge pull request #660 from TEIC/sydb_659_tei2schematron_attrs
+	Do not copy attrs from TEI constraint element to Schematron rule element
+
+2024-03-12  Syd Bauman  <s.bauman@northeastern.edu>
+
+	grab latest from dev
+
+2024-03-08  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Manual merge of dev to this branch PLUS various changes required to make it work after said merge.
+
+2024-03-08  John Bampton  <jbampton@gmail.com>
+
+	Fix spelling
+
+2024-03-08  John Bampton  <jbampton@users.noreply.github.com>
+
+	Fix spelling (#671)
+
+2024-03-07  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Comment changes, including spelling corrections
+
+2024-02-26  John Bampton  <jbampton@users.noreply.github.com>
+
+	Change XSLT 2.0 to 3.0 in the README (#667)
+
+	Fix spelling (#666)
+
+2024-02-23  John Bampton  <jbampton@users.noreply.github.com>
+
+	Fix spelling (#664)
+
+	Change the embedded XSLT version from `2.0` to `3.0` (#663)
+
+	Fix spelling (#662)
+
+2024-01-26  Raffaele Viglianti  <raffaeleviglianti@gmail.com>
+
+	Merge pull request #650 from TEIC/sydb_646
+	ignore `@version` of `<application>` when comparing in tests 
+
+2024-01-26  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #653 from TEIC/sydb_652_help_msg_omission
+	test $to, not $format; include HTML in kinds of outputs that might need ODD processing
+
+2024-01-26  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Updated P5 subset: Updated source/p5subset.xml from current dev version of TEI repo, and updated tests to match.
+
+2024-01-25  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Per suggestion @raffazizzi re-word comment
+
+	update w/ latest from dev after manual merge of debian-tei-xsl/debian/changelog
+
+	grab latest from dev
+
+	merged in latest from dev with manual merge of debian-tei-xsl/debian/changelog
+
+2024-01-25  Joey Takeda  <joeytakeda@users.noreply.github.com>
+	    Syd Bauman  <s.bauman@northeastern.edu>
+
+	Clean up CI files per #620 (#655)
+	* Removes .travis.yml
+	* Removes Slack notification from GH Actions jobs
+
+2024-01-14  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Do not copy attrs from TEI constraint element to Schematron rule element
+
+2024-01-05  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #654 from TEIC/sydb_645_checking_desc_and_gloss_out-of-date_based_on_lang_and_type
+	test multiple `<desc>` (or `<gloss>`) elements’ `@versionDate` at once
+
+2024-01-05  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Per Stylesheets group, revert to value operator, adding a comment to point out this fact. (And also fix some typos in comments).
+
+2024-01-04  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Oops — fix code to match comment: Test only those <gloss>s and <desc>s that actually do not have a type= attribute.
+
+2023-12-15  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Alter tei:descOrGlossOutOfDate() so that it will compare multiple elements; also test the desc or gloss elements based on type attribute
+
+2023-12-12  Syd Bauman  <s.bauman@northeastern.edu>
+
+	test 'to', not 'format', and include HTML in kinds of outputs that might require ODD processing
+
+2023-11-29  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Address #598: Only check for FPIs in ident elements, not altIdent elements
+
+2023-11-29  sabine seifert  <sabine.seifert@uni-potsdam.de>
+
+	Merge pull request #649 from TEIC/sydb_639
+	All XSLT 2.0 ⇒ 3.0
+
+2023-11-20  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Set application/@version to a placeholder value before comparing
+
+	All XSLT 2.0 ⇒ 3.0
+
+2023-11-20  trishaoconnor  <trishaoconnor88@gmail.com>
+
+	Merge pull request #644 from jbampton/fix-spelling
+	misc: fix spelling
+
+2023-11-16  raffazizzi  <raffaeleviglianti@gmail.com>
+
+	updated expected results
+
+	upped version
+
+2023-11-16  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Fix weird merge issue.
+
+	Merge branch 'release-7.56.0' into dev
+
+	Revert test file.
+
+	More version changes.
+
+	More version number fixes.
+
+	Fix version number
+
+	Fix version number.
+
+	Fix another test.
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+2023-11-16  raffazizzi  <raffaeleviglianti@gmail.com>
+
+	Merge branch 'release-7.56.0' of github.com:TEIC/Stylesheets into release-7.56.0
+
+2023-11-16  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Fix tests.
+
+2023-11-16  raffazizzi  <raffaeleviglianti@gmail.com>
+
+	confirmed version number
+
+2023-11-16  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+2023-11-16  raffazizzi  <raffaeleviglianti@gmail.com>
+
+	updated p5subset
+
+2023-11-16  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+2023-11-13  John Bampton  <jbampton@gmail.com>
+
+	misc: fix spelling
+
+2023-11-13  martindholmes  <mholmes@uvic.ca>
+
+	Fixes for fallout from my previous fix for issue #534.
+
+2023-11-12  martindholmes  <mholmes@uvic.ca>
+
+	Fix for issue #534.
+
+2023-11-11  Peter Stadler  <stadlerpeter@yahoo.fr>
+
+	adjust folder name
+
+2023-11-10  Elisa Beshero-Bondar  <ebeshero@users.noreply.github.com>
+
+	Merge pull request #618 from TEIC/issue_567_val
+	Adding templates for val and tag to fix #567
+
+	Merge pull request #615 from TEIC/sydb_586
+	Make sure VERSION file is present before reading it.
+
+	Merge pull request #525 from TEIC/sydb_TEI-2070
+	Attempt to fix TEIC/TEI#2070:
+
+2023-11-09  Syd Bauman  <s.bauman@northeastern.edu>
+
+	1) re-insert missing “append .0” business (not sure what happened that it was not in what was already merged); 2) use unparsed-text-available() instead of doc-available() (duh\!)
+
+	concluding merge of dev
+
+	Ooops; missed a folder rename in #628
+
+	RIP, SPQR
+
+	... and a pointless manual merge
+
+2023-11-09  Raffaele Viglianti  <raffaeleviglianti@gmail.com>
+
+	Merge pull request #628 from TEIC/sydb_543_file_exts
+	delete file extension doubling
+
+	Merge pull request #638 from TEIC/sydb_TEI_2070
+	README creation improvements ala TEI ticket 2070
+
+	Merge pull request #632 from TEIC/sydb_631
+	Separate pattern for every instance of <anyElement> — fixes #631 (I hope)
+
+2023-11-09  Syd Bauman  <s.bauman@northeastern.edu>
+
+	manual merge of 1 file
+
+	As we have 3 approvals and all tests pass, merging
+
+	This is just a 'pull git@github.com:bwbohl/Stylesheets.git patch-1', really
+
+	not yet merged, so get latest from dev again
+
+2023-11-09  Raffaele Viglianti  <raffaeleviglianti@gmail.com>
+
+	Merge pull request #563 from TEIC/issue_424_experiment
+	fix processing of namespaces 
+
+2023-11-09  Syd Bauman  <s.bauman@northeastern.edu>
+
+	latest from dev
+
+	not sure what happened ...
+
+	manual merge of latest from dev
+
+2023-11-08  Martin Holmes  <mholmes@uvic.ca>
+
+	Merge pull request #641 from TEIC/sydb_640
+	wrap new att lists in `<ul>` (where they were not so wrapped)
+
+2023-11-08  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Any latest from dev is mine!
+
+2023-11-08  martindholmes  <mholmes@uvic.ca>
+
+	With @sydb fix for issue #640.
+
+2023-11-05  Syd Bauman  <s.bauman@northeastern.edu>
+
+	This commit _seems_ to be working correctly: passes Test/, Test2/, the Guidelines test process, and the Guidelines build OK.
+
+	This state of repo is (I believe) not working as per my comment of 2023-10-15 on PR #633.
+
+2023-11-04  Syd Bauman  <s.bauman@northeastern.edu>
+
+	merge in lastest from dev
+
+	Remove import of classatts.xsl, as no longer needed after 7ed5111f.
+
+	Direct test instead of key fix as discussed on PR
+
+2023-10-29  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Simplify patching version number.
+
+	Update an expected results file in Test/.
+
+	An attempt at #640 fixing:  * template showAttClasses is called from 6 different places (all in common_tagdocs);  * generated debugging code for each of those places;  * found which 2 were causing problem (li element as child of td instead of child of ul);  * wrapped them in ul element.  * Note: deliberately left debugging PIs in place, but they should maybe be removed before merging into dev.
+
+2023-10-28  helenasabel  <helena.b.sabel@gmail.com>
+
+	updates id that causes tests to fail
+
+	merge 'dev'
+
+2023-10-27  martindholmes  <mholmes@uvic.ca>
+
+	Removing anonymously-named test file and integrating that test (for index elements to be ignored in TOC building) into testStructure1.
+
+2023-10-27  Syd Bauman  <s.bauman@northeastern.edu>
+
+	tweak a comment
+
+2023-10-27  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	Merge branch 'dev' into issue_567_val
+
+2023-10-26  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #634 from TEIC/sydb_610
+	fix errors in docxtotei noticed by Stylesheets group
+
+2023-10-26  Syd Bauman  <s.bauman@northeastern.edu>
+
+	grab latest from dev
+
+2023-10-26  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #619 from TEIC/stylesheets_group_on_592
+	Presentation of list of attributes in the Guidelines
+
+2023-10-26  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Reproduce same fix @bwbohl made for elements to classes
+
+	Merge in latest from TEIC’s dev branch
+
+	Finally add comment to help future maintainers with debugging 3-pass RELAX NG pattern reduction code (which I wrote > 2 weeks ago).
+
+2023-10-23  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Tweak README builder for TEI ticket 2070
+
+2023-10-18  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	For #592, update CSS
+	But note that this also will require a change in the GL's CSS in the TEI repo, I think
+
+	Update expected results
+
+	Merge branch 'dev' into stylesheets_group_on_592
+	Reverted Test/expected-results/test15.odd.html since there were many conflicts, and will address those next.
+
+2023-10-17  Patricia O CONNOR  <trishaoconnor88@gmail.com>
+
+	Update P5subset and tests
+
+2023-10-16  Syd Bauman  <sydb@users.noreply.github.com>
+
+	Fix #635: (#636)
+	Added clause testing for type=deprecationInfo so we don't get 2+ nodes being tested on one side of 'gt'.
+
+2023-10-12  Syd Bauman  <s.bauman@northeastern.edu>
+
+	2 minor updates: 1) Apparently there are times when the 'c' variable in the template for elementRef|classRef|macroRef boils down to an empty sequence. 2) Handle the case when there is no <datatype> child of the <attDef> being processed.
+
+2023-10-10  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Minor fixes, and changes to tests to match: 2) Fix typo — function had "#teitodocx" where it meant "#docxtotei"
+
+	Convert commented-out debugging code to useful comment.
+
+2023-10-09  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Various minor things:  * Removed some debugging code  * Added tests (in Test2/testPure1) for sequence/@m[ia][nx]Occurs and alternate/@m[ia][nx]Occurs, including valid instance, but not invalid  * Updated tests (in Test/)
+
+2023-10-08  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Now have @minOccurs and @maxOccurs working on <sequence> (and thus <interleave>), too. Passes tests, so *may* be eligible to merge into dev, but not really ready, yet, as need to work on repeatability of <alternate>.
+
+	Still NOT ready to be merged into dev: In this commit I intended to comment out some debugging code (which renders output kinda useless, is it sticks the results of each pass into the output as RELAXNG <div> elements, rather than as comments) and update some tests. But I found to my horror that (despite message of previous 3 commits) tests were not passing. So lots of test updates, too. NB: One of the things that makes this ineligible for merging into dev is that the constraint for the <choice> element has changed from the incorrect, but workable '( model.choicePart | choice )+' to the incorrect and *not* workable '( model.choicePart | choice )+'. At the moment I have no idea why, but it does not really matter, as attacking minOccurs= and maxOccurs= on <alternate> and <sequence> is next.
+
+	Add a test with 2 <anyElement> elements.
+
+2023-10-07  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Code for supporting minOccurs= and maxOccurs= on <anyElement>, mostly untested because of #631. This comit is *not* ready for prime time.
+
+	remove some debugging code
+
+	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.)
+
+2023-10-04  Benjamin W. Bohl  <bohl@edirom.de>
+
+	Update odd2odd.xsl
+
+2023-10-01  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Oops, spoke too soon: was not passing Test/, just Test2/. Now passing both sets of tests.
+
+	Replace tei:minOmaxO() and both tei:generateIndicators() functions (one for RELAXNG, one for DTD) with a new function, tei:norMinMax(); should be no change to output; passes both Test/ and Test2/.
+
+2023-09-30  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Stop deleting 'test*.docx' files in the clean: target. I am not at all sure a) why they were being deleted, b) why their deletion did not cause problems before the change made in this branch.
+
+	Restoring files I inadvertently removed (I have no idea how)
+
+2023-09-30  trishaoconnor  <trishaoconnor88@gmail.com>
+
+	Merge pull request #608 from TEIC/sydb_607
+	Fix #607, I hope: remove erroneous bits of text from version URL 
+
+2023-09-30  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Ooops; forgot to add newly named TEI to RELAX NG symlink
+
+	Update tests to match changes to transformtei and symlinks
+
+	Re-work how filenames are handled for #543: I _think_ I have this working right, but more testing is in order.
+
+2023-09-29  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Grab whatever has happened on dev in past ~1.05 years
+
+2023-09-28  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	Returning to this per Stylesheets meeting
+	Merging (manually) the helpful test file from PR #508. This branch now supercedes #508 and thus will also close #503
+
+2023-09-28  raffazizzi  <raffaeleviglianti@gmail.com>
+
+	Merge branch 'dev' into sydb_607
+
+2023-09-28  trishaoconnor  <trishaoconnor88@gmail.com>
+
+	Merge pull request #614 from jbampton/fix-spelling
+	Fix spelling
+
+2023-09-28  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #617 from TEIC/sydb_616
+	process `@xml:id` wherever the output of a <list> is generated
+
+2023-09-22  Helena Bermúdez Sabel  <helena.b.sabel@gmail.com>
+
+	Merge pull request #524 from fryske-akademy/dev
+	overridability for docxtotei
+
+2023-08-24  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	Adding templates for val and tag to fix #567
+	* Template added to html/html_core.xsl for tag and val to transform them into spans
+	* Named template added to html/html_core.xsl to create a delimiter span to allow
+	  easier customization (i.e. to allow for a CSS only approach to start and end text)
+	* Reflect value of `@scheme` in tag's class
+
+2023-08-24  Syd Bauman  <s.bauman@northeastern.edu>
+
+	With Stylesheets Group alter test15 until the BLEEPing thing finally worked.
+
+	Pull in whatever has happened in dev
+
+2023-08-24  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+2023-07-30  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Process xml:id= wherever the output of a <list> is generated in an attempt to fix #616.
+
+2023-07-29  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Copy over latest p5subset, and fix tests accordingly.
+
+2023-07-28  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+2023-07-27  helenasabel  <helena.b.sabel@gmail.com>
+
+	Stylesheets group adds missing title attribute to close TEI ticket 2137
+
+2023-06-23  Joey Takeda  <joeytakeda@users.noreply.github.com>
+
+	Small adjustments for consistency
+
+2023-06-22  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Update an expected result for new HTML output
+
+	Stylesheets group (HBS, SB,& JT) fix the remaining bug from last month — we think this is structurally ready, still needs CSS
+
+2023-05-28  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Huh? Missed tests: I do not understand how these files were missed when I tested prior to previous commit, but fixing anyway ...
+
+2023-05-27  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Address #586:  * Update tei:stylesheetVersion() with a fix based on @eduarddrenth’s suggestion.  * Remove parameter from that function defintion, it was not being used.  * Remove parameter from the 1 call to tath function.  * Some whitespace, too.  * Fixed my e-mail addr in AUTHORS.  * Updated expected-results/ to match mildly different comment at the end.
+
+2023-05-26  John Bampton  <jbampton@users.noreply.github.com>
+
+	Fix spelling
+
+2023-05-25  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Stylesheets group works on #592: * Use ATTCLASSES key instead of CLASSES, as we are not playing with model classes * Use generic output elements instead of output-specific output elements
+
+2023-05-20  Elisa Beshero-Bondar  <ebeshero@users.noreply.github.com>
+
+	Merge pull request #611 from rvdb/dev
+
+2023-05-19  rvdb  <ron.vdbranden@gmail.com>
+
+	improvements for multilingual articles
+
+2023-05-02  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Oops, forgot one
+
+2023-05-01  Syd Bauman  <s.bauman@northeastern.edu>
+
+	More work on #607: Get output to pass tests:  * Update routine so that it deals with both “P5 Version …” and “Version …”  * Update Makefile so that test35.rnc has these comments stripped out correctly  * Update some expected results because of *slight* comment differences that should be ignored
+
+	Fix #607, I hope: With @trishaoconnor, change the "makeTEIVersion" template in odds/teiodds.xsl so that  a) it does not output the string "P5 Version&#x0A;" as part of the version URL; and  b) it outputs the version information on 1 line instead of two.
+
+2023-04-27  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Grab what has occurred in dev over past 6+ months
+
+2023-04-24  sabine seifert  <sabine.seifert@uni-potsdam.de>
+
+	Merge pull request #605 from TEIC/P5Update_seifert
+	P5 subset update 
+
+2023-04-24  helenasabel  <helena.b.sabel@gmail.com>
+
+	updated expected results (only white space issues)
+
+2023-04-24  sabine seifert  <seifertsabine@gmx.de>
+
+	Update p5subset.xml
+
+2023-04-04  Syd Bauman  <s.bauman@northeastern.edu>
+
+	Increment version to our best guess of next release number (alpha)
+
+	Release 7.55.0
+
+	Update version # (and subset for its new version #) and change log for upcoming release
+
+	update p5subset before release (and update tests to match, after checking 'em)
+
+2023-04-04  Hugh A. Cayless  <philomousos@gmail.com>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
 2023-04-04  Syd Bauman  <s.bauman@northeastern.edu>
 
 	update p5subset before release (and update tests to match, after checking 'em)