Copy all nodes, not just elements, in transform

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 3339062968fce1faf72cc637f903f6bbdeb2c1c5..22e71c88b7962baa8d7e37986bbd9b509d8cbdd0 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -25,10 +25,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        <namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
        <template match="/">
                <xslt:transform exclude-result-prefixes="catalog exsl exslstr" version="1.0">
-                       <xslt:param name="buildtime" select="'1972-12-31T00:00:00Z'"/>
-                       <xslt:param name="catalog" select="'catalog'"/>
-                       <xslt:param name="srctime" select="'1972-12-31T00:00:00Z'"/>
-                       <xslt:param name="path" select="'/unknown'"/>
+                       <xslt:param name="BUILDTIME" select="'1972-12-31T00:00:00Z'"/>
+                       <xslt:param name="CATALOG" select="'catalog'"/>
+                       <xslt:param name="SRCTIME" select="'1972-12-31T00:00:00Z'"/>
+                       <xslt:param name="PATH" select="'/unknown'"/>
+                       <xslt:param name="VERSION" select="false"/>
+                       <xslt:param name="SRCREV" select="false"/>
                        <xslt:variable name="书社:expansion">
                                <xslt:apply-templates select="/" mode="书社:expand"/>
                        </xslt:variable>
@@ -49,7 +51,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        <xslt:when test="exsl:node-set($书社:result)/*[@书社:disable-output-wrapping]">
                                                <xslt:for-each select="exsl:node-set($书社:result)/*">
                                                        <xslt:copy>
-                                                               <xslt:copy-of select="@*[not(namespace-uri()='&书社;' and local-name()='disable-output-wrapping')]|node()"/>
+                                                               <xslt:if test="$VERSION">
+                                                                       <xslt:attribute name="书社:version">
+                                                                               <xslt:value-of select="$VERSION"/>
+                                                                       </xslt:attribute>
+                                                               </xslt:if>
+                                                               <xslt:copy-of select="@*[not(namespace-uri()='&书社;' and contains('disable-output-wrapping version', local-name()))]|node()"/>
                                                        </xslt:copy>
                                                </xslt:for-each>
                                        </xslt:when>
@@ -58,7 +65,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </xslt:otherwise>
                                </xslt:choose>
                        </xslt:template>
-                       <xslt:template match="/*/*//@书社:disable-output-wrapping" priority="0"/>
+                       <xslt:template match="/*/*//@书社:disable-output-wrapping|//@书社:destination" priority="0"/>
                        <xslt:template match="@*|node()" priority="-1">
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()"/>
@@ -78,7 +85,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                </xslt:copy>
                        </xslt:template>
                        <xslt:template match="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
-                               <xslt:variable name="uri" select="substring-before(document($catalog)//catalog:uri[@name=current()/@xlink:href]/@uri[1], '#')"/>
+                               <xslt:variable name="uri" select="substring-before(document($CATALOG)//catalog:uri[@name=current()/@xlink:href]/@uri[1], '#')"/>
                                <xslt:choose>
                                        <xslt:when test="$uri">
                                                <xslt:variable name="expanded">
@@ -115,11 +122,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                        <xslt:template match="text()" mode="书社:metadata"/>
                        <xslt:template match="/" mode="书社:wrap">
                                <xslt:variable name="metadata">
-                                       <xslt:copy-of select="html:html/html:head/*"/>
+                                       <xslt:copy-of select="html:html/html:head/node()"/>
                                        <xslt:apply-templates select="." mode="书社:metadata"/>
                                        <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
                                </xslt:variable>
                                <html:html>
+                                       <xslt:if test="$VERSION">
+                                               <xslt:attribute name="书社:version">
+                                                       <xslt:value-of select="$VERSION"/>
+                                               </xslt:attribute>
+                                       </xslt:if>
                                        <xslt:copy-of select="html:html/@*|*/@xml:lang|html:*/@lang|svg:*/@lang"/>
                                        <html:head>
                                                <xslt:copy-of select="html:html/html:head/@*"/>
@@ -130,14 +142,23 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </html:title>
                                                <xslt:copy-of select="exsl:node-set($metadata)/node()[self::comment() or self::* and not(self::html:title)]"/>
                                                <xslt:if test="not(exsl:node-set($metadata)/html:meta[@name='generator'])">
-                                                       <html:meta name="generator" content="⛩️📰 书社"/>
+                                                       <html:meta name="generator">
+                                                               <xslt:attribute name="content">
+                                                                       <xslt:text>⛩️📰 书社</xslt:text>
+                                                                       <xslt:if test="$VERSION">
+                                                                               <xslt:text> (</xslt:text>
+                                                                               <xslt:value-of select="$VERSION"/>
+                                                                               <xslt:text>)</xslt:text>
+                                                                       </xslt:if>
+                                                               </xslt:attribute>
+                                                       </html:meta>
                                                </xslt:if>
                                        </html:head>
                                        <html:body>
                                                <xslt:copy-of select="html:html/html:body/@*|html:body/@*"/>
                                                <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:header"/>
                                                <xslt:apply-templates select="." mode="书社:header"/>
-                                               <xslt:copy-of select="*[not(self::html:html or self::html:body)]|html:html/*[not(self::html:head or self::html:body)]|html:html/html:body/*|html:body/*"/>
+                                               <xslt:copy-of select="node()[not(self::html:html or self::html:body)]|html:html/node()[not(self::html:head or self::html:body)]|html:html/html:body/node()|html:body/node()"/>
                                                <xslt:apply-templates select="." mode="书社:footer"/>
                                                <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:footer"/>
                                        </html:body>