Move expansion into its own transform

diff --git a/README.markdown b/README.markdown
index 0b4c4b4ef135c7375368a9f78e859964998e4cf2..9b649d21df4eb381c71d27595bbe42c5646e6939 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -633,6 +633,9 @@ Transforms are used to convert X·M·L files into their final output,
   This conversion happens during the finalization phase, after the main
     transformation.
 
+- **`transforms/expansion.xslt`:**
+  Performs embedding, as described above.
+
 - **`transforms/metadata.xslt`:**
   Provides basic `<html:head>` metadata.
   This metadata is generated from `<html:meta>` elements with one of

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 2c1a40ef4ed1375f9eea66b0f296f2a3ab02f344..0ba07f40752c89c396bc1766009994496d6c93ce 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -52,7 +52,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </if>
                        </for-each>
                </variable>
-               <xslt:transform exclude-result-prefixes="nfo" extension-element-prefixes="exsl exslfunc exslstr" version="1.0">
+               <xslt:transform exclude-result-prefixes="nfo 书社vocab" extension-element-prefixes="exsl exslfunc exslstr" version="1.0">
                        <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
                        <xslt:param name="IDENTIFIER" select="false()"/>
                        <xslt:param name="SRCREV" select="false()"/>
@@ -318,126 +318,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:apply-templates select="@*|node()" mode="书社:apply"/>
                                </xslt:copy>
                        </xslt:template>
-                       <xslt:template match="书社:link[@xlink:show='embed' and (not(@xlink:actuate) or @xlink:actuate='none')]" mode="书社:expand" priority="1">
-                               <xslt:variable name="link" select="."/>
-                               <xslt:variable name="identifier" select="string(@xlink:href)"/>
-                               <xslt:variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
-                               <xslt:variable name="included" select="$书社:about//*[@rdf:about=$identifier or $is-dir and starts-with(@rdf:about, $identifier)]"/>
-                               <xslt:choose>
-                                       <xslt:when test="$included">
-                                               <xslt:for-each select="$included">
-                                                       <xslt:sort select="@rdf:about" data-type="text" lang="zxx" case-order="upper-first"/>
-                                                       <xslt:variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
-                                                       <xslt:variable name="expanded">
-                                                               <xslt:apply-templates select="document($uri)" mode="书社:expand">
-                                                                       <xslt:with-param name="identifier" select="string(@rdf:about)"/>
-                                                               </xslt:apply-templates>
-                                                       </xslt:variable>
-                                                       <xslt:for-each select="exsl:node-set($expanded)/node()">
-                                                               <xslt:copy>
-                                                                       <xslt:choose>
-                                                                               <xslt:when test="self::html:*">
-                                                                                       <xslt:variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>
-                                                                                       <xslt:attribute name="itemscope">itemscope</xslt:attribute>
-                                                                                       <xslt:attribute name="itemtype">
-                                                                                               <xslt:for-each select="$existing-types/token[string()!='&书社;:document']">
-                                                                                                       <xslt:if test="position()!=1">
-                                                                                                               <xslt:text>
-                                                                                                                       <text> </text>
-                                                                                                               </xslt:text>
-                                                                                                       </xslt:if>
-                                                                                                       <xslt:value-of select="."/>
-                                                                                               </xslt:for-each>
-                                                                                               <xslt:if test="not($existing-types/token[string()='&书社;:embed'])">
-                                                                                                       <xslt:if test="$existing-types/token[string()!='&书社;:document']">
-                                                                                                               <xslt:text>
-                                                                                                                       <text> </text>
-                                                                                                               </xslt:text>
-                                                                                                       </xslt:if>
-                                                                                                       <xslt:text>
-                                                                                                               <text>&书社;:embed</text>
-                                                                                                       </xslt:text>
-                                                                                               </xslt:if>
-                                                                                       </xslt:attribute>
-                                                                                       <xslt:choose>
-                                                                                               <xslt:when test="$link/@书社:archived-as">
-                                                                                                       <xslt:copy-of select="$link/@书社:archived-as"/>
-                                                                                               </xslt:when>
-                                                                                               <xslt:when test="@书社:archived-as">
-                                                                                                       <xslt:copy-of select="@书社:archived-as"/>
-                                                                                               </xslt:when>
-                                                                                       </xslt:choose>
-                                                                                       <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype')) and not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
-                                                                               </xslt:when>
-                                                                               <xslt:otherwise>
-                                                                                       <xslt:choose>
-                                                                                               <xslt:when test="self::* and $link/@书社:archived-as">
-                                                                                                       <xslt:copy-of select="$link/@书社:archived-as"/>
-                                                                                               </xslt:when>
-                                                                                               <xslt:when test="@书社:archived-as">
-                                                                                                       <xslt:copy-of select="@书社:archived-as"/>
-                                                                                               </xslt:when>
-                                                                                       </xslt:choose>
-                                                                                       <xslt:copy-of select="@*[not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
-                                                                               </xslt:otherwise>
-                                                                       </xslt:choose>
-                                                               </xslt:copy>
-                                                       </xslt:for-each>
-                                               </xslt:for-each>
-                                       </xslt:when>
-                                       <xslt:otherwise>
-                                               <xslt:copy>
-                                                       <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
-                                               </xslt:copy>
-                                       </xslt:otherwise>
-                               </xslt:choose>
-                       </xslt:template>
-                       <xslt:template match="/node()" mode="书社:expand" priority="0">
-                               <xslt:param name="identifier" select="$IDENTIFIER"/>
-                               <xslt:copy>
-                                       <xslt:if test="self::*">
-                                               <xslt:attribute name="书社:cksum">
-                                                       <xslt:value-of select="$书社:about//*[@rdf:about=$identifier]/nfo:hasHash[@nfo:hashAlgorithm='CRC32']/@nfo:hashValue"/>
-                                               </xslt:attribute>
-                                               <xslt:attribute name="书社:identifier">
-                                                       <xslt:value-of select="$identifier"/>
-                                               </xslt:attribute>
-                                               <xslt:attribute name="书社:mtime">
-                                                       <xslt:value-of select="$书社:about//*[@rdf:about=$identifier]/nfo:fileLastModified"/>
-                                               </xslt:attribute>
-                                       </xslt:if>
-                                       <xslt:choose>
-                                               <xslt:when test="self::html:*">
-                                                       <xslt:variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>
-                                                       <xslt:attribute name="itemscope">itemscope</xslt:attribute>
-                                                       <xslt:attribute name="itemtype">
-                                                               <xslt:for-each select="$existing-types/token">
-                                                                       <xslt:if test="position()!=1">
-                                                                               <xslt:text>
-                                                                                       <text> </text>
-                                                                               </xslt:text>
-                                                                       </xslt:if>
-                                                                       <xslt:value-of select="."/>
-                                                               </xslt:for-each>
-                                                               <xslt:if test="not($existing-types/token[string()='&书社;:embed' or string()='&书社;:document'])">
-                                                                       <xslt:if test="$existing-types/token">
-                                                                               <xslt:text>
-                                                                                       <text> </text>
-                                                                               </xslt:text>
-                                                                       </xslt:if>
-                                                                       <xslt:text>
-                                                                               <text>&书社;:document</text>
-                                                                       </xslt:text>
-                                                               </xslt:if>
-                                                       </xslt:attribute>
-                                                       <xslt:apply-templates select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype') or namespace-uri()='&书社;' and (local-name()='cksum' or local-name()='identifier' or local-name()='mtime'))]|node()" mode="书社:expand"/>
-                                               </xslt:when>
-                                               <xslt:otherwise>
-                                                       <xslt:apply-templates select="@*[not(namespace-uri()='&书社;' and (local-name()='cksum' or local-name()='identifier' or local-name()='mtime'))]|node()" mode="书社:expand"/>
-                                               </xslt:otherwise>
-                                       </xslt:choose>
-                               </xslt:copy>
-                       </xslt:template>
                        <xslt:template match="@*|node()" mode="书社:expand" priority="-1">
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>

diff --git a/transforms/expansion.xslt b/transforms/expansion.xslt
new file mode 100644 (file)
index 0000000..8c0dd69
--- /dev/null
+++ b/transforms/expansion.xslt
@@ -0,0 +1,140 @@
+<?xml version="1.0"?>
+<!--
+SPDX-FileCopyrightText: 2023, 2024, 2025 Lady <https://www.ladys.computer/about/#lady>
+SPDX-License-Identifier: MPL-2.0
+-->
+<!--
+⁌ ⛩📰 书社 ∷ transforms/expansion.xslt
+
+© 2023–2025 Lady [@ Ladys Computer].
+
+This Source Code Form is subject to the terms of the Mozilla Public License, v 2.0.
+If a copy of the M·P·L was not distributed with this file, You can obtain one at <https://mozilla.org/MPL/2.0/>.
+-->
+<!DOCTYPE transform [
+       <!ENTITY 书社 'urn:fdc:ladys.computer:20231231:Shu1She4'>
+]>
+<transform
+       xmlns="http://www.w3.org/1999/XSL/Transform"
+       xmlns:exsl="http://exslt.org/common"
+       xmlns:exslstr="http://exslt.org/strings"
+       xmlns:html="http://www.w3.org/1999/xhtml"
+       xmlns:nfo="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"
+       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+       xmlns:xlink="http://www.w3.org/1999/xlink"
+       xmlns:书社="&书社;"
+       xmlns:书社vocab="urn:fdc:ladys.computer:20231231:Shu1She4:vocab:"
+       exclude-result-prefixes="nfo 书社vocab"
+       extension-element-prefixes="exsl exslstr"
+       version="1.0"
+>
+       <书社:id>urn:fdc:ladys.computer:20231231:Shu1She4:expansion.xslt</书社:id>
+       <template match="书社:link[@xlink:show='embed' and (not(@xlink:actuate) or @xlink:actuate='none')]" mode="书社:expand" priority="1">
+               <variable name="link" select="."/>
+               <variable name="identifier" select="string(@xlink:href)"/>
+               <variable name="is-dir" select="substring($identifier, string-length($identifier))='/'"/>
+               <variable name="included" select="$书社:about//*[@rdf:about=$identifier or $is-dir and starts-with(@rdf:about, $identifier)]"/>
+               <choose>
+                       <when test="$included">
+                               <for-each select="$included">
+                                       <sort select="@rdf:about" data-type="text" lang="zxx" case-order="upper-first"/>
+                                       <variable name="uri" select="书社vocab:hasParsedFile/@nfo:fileUrl"/>
+                                       <variable name="expanded">
+                                               <apply-templates select="document($uri)" mode="书社:expand">
+                                                       <with-param name="identifier" select="string(@rdf:about)"/>
+                                               </apply-templates>
+                                       </variable>
+                                       <for-each select="exsl:node-set($expanded)/node()">
+                                               <copy>
+                                                       <choose>
+                                                               <when test="self::html:*">
+                                                                       <variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>
+                                                                       <attribute name="itemscope">itemscope</attribute>
+                                                                       <attribute name="itemtype">
+                                                                               <for-each select="$existing-types/token[string()!='&书社;:document']">
+                                                                                       <if test="position()!=1">
+                                                                                               <text> </text>
+                                                                                       </if>
+                                                                                       <value-of select="."/>
+                                                                               </for-each>
+                                                                               <if test="not($existing-types/token[string()='&书社;:embed'])">
+                                                                                       <if test="$existing-types/token[string()!='&书社;:document']">
+                                                                                               <text> </text>
+                                                                                       </if>
+                                                                                       <text>&书社;:embed</text>
+                                                                               </if>
+                                                                       </attribute>
+                                                                       <choose>
+                                                                               <when test="$link/@书社:archived-as">
+                                                                                       <copy-of select="$link/@书社:archived-as"/>
+                                                                               </when>
+                                                                               <when test="@书社:archived-as">
+                                                                                       <copy-of select="@书社:archived-as"/>
+                                                                               </when>
+                                                                       </choose>
+                                                                       <copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype')) and not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
+                                                               </when>
+                                                               <otherwise>
+                                                                       <choose>
+                                                                               <when test="self::* and $link/@书社:archived-as">
+                                                                                       <copy-of select="$link/@书社:archived-as"/>
+                                                                               </when>
+                                                                               <when test="@书社:archived-as">
+                                                                                       <copy-of select="@书社:archived-as"/>
+                                                                               </when>
+                                                                       </choose>
+                                                                       <copy-of select="@*[not(namespace-uri()='&书社;' and local-name()='archived-as')]|node()"/>
+                                                               </otherwise>
+                                                       </choose>
+                                               </copy>
+                                       </for-each>
+                               </for-each>
+                       </when>
+                       <otherwise>
+                               <copy>
+                                       <apply-templates select="@*|node()" mode="书社:expand"/>
+                               </copy>
+                       </otherwise>
+               </choose>
+       </template>
+       <template match="/node()" mode="书社:expand" priority="0">
+               <param name="identifier" select="$IDENTIFIER"/>
+               <copy>
+                       <if test="self::*">
+                               <attribute name="书社:cksum">
+                                       <value-of select="$书社:about//*[@rdf:about=$identifier]/nfo:hasHash[@nfo:hashAlgorithm='CRC32']/@nfo:hashValue"/>
+                               </attribute>
+                               <attribute name="书社:identifier">
+                                       <value-of select="$identifier"/>
+                               </attribute>
+                               <attribute name="书社:mtime">
+                                       <value-of select="$书社:about//*[@rdf:about=$identifier]/nfo:fileLastModified"/>
+                               </attribute>
+                       </if>
+                       <choose>
+                               <when test="self::html:*">
+                                       <variable name="existing-types" select="exslstr:tokenize(@itemtype)"/>
+                                       <attribute name="itemscope">itemscope</attribute>
+                                       <attribute name="itemtype">
+                                               <for-each select="$existing-types/token">
+                                                       <if test="position()!=1">
+                                                               <text> </text>
+                                                       </if>
+                                                       <value-of select="."/>
+                                               </for-each>
+                                               <if test="not($existing-types/token[string()='&书社;:embed' or string()='&书社;:document'])">
+                                                       <if test="$existing-types/token">
+                                                               <text> </text>
+                                                       </if>
+                                                       <text>&书社;:document</text>
+                                               </if>
+                                       </attribute>
+                                       <apply-templates select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype') or namespace-uri()='&书社;' and (local-name()='cksum' or local-name()='identifier' or local-name()='mtime'))]|node()" mode="书社:expand"/>
+                               </when>
+                               <otherwise>
+                                       <apply-templates select="@*[not(namespace-uri()='&书社;' and (local-name()='cksum' or local-name()='identifier' or local-name()='mtime'))]|node()" mode="书社:expand"/>
+                               </otherwise>
+                       </choose>
+               </copy>
+       </template>
+</transform>