From 636bf454940f60a1e1467e7b045fca25c60dc6e8 Mon Sep 17 00:00:00 2001
From: bobstayton <bobs@sagehill.net>
Date: Tue, 12 Jun 2018 14:07:04 -0700
Subject: [PATCH] Now applies normalize-space to title if it does not have
 element children, and warns if there is trailing space that would appear
 before the punctuation in the run-in heading.

---
 xsl/fo/block.xsl | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/xsl/fo/block.xsl b/xsl/fo/block.xsl
index 1c8401c1a..5e364ca43 100644
--- a/xsl/fo/block.xsl
+++ b/xsl/fo/block.xsl
@@ -86,14 +86,31 @@
 
 <xsl:template match="d:formalpara/d:title|d:formalpara/d:info/d:title">
   <xsl:variable name="titleStr">
-      <xsl:apply-templates/>
+    <xsl:choose>
+      <!-- cannot safely normalize space if it has child elements -->
+      <xsl:when test="child::*">
+        <xsl:apply-templates/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="normalize-space(.)"/>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:variable>
+
   <xsl:variable name="lastChar">
     <xsl:if test="$titleStr != ''">
       <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
     </xsl:if>
   </xsl:variable>
 
+  <xsl:if test="contains(' &#10;&#13;', $lastChar)">
+    <xsl:message>
+      <xsl:text>WARNING: formalpara title '</xsl:text>
+      <xsl:value-of select="$titleStr"/>
+      <xsl:text>' has trailing whitespace before runheadhead.title.end.punct.</xsl:text>
+    </xsl:message>
+  </xsl:if>
+
   <fo:inline font-weight="bold"
              keep-with-next.within-line="always"
              padding-end="1em">
-- 
2.40.0