From: Lady <redacted>
Date: Sun, 28 Sep 2025 01:46:15 +0000 (-0400)
Subject: Move includes above result variables
X-Git-Url: https://git.ladys.computer/Shushe/commitdiff_plain/5d17c2c33d86502d47564e17af9d71fbda441ccd?ds=inline

Move includes above result variables

This is to hopefully avoid `xsltFreeStackElem: Unexpected RVT flag 3`
when the result depends on the result of a function that was declared
in an included transform.

See <https://gitlab.gnome.org/GNOME/libxslt/-/issues/156>.
---

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index ce94067..b2cd236 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -86,6 +86,13 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				</apply-templates>
 			</xslt:variable>
 			<xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
+			<for-each select="//catalog:uri">
+				<xslt:include href="{@uri}">
+					<attribute name="书社:id">
+						<value-of select="@name"/>
+					</attribute>
+				</xslt:include>
+			</for-each>
 			<xslt:variable name="书社:expansion-fragment">
 				<xslt:apply-templates select="$书社:source/node()" mode="书社:expand"/>
 			</xslt:variable>
@@ -100,13 +107,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</xslt:variable>
 			<xslt:variable name="书社:result" select="书社:document-with-attributes-applied(exsl:node-set($书社:result-fragment))"/>
 			<xslt:variable name="书社:destination" select="string($书社:about//*[@rdf:about=$IDENTIFIER]/@书社vocab:destination)"/>
-			<for-each select="//catalog:uri">
-				<xslt:include href="{@uri}">
-					<attribute name="书社:id">
-						<value-of select="@name"/>
-					</attribute>
-				</xslt:include>
-			</for-each>
 			<xslt:template name="书社:apply-attributes">
 				<xslt:param name="context-nodes" select="/.."/>
 				<xslt:param name="destination-nodes" select="/.."/>