X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/3b97090500b8714bd32d01e4e4ac2c10cdbdf713..d64d93fe12371f87cc42d72e7e874115b28fb252:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 1d36bb1..a6c83d6 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -26,11 +26,12 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 	<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="CKSUM" select="false"/>
 			<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:param name="SRCTIME" select="'1972-12-31T00:00:00Z'"/>
+			<xslt:param name="THISREV" select="false"/>
 			<xslt:variable name="书社:expansion">
 				<xslt:apply-templates select="/" mode="书社:expand"/>
 			</xslt:variable>
@@ -51,9 +52,9 @@ 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:if test="$VERSION">
+								<xslt:if test="$THISREV">
 									<xslt:attribute name="书社:version">
-										<xslt:value-of select="$VERSION"/>
+										<xslt:value-of select="$THISREV"/>
 									</xslt:attribute>
 								</xslt:if>
 								<xslt:copy-of select="@*[not(namespace-uri()='&书社;' and contains('disable-output-wrapping version', local-name()))]|node()"/>
@@ -121,15 +122,18 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<xslt:template match="text()" mode="书社:footer"/>
 			<xslt:template match="text()" mode="书社:metadata"/>
 			<xslt:template match="/" mode="书社:wrap">
+				<xslt:variable name="modalinput">
+					<xslt:copy-of select="node()"/>
+					<xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
+				</xslt:variable>
 				<xslt:variable name="metadata">
 					<xslt:copy-of select="html:html/html:head/node()|html:head/node()"/>
-					<xslt:apply-templates select="." mode="书社:metadata"/>
-					<xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
+					<xslt:apply-templates select="exsl:node-set($modalinput)" mode="书社:metadata"/>
 				</xslt:variable>
 				<html:html>
-					<xslt:if test="$VERSION">
+					<xslt:if test="$THISREV">
 						<xslt:attribute name="书社:version">
-							<xslt:value-of select="$VERSION"/>
+							<xslt:value-of select="$THISREV"/>
 						</xslt:attribute>
 					</xslt:if>
 					<xslt:copy-of select="html:html/@*"/>
@@ -151,26 +155,26 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 							</xslt:for-each>
 						</html:title>
 						<xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::*) or not(self::html:title)]"/>
-						<xslt:if test="not(exsl:node-set($metadata)/html:meta[@name='generator'])">
-							<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:meta name="generator">
+							<xslt:attribute name="content">
+								<xslt:for-each select="exsl:node-set($metadata)/html:meta[@name='generator']">
+									<xslt:value-of select="@content"/>
+									<xslt:text>, </xslt:text>
+								</xslt:for-each>
+								<xslt:text>⛩️📰 书社</xslt:text>
+								<xslt:if test="$THISREV">
+									<xslt:text> (</xslt:text>
+									<xslt:value-of select="$THISREV"/>
+									<xslt:text>)</xslt:text>
+								</xslt:if>
+							</xslt:attribute>
+						</html:meta>
 					</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:apply-templates select="exsl:node-set($modalinput)" mode="书社:header"/>
 						<xslt:copy-of select="node()[not(self::html:html or self::html:head 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"/>
+						<xslt:apply-templates select="exsl:node-set($modalinput)" mode="书社:footer"/>
 					</html:body>
 				</html:html>
 			</xslt:template>