X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/c90a81c7a17668ea74a7dee4ddab580108e2f9c4..822cc7a3dc43bf265ee2b09e649add08ee517a67:/lib/catalog2transform.xslt?ds=sidebyside

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index af7fd6f..74f7f46 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -44,7 +44,9 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<xslt:param name="THISREV" select="false()"/>
 			<xslt:variable name="书社:source" select="/"/>
 			<xslt:variable name="书社:about-fragment">
-				<apply-templates select="document($METADATA)" mode="书社:literally"/>
+				<apply-templates select="document($METADATA)" mode="书社:literally">
+					<with-param name="extension-element-namespaces" select="'http://exslt.org/common http://exslt.org/strings'"/>
+				</apply-templates>
 			</xslt:variable>
 			<xslt:variable name="书社:about" select="exsl:node-set($书社:about-fragment)"/>
 			<xslt:variable name="书社:expansion-fragment">
@@ -263,7 +265,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 				<xslt:variable name="result-nodes" select="$书社:result/node()[not(self::书社:apply-attributes-to-root)]|$书社:result/书社:apply-attributes-to-root/descendant::node()[not(self::书社:apply-attributes-to-root) and not(ancestor::*[not(self::书社:apply-attributes-to-root)])]"/>
 				<xslt:variable name="root-with-attributes">
 					<xslt:choose>
-						<xslt:when test="$result-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive']|$result-nodes/@书社:disable-output-wrapping|$书社:result//书社:apply-attributes-to-root/@书社:disable-output-wrapping">
+						<xslt:when test="not($result-nodes/self::html:*) or $result-nodes/self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive'] or $result-nodes/@书社:disable-output-wrapping or $书社:result//书社:apply-attributes-to-root/@书社:disable-output-wrapping">
 							<xslt:call-template name="书社:apply-attributes">
 								<xslt:with-param name="and-version" select="true()"/>
 								<xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>