From f3533093ac35b52826aae5206647a6528ef52ce7 Mon Sep 17 00:00:00 2001
From: Fred Atherden <43879983+fred-atherden@users.noreply.github.com>
Date: Tue, 26 Nov 2024 12:44:59 +0000
Subject: [PATCH] RP XSL - account for different aff capture

`aff` can be a child of `article-meta`. This isn't preferred capture, but it's schema valid so should be supported by the XSL
---
 src/preprint-changes.xsl | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/preprint-changes.xsl b/src/preprint-changes.xsl
index 0a2a407f6c..63f3761d49 100644
--- a/src/preprint-changes.xsl
+++ b/src/preprint-changes.xsl
@@ -291,6 +291,10 @@
                                             <xsl:text>&#xa;</xsl:text>
                                         </xsl:for-each>
                                         <xsl:copy-of select="./contrib-group[not(@content-type='section')]/*[name()!='contrib']|./contrib-group[not(@content-type='section')]/text()[not(following-sibling::contrib) and not(preceding-sibling::*[1]/name()='contrib')]|./contrib-group[not(@content-type='section')]/comment()"/>
+                                        <xsl:if test="./aff">
+                                            <xsl:copy-of select="./aff|./aff/preceding-sibling::text()[1]"/>
+                                            <xsl:text>&#xa;</xsl:text>
+                                        </xsl:if>
                                     </xsl:element>
                                     <xsl:if test="./contrib-group[@content-type='section']">
                                         <xsl:text>&#xa;</xsl:text>
@@ -365,6 +369,10 @@
                                                             <xsl:text>&#xa;</xsl:text>
                                                         </xsl:for-each>
                                                         <xsl:copy-of select="./contrib-group[not(@content-type='section')]/*[name()!='contrib']|./contrib-group[not(@content-type='section')]/text()[not(following-sibling::contrib) and not(preceding-sibling::*[1]/name()='contrib')]|./contrib-group[not(@content-type='section')]/comment()"/>
+                                                        <xsl:if test="./aff">
+                                                            <xsl:copy-of select="./aff|./aff/preceding-sibling::text()[1]"/>
+                                                            <xsl:text>&#xa;</xsl:text>
+                                                        </xsl:if>
                                                     </xsl:element>
                                                     <xsl:if test="./contrib-group[@content-type='section']">
                                                         <xsl:text>&#xa;</xsl:text>
@@ -412,6 +420,10 @@
                                                             <xsl:text>&#xa;</xsl:text>
                                                         </xsl:for-each>
                                                         <xsl:copy-of select="./contrib-group[not(@content-type='section')]/*[name()!='contrib']|./contrib-group[not(@content-type='section')]/text()[not(following-sibling::contrib) and not(preceding-sibling::*[1]/name()='contrib')]|./contrib-group[not(@content-type='section')]/comment()"/>
+                                                         <xsl:if test="./aff">
+                                                            <xsl:copy-of select="./aff|./aff/preceding-sibling::text()[1]"/>
+                                                            <xsl:text>&#xa;</xsl:text>
+                                                        </xsl:if>
                                                     </xsl:element>
                                                     <xsl:if test="./contrib-group[@content-type='section']">
                                                         <xsl:text>&#xa;</xsl:text>
@@ -460,6 +472,10 @@
                                                             <xsl:text>&#xa;</xsl:text>
                                                         </xsl:for-each>
                                                         <xsl:copy-of select="./contrib-group[not(@content-type='section')]/*[name()!='contrib']|./contrib-group[not(@content-type='section')]/text()[not(following-sibling::contrib) and not(preceding-sibling::*[1]/name()='contrib')]|./contrib-group[not(@content-type='section')]/comment()"/>
+                                                         <xsl:if test="./aff">
+                                                            <xsl:copy-of select="./aff|./aff/preceding-sibling::text()[1]"/>
+                                                            <xsl:text>&#xa;</xsl:text>
+                                                        </xsl:if>
                                                     </xsl:element>
                                                     <xsl:if test="./contrib-group[@content-type='section']">
                                                         <xsl:text>&#xa;</xsl:text>
@@ -477,7 +493,7 @@
                                                 </xsl:when>
                                                 <!-- matches cannot be found easily - this will need doing manually if desired -->
                                                 <xsl:otherwise>
-                                                    <xsl:apply-templates select="./contrib-group|text()[preceding-sibling::contrib-group and following-sibling::author-notes]"/>
+                                                    <xsl:apply-templates select="./contrib-group|./aff|text()[preceding-sibling::contrib-group and following-sibling::author-notes]"/>
                                                     <xsl:element name="author-notes">
                                                         <xsl:copy-of select="./author-notes/text()[following-sibling::corresp]"/>
                                                         <xsl:comment><xsl:value-of select="./author-notes/corresp"/></xsl:comment>
@@ -498,7 +514,7 @@
                                         </xsl:when>
                                         <!-- corresp email and author counts do not match - this will need doing manually if desired -->
                                         <xsl:otherwise>
-                                            <xsl:apply-templates select="./contrib-group|text()[preceding-sibling::contrib-group and following-sibling::author-notes]"/>
+                                            <xsl:apply-templates select="./contrib-group|./aff|text()[preceding-sibling::contrib-group and following-sibling::author-notes]"/>
                                             <xsl:element name="author-notes">
                                                 <xsl:choose>
                                                     <!-- If there are two or more corresps for some reason -->
@@ -550,7 +566,7 @@
                             </xsl:choose>
                         </xsl:when>
                         <xsl:otherwise>
-                            <xsl:apply-templates select="./contrib-group|./author-notes|text()[preceding-sibling::contrib-group and following-sibling::author-notes]"/>
+                            <xsl:apply-templates select="./contrib-group|./aff|./author-notes|text()[preceding-sibling::contrib-group and following-sibling::author-notes]"/>
                         </xsl:otherwise>
                     </xsl:choose>
                     <xsl:apply-templates select="*[preceding-sibling::author-notes]|text()[preceding-sibling::author-notes]"/>