From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 24 Jun 2020 05:02:25 +0000 (-0400)
Subject: Adjust whitespace preservation rules.
X-Git-Url: http://git.draconx.ca/gitweb/homepage.git/commitdiff_plain/78e7de848f072d19e6c99865f793dbec482c7858?hp=ee0286ddeded87ea05d85b3861f93d725b9f7bfe

Adjust whitespace preservation rules.

We don't generally want to delete whitespace between span elements.

An exception is made if all sibling text nodes are whitespace, in
which case they should all be removed to allow indentation.
---

diff --git a/layouts/default.xsl b/layouts/default.xsl
index f95a2c7..eaeef72 100644
--- a/layouts/default.xsl
+++ b/layouts/default.xsl
@@ -103,6 +103,13 @@
     <xsl:when test='ancestor::xhtml:pre'><xsl:copy /></xsl:when>
     <!-- preserve whitespace which is the only child node of an element -->
     <xsl:when test='count(../node()) = 1'><xsl:copy /></xsl:when>
+    <!-- preserve whitespace between consecutive span-level elements
+         which have at least one non-whitespace sibling text element -->
+    <xsl:when test='f:element-is-span(preceding-sibling::node()[1])
+                    and f:element-is-span(following-sibling::node()[1])
+                    and ../text()[normalize-space(.) != ""]'>
+      <xsl:copy />
+    </xsl:when>
   </xsl:choose>
 </xsl:template>