From 12700edb4e6d7b8d835c1d0849a6bb85ec1280a8 Mon Sep 17 00:00:00 2001
From: Andrew Scholer <ascholer@chemeketa.edu>
Date: Mon, 9 Dec 2024 15:18:27 -0800
Subject: [PATCH 1/3] Script: add strip-trailing-whitespace-line template

---
 xsl/pretext-text-utilities.xsl | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/xsl/pretext-text-utilities.xsl b/xsl/pretext-text-utilities.xsl
index fb6de16cf..8ae975ae0 100644
--- a/xsl/pretext-text-utilities.xsl
+++ b/xsl/pretext-text-utilities.xsl
@@ -849,6 +849,30 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     </xsl:choose>
 </xsl:template>
 
+<!-- Working from end, remove whitespace back to and including last newline -->
+<xsl:template name="strip-trailing-whitespace-line">
+    <xsl:param name="text" />
+    <xsl:variable name="last-char" select="substring($text, string-length($text), 1)" />
+    <xsl:choose>
+        <!-- if empty, quit -->
+        <xsl:when test="not($last-char)" />
+        <!-- if last character is newline, return everything else -->
+        <xsl:when test="$last-char = '&#xa;'">
+            <xsl:value-of select="substring($text, 1, string-length($text)-1)" />
+        </xsl:when>
+        <!-- if last character is whitespace, drop it -->
+        <xsl:when test="contains($whitespaces, $last-char)">
+            <xsl:call-template name="strip-trailing-whitespace">
+                <xsl:with-param name="text" select="substring($text, 1, string-length($text)-1)" />
+            </xsl:call-template>
+        </xsl:when>
+        <!-- else finished stripping, output as-is -->
+        <xsl:otherwise>
+            <xsl:value-of select="$text" />
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
 <!-- spurious newlines introduce whitespace on either side -->
 <!-- we split at newlines, strip consecutive whitesapce on either side, -->
 <!-- and replace newlines by spaces (could restore a single newline) -->

From 956687585a5c0f57c445ae45701add3e7bb20658 Mon Sep 17 00:00:00 2001
From: Andrew Scholer <ascholer@chemeketa.edu>
Date: Mon, 9 Dec 2024 15:20:01 -0800
Subject: [PATCH 2/3] HTML: handle program/code with no start/end newline

---
 xsl/pretext-html.xsl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/xsl/pretext-html.xsl b/xsl/pretext-html.xsl
index a913e36b8..6ce9f4989 100644
--- a/xsl/pretext-html.xsl
+++ b/xsl/pretext-html.xsl
@@ -9202,9 +9202,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                             <xsl:with-param name="substr" select="'&#xA;'" />
                         </xsl:call-template>
                     </xsl:if>
-                    <xsl:call-template name="substring-before-last">
-                        <xsl:with-param name="input" select="code" />
-                        <xsl:with-param name="substr" select="'&#xA;'" />
+                    <!-- code section MUST end with newline, which author may or may not have included      -->
+                    <!-- so remove up to one newline and trailing space from end of code then add a newline -->
+                    <xsl:call-template name="strip-trailing-whitespace-line">
+                        <xsl:with-param name="text" select="code" />
                     </xsl:call-template>
                     <xsl:text>&#xA;</xsl:text>
                     <xsl:if test="postamble[not(@visible = 'no')]">

From 60ba1e7bb27232ad1e3d23833207a4b3a264d7cf Mon Sep 17 00:00:00 2001
From: Andrew Scholer <ascholer@chemeketa.edu>
Date: Mon, 9 Dec 2024 15:20:18 -0800
Subject: [PATCH 3/3] Samples: add program/code no newline test to
 sample-article

---
 examples/sample-article/sample-article.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/sample-article/sample-article.xml b/examples/sample-article/sample-article.xml
index d31efa0fb..cce2bd170 100644
--- a/examples/sample-article/sample-article.xml
+++ b/examples/sample-article/sample-article.xml
@@ -10688,6 +10688,10 @@ along with MathBook XML.  If not, see <http://www.gnu.org/licenses/>.
                 </program>
             </listing>
 
+            <p>Although a program should have a <tag>code</tag> element surrounding its code, we attempt to provide one when it is missing. This next sample tests that and intentionally has no leading or trailing newline inside the program.</p>
+
+            <program languge="python">print("Hello world")</program>
+
             <p>If you are discussing algorithms in the abstract (or even concretely), you can set them off like a theorem, with a number, a title and a target for cross-references.  Sometimes you claim an algorithm produces something in particular, or has certain properties, such as a theoretical run time, so a proof may be included.  See the discussion just preceding about (limited) options for pseudo-code.</p>
 
             <algorithm xml:id="algorithm-sieve-eratosthenes">