X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/dd8581764fb0ddb86e84d68f3a90ddfe3b96102f..8335dd51d309234642ae86a1ec69e573246ff43c:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 953a683..92dcaf9 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -121,10 +121,13 @@ 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/*"/>
-					<xslt:apply-templates select="." mode="书社:metadata"/>
-					<xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
+					<xslt:copy-of select="html:html/html:head/node()|html:head/node()"/>
+					<xslt:apply-templates select="exsl:node-set($modalinput)" mode="书社:metadata"/>
 				</xslt:variable>
 				<html:html>
 					<xslt:if test="$VERSION">
@@ -132,15 +135,25 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 							<xslt:value-of select="$VERSION"/>
 						</xslt:attribute>
 					</xslt:if>
-					<xslt:copy-of select="html:html/@*|*/@xml:lang|html:*/@lang|svg:*/@lang"/>
+					<xslt:copy-of select="html:html/@*"/>
+					<xslt:if test="not(html:html/@lang) and (html:*/@lang|svg:*/@lang|*/@xml:lang)">
+						<xslt:attribute name="lang">
+							<xslt:value-of select="html:*/@lang|svg:*/@lang|*/@xml:lang"/>
+						</xslt:attribute>
+					</xslt:if>
+					<xslt:if test="not(html:html/@xml:lang) and (html:*/@lang|svg:*/@lang|*/@xml:lang)">
+						<xslt:attribute name="xml:lang">
+							<xslt:value-of select="html:*/@lang|svg:*/@lang|*/@xml:lang"/>
+						</xslt:attribute>
+					</xslt:if>
 					<html:head>
-						<xslt:copy-of select="html:html/html:head/@*"/>
+						<xslt:copy-of select="html:html/html:head/@*|html:head/@*"/>
 						<html:title>
 							<xslt:for-each select="exsl:node-set($metadata)/html:title">
 								<xslt:value-of select="."/>
 							</xslt:for-each>
 						</html:title>
-						<xslt:copy-of select="exsl:node-set($metadata)/node()[self::comment() or self::* and not(self::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">
@@ -156,11 +169,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					</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: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="书社: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="exsl:node-set($modalinput)" mode="书社:footer"/>
 					</html:body>
 				</html:html>
 			</xslt:template>