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 1/3] 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 2/3] =?UTF-8?q?Oops=20=E2=80=94=20fix=20code=20to=20match?=
 =?UTF-8?q?=20comment:=20Test=20only=20those=20<gloss>s=20and=20<desc>s=20?=
 =?UTF-8?q?that=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 3/3] 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. -->