From be14a313b881a66012b899e552a25c1c8d3a1fa5 Mon Sep 17 00:00:00 2001
From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com>
Date: Tue, 4 Feb 2025 10:19:24 +0000
Subject: [PATCH] RP XSL - catch further cases

---
 src/preprint-changes.xsl                                  | 8 ++++----
 .../preprint-changes/bold-follow-xref-cleanup/input.xml   | 5 +++++
 .../preprint-changes/bold-follow-xref-cleanup/output.xml  | 5 +++++
 test/tests/preprint-changes/fix-truncated-xrefs/input.xml | 5 +++++
 .../tests/preprint-changes/fix-truncated-xrefs/output.xml | 5 +++++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/preprint-changes.xsl b/src/preprint-changes.xsl
index 91f81d1ef9..01dc684a34 100644
--- a/src/preprint-changes.xsl
+++ b/src/preprint-changes.xsl
@@ -1382,7 +1382,7 @@
     <!-- Include certain bolded text within xref when it immediately follows that xref 
         e.g. <xref>Fig 1</xref><bold>, right)</bold> to <xref>Fig 1, right</xref>) 
         bold handling in template 'bold-follow-xref-cleanup' -->
-    <xsl:variable name="panel-regex" select="'^,?\s?(left|right|top|bottom|inset|lower|upper|middle)(\s(and\s)?(left|right|top|bottom|inset|lower|upper|middle))?(\s?panels?)?[;\),]?[\s\.]?$'"/>
+    <xsl:variable name="panel-regex" select="'^,?\s?(left|right|top|bottom|inset|lower|upper|middle)(\s(and\s)?(left|right|top|bottom|inset|lower|upper|middle))?(\s?panels?)?[;\),]?[\s\.]?$|^(\s?([,&amp;–\-]|and))*\s?[\p{L}](,?\s?[\p{L}]|\-\s?[\p{L}])?[;\),]?[\s\.]?$'"/>
     <xsl:template xml:id="fix-truncated-xrefs" match="xref[following-sibling::node()[1][name()='bold']]">
         <xsl:variable name="bold-text" select="following-sibling::node()[1]"/>
          <xsl:copy>
@@ -1401,6 +1401,9 @@
     <!-- Cleanup unnecessary bold elements that appear directly after xrefs -->
     <xsl:template xml:id="bold-follow-xref-cleanup" match="bold[preceding-sibling::node()[1][name()='xref']]">
         <xsl:choose>
+            <xsl:when test="matches(lower-case(.),'^\s?(and|&amp;|[,;\)])\s?\.?$')">
+                <xsl:apply-templates select="text()|comment()|processing-instruction()"/>
+            </xsl:when>
             <xsl:when test="matches(lower-case(.),$panel-regex)">
                 <xsl:choose>
                     <xsl:when test="matches(.,'[;\),][\s\.]$')">
@@ -1412,9 +1415,6 @@
                     <xsl:otherwise/>
                 </xsl:choose>
             </xsl:when>
-            <xsl:when test="matches(lower-case(.),'^\s?(and|&amp;|,)\s?$')">
-                <xsl:apply-templates select="text()|comment()|processing-instruction()"/>
-            </xsl:when>
             <xsl:otherwise>
                 <xsl:copy>
                     <xsl:apply-templates select="*|@*|text()|comment()|processing-instruction()"/>
diff --git a/test/tests/preprint-changes/bold-follow-xref-cleanup/input.xml b/test/tests/preprint-changes/bold-follow-xref-cleanup/input.xml
index 00bbfd39cf..9758354d03 100644
--- a/test/tests/preprint-changes/bold-follow-xref-cleanup/input.xml
+++ b/test/tests/preprint-changes/bold-follow-xref-cleanup/input.xml
@@ -3,4 +3,9 @@
 <p>something <xref ref-type="fig">Figure 1</xref><bold>, bottom panel)</bold> something</p>
 <p>something <xref ref-type="fig">Figure 1</xref>; and Figure 2<bold>, bottom panel)</bold> something</p>
 <p>something <xref ref-type="table"><italic><bold>Table 1</bold></italic></xref><bold>, middle and lower;.</bold> Something</p>
+<p><xref><bold>Fig. 1Bc</bold></xref><bold> i, </bold></p>
+<p><xref>Fig5</xref><bold> E,F).</bold></p>
+<p><xref>Figure 4—figure supplement S4C</xref><bold> and D</bold></p>
+<p><xref><italic>Figure 1A</italic></xref><bold>&amp;C</bold></p>
+<p><xref>Fig. 3e</xref><bold>- f</bold></p>
 </sec>
\ No newline at end of file
diff --git a/test/tests/preprint-changes/bold-follow-xref-cleanup/output.xml b/test/tests/preprint-changes/bold-follow-xref-cleanup/output.xml
index a09937eaf2..272138e70d 100644
--- a/test/tests/preprint-changes/bold-follow-xref-cleanup/output.xml
+++ b/test/tests/preprint-changes/bold-follow-xref-cleanup/output.xml
@@ -3,4 +3,9 @@
 <p>something <xref ref-type="fig">Figure 1, bottom panel</xref>) something</p>
 <p>something <xref ref-type="fig">Figure 1</xref>; and Figure 2<bold>, bottom panel)</bold> something</p>
 <p>something <xref ref-type="table">Table 1, middle and lower</xref>;. Something</p>
+<p><xref>Fig. 1Bc i</xref>, </p>
+<p><xref>Fig5 E,F</xref>).</p>
+<p><xref>Figure 4—figure supplement S4C and D</xref></p>
+<p><xref>Figure 1A&amp;C</xref></p>
+<p><xref>Fig. 3e- f</xref></p>
 </sec>
\ No newline at end of file
diff --git a/test/tests/preprint-changes/fix-truncated-xrefs/input.xml b/test/tests/preprint-changes/fix-truncated-xrefs/input.xml
index 1ef51ad707..7cf7484f90 100644
--- a/test/tests/preprint-changes/fix-truncated-xrefs/input.xml
+++ b/test/tests/preprint-changes/fix-truncated-xrefs/input.xml
@@ -3,4 +3,9 @@
 <p>something <xref ref-type="fig">Figure 1</xref><bold>, bottom panel)</bold> something</p>
 <p>something <xref ref-type="fig">Figure 1</xref>; and Figure 2<bold>, bottom panel)</bold> something</p>
 <p>something <xref ref-type="table"><italic><bold>Table 1</bold></italic></xref><bold>, middle and lower;.</bold> Something</p>
+<p><xref><bold>Fig. 1Bc</bold></xref><bold> i, </bold></p>
+<p><xref>Fig5</xref><bold> E,F).</bold></p>
+<p><xref>Figure 4—figure supplement S4C</xref><bold> and D</bold></p>
+<p><xref><italic>Figure 1A</italic></xref><bold>&amp;C</bold></p>
+<p><xref>Fig. 3e</xref><bold>- f</bold></p>
 </sec>
\ No newline at end of file
diff --git a/test/tests/preprint-changes/fix-truncated-xrefs/output.xml b/test/tests/preprint-changes/fix-truncated-xrefs/output.xml
index 8bf03f2036..673c1ab137 100644
--- a/test/tests/preprint-changes/fix-truncated-xrefs/output.xml
+++ b/test/tests/preprint-changes/fix-truncated-xrefs/output.xml
@@ -3,4 +3,9 @@
 <p>something <xref ref-type="fig">Figure 1, bottom panel</xref>) something</p>
 <p>something <xref ref-type="fig">Figure 1</xref>; and Figure 2<bold>, bottom panel)</bold> something</p>
 <p>something <xref ref-type="table">Table 1, middle and lower</xref>;. Something</p>
+<p><xref>Fig. 1Bc i</xref>, </p>
+<p><xref>Fig5 E,F</xref>).</p>
+<p><xref>Figure 4—figure supplement S4C and D</xref></p>
+<p><xref>Figure 1A&amp;C</xref></p>
+<p><xref>Fig. 3e- f</xref></p>
 </sec>
\ No newline at end of file