From badd1f313146e95d167e93a935b9943c44a0df2e Mon Sep 17 00:00:00 2001
From: Nicholas Cole <nicholas.cole@history.ox.ac.uk>
Date: Fri, 26 Feb 2021 17:36:13 +0000
Subject: [PATCH 1/2] Creating new .1 release branch

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

diff --git a/VERSION b/VERSION
index a260e0b3f..971b805b8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.51.0
+7.51.1

From 13dc205c19436bf91b063a23ca5c096c5f6d48b5 Mon Sep 17 00:00:00 2001
From: Syd Bauman <sydb@users.noreply.github.com>
Date: Fri, 26 Feb 2021 12:27:31 -0500
Subject: [PATCH 2/2] Fix for #488: (#489)

* Fix for #488:
Remove constraintSpec elements from attLists prior to tangling for use in generating documentation

* Working on PR #489 with @sydb, @npcole, and @martinascholger, solving the problem (we hope) with a tunneled parameter.

Co-authored-by: Syd Bauman <s.bauman@northeastern.edu>
Co-authored-by: martindholmes <mholmes@uvic.ca>
---
 common/common_tagdocs.xsl | 35 ++++++++++++++++++++++++-----------
 odds/teiodds.xsl          | 10 ++++++++--
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/common/common_tagdocs.xsl b/common/common_tagdocs.xsl
index d5706a68a..3c1850acb 100644
--- a/common/common_tagdocs.xsl
+++ b/common/common_tagdocs.xsl
@@ -739,9 +739,9 @@
                 </xsl:otherwise>
               </xsl:choose>
               <!--
-	      <xsl:for-each select="$myatts/a">
-		<xsl:copy-of select="*|text()"/>
-	      </xsl:for-each>
+              <xsl:for-each select="$myatts/a">
+                <xsl:copy-of select="*|text()"/>
+              </xsl:for-each>
 -->
             </xsl:element>
           </xsl:element>
@@ -940,8 +940,21 @@
                   <xsl:call-template name="showClassAtts"/>
                 </xsl:for-each>
               </xsl:if>
-              <xsl:apply-templates mode="tangle"
-                select="../tei:attList"/>
+              <!--
+                  We want the attributes here as the result of
+                  tangling our sibling <attList>(s). However, we do
+                  not want the <constraintSpec>s to be processed. See
+                  https://github.com/TEIC/Stylesheets/issues/488
+                  and
+                  https://github.com/TEIC/TEI/issues/2115.
+                  To do this, we pass a tunneled parameter to the tangle
+                  mode templates so that they can suppress the constraintSpecs
+                  when rendering the element content model.
+                  —Syd, Martin, Nick, and Martina, 2021-02-25
+              -->
+              <xsl:apply-templates mode="tangle" select="../tei:attList">
+                <xsl:with-param as="xs:boolean" name="includeConstraints" tunnel="yes" select="false()"/>
+              </xsl:apply-templates>
               <xsl:for-each select="..">
                 <xsl:call-template name="defineContent"/>
               </xsl:for-each>
@@ -960,7 +973,7 @@
       </xsl:element>
     </xsl:element>
   </xsl:template>
-  
+
   <xsl:template
     match="
       tei:constraintSpec[parent::tei:schemaSpec or parent::tei:elementSpec or
@@ -1098,8 +1111,8 @@
           <xsl:for-each select="tokenize($atts, ' ')">
             <xsl:variable name="TOKEN" select="."/>
             <!-- Show a selected attribute where "$HERE" is the
-	    starting node 
-	    and $TOKEN is attribute we have been asked to display-->
+            starting node 
+            and $TOKEN is attribute we have been asked to display-->
             <xsl:for-each select="$HERE">
               <xsl:choose>
                 <xsl:when test="$TOKEN = '+'">
@@ -1235,7 +1248,7 @@
       <xsl:when
         test="@xml:lang = 'mul' and not($documentationLanguage = 'zh-TW')">
         <!-- will need to generalize this if other langs come along like
-		chinese -->
+                chinese -->
         <xsl:call-template name="showExample"/>
       </xsl:when>
       <xsl:when test="@xml:lang = $documentationLanguage">
@@ -2485,8 +2498,8 @@
           </xsl:attribute>
           <xsl:value-of select="."/>
           <xsl:if test="@validUntil">
-	    <!-- This clause added 2016-07-22 by Syd and Martin so that -->
-	    <!-- default values can be deprecated. See issue #158.      -->
+            <!-- This clause added 2016-07-22 by Syd and Martin so that -->
+            <!-- default values can be deprecated. See issue #158.      -->
             <xsl:element namespace="{$outputNS}" name="{$tableName}">
               <xsl:call-template name="validUntil"/>
             </xsl:element>
diff --git a/odds/teiodds.xsl b/odds/teiodds.xsl
index 4896d622f..b68305d64 100644
--- a/odds/teiodds.xsl
+++ b/odds/teiodds.xsl
@@ -357,6 +357,11 @@ of this software, even if advised of the possibility of such damage.
 
   <xsl:template match="tei:attDef" mode="tangle">
     <xsl:param name="element"/>
+    <!-- This tunneled parameters is set when we are processing
+      attDefs in the context of generating documentation of an 
+      element content model, so that we 
+      don't spew out Schematron in the middle of it. -->
+    <xsl:param tunnel="yes" as="xs:boolean" name="includeConstraints" select="true()"/>
     <xsl:variable name="I">
       <xsl:value-of select="translate(@ident,':','')"/>
     </xsl:variable>
@@ -373,8 +378,9 @@ of this software, even if advised of the possibility of such damage.
         </xsl:when>
       </xsl:choose>
     </xsl:if>
-    <xsl:apply-templates select="tei:constraintSpec"/>
-
+    <xsl:if test="$includeConstraints = true()">
+      <xsl:apply-templates select="tei:constraintSpec"/>
+    </xsl:if>
   </xsl:template>
 
   <xsl:template match="tei:attList" mode="tangle">