X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/c26abcf07cd0f116b5810946744dd804cc41a208..82fd95b5f6748674ec5929b9b1a6caf30172b544:/lib/catalog2transform.xslt?ds=sidebyside

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 2315762..05ca7d5 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -4,9 +4,9 @@ SPDX-FileCopyrightText: 2023, 2024 Lady <https://www.ladys.computer/about/#lady>
 SPDX-License-Identifier: MPL-2.0
 -->
 <!--
-⁌ ⛩️📰 书社 ∷ lib/catalog2transform.xslt
+⁌ ⛩📰 书社 ∷ lib/catalog2transform.xslt
 
-© 2023–2024 Lady [@ Lady’s Computer].
+© 2023–2024 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/>.
@@ -17,41 +17,66 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 ]>
 <transform
 	xmlns="http://www.w3.org/1999/XSL/Transform"
-	xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
 	xmlns:exsl="http://exslt.org/common"
 	xmlns:exslstr="http://exslt.org/strings"
+	xmlns:html="http://www.w3.org/1999/xhtml"
+	xmlns:nie="http://www.semanticdesktop.org/ontologies/2007/01/19/nie#"
+	xmlns:nfo="http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:svg="http://www.w3.org/2000/svg"
 	xmlns:xlink="http://www.w3.org/1999/xlink"
 	xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
 	xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
+	xmlns:书社vocab="urn:fdc:ladys.computer:20231231:Shu1She4:vocab:"
+	exclude-result-prefixes="catalog"
 	version="1.0"
 >
+	<include href="literally.xslt"/>
 	<namespace-alias stylesheet-prefix="xslt" result-prefix="#default"/>
+	<param name="METADATA" select="'about:blank'"/>
+	<variable name="builddir" select="document($METADATA)//书社vocab:BuildDirectory/@nfo:fileUrl"/>
 	<template match="/">
-		<xslt:transform exclude-result-prefixes="catalog" extension-element-prefixes="exsl exslstr" version="1.0">
+		<variable name="ids">
+			<for-each select="//catalog:uri[@name]">
+				<书社:id>
+					<value-of select="@name"/>
+				</书社:id>
+			</for-each>
+		</variable>
+		<variable name="unique-ids">
+			<for-each select="exsl:node-set($ids)/*">
+				<if test="not(preceding-sibling::*[string(.)=string(current())])">
+					<copy-of select="."/>
+				</if>
+			</for-each>
+		</variable>
+		<xslt:transform exclude-result-prefixes="nie nfo" extension-element-prefixes="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="IDENTIFIER" select="false()"/>
-			<xslt:param name="PATH" select="'/unknown'"/>
 			<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="书社:source" select="/"/>
-			<xslt:variable name="书社:expansion">
+			<xslt:variable name="书社:about-fragment">
+				<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">
 				<xslt:apply-templates select="$书社:source/node()" mode="书社:expand"/>
 			</xslt:variable>
-			<xslt:variable name="书社:result">
-				<xslt:apply-templates select="exsl:node-set($书社:expansion)/node()"/>
+			<xslt:variable name="书社:expansion" select="exsl:node-set($书社:expansion-fragment)"/>
+			<xslt:variable name="书社:result-fragment">
+				<xslt:apply-templates select="$书社:expansion/node()"/>
 			</xslt:variable>
+			<xslt:variable name="书社:result" select="exsl:node-set($书社:result-fragment)"/>
+			<xslt:variable name="书社:destination" select="string($书社:about//*[@rdf:about=$IDENTIFIER]/@书社vocab:destination)"/>
 			<for-each select="//catalog:uri">
 				<xslt:include href="{@uri}">
-					<if test="contains(@name, ':')">
-						<attribute name="书社:id">
-							<value-of select="@name"/>
-						</attribute>
-					</if>
+					<attribute name="书社:id">
+						<value-of select="@name"/>
+					</attribute>
 				</xslt:include>
 			</for-each>
 			<xslt:template name="书社:apply-attributes">
@@ -165,14 +190,16 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			</xslt:template>
 			<xslt:template name="书社:wrap">
 				<xslt:param name="nodes" select="/.."/>
-				<xslt:variable name="modalinput">
+				<xslt:variable name="modalinput-fragment">
 					<xslt:copy-of select="$nodes"/>
-					<xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
+					<apply-templates select="exsl:node-set($unique-ids)" mode="书社:literally"/>
 				</xslt:variable>
-				<xslt:variable name="metadata">
+				<xslt:variable name="modalinput" select="exsl:node-set($modalinput-fragment)"/>
+				<xslt:variable name="metadata-fragment">
 					<xslt:copy-of select="$nodes[self::html:html]/html:head/node()|$nodes[self::html:head]/node()"/>
-					<xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:metadata"/>
+					<xslt:apply-templates select="$modalinput/node()" mode="书社:metadata"/>
 				</xslt:variable>
+				<xslt:variable name="metadata" select="exsl:node-set($metadata-fragment)"/>
 				<html:html>
 					<xslt:copy-of select="$nodes[self::html:html]/@*"/>
 					<xslt:if test="not($nodes[self::html:html]/@书社:archived-as) and $nodes/@书社:archived-as">
@@ -193,7 +220,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					<html:head>
 						<xslt:copy-of select="$nodes[self::html:html]/html:head/@*|$nodes[self::html:head]/@*"/>
 						<html:title>
-							<xslt:for-each select="exsl:node-set($metadata)/html:title">
+							<xslt:for-each select="$metadata/html:title">
 								<xslt:value-of select="."/>
 								<xslt:if test="position()!=last()">
 									<xslt:text>
@@ -202,17 +229,17 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 								</xslt:if>
 							</xslt:for-each>
 						</html:title>
-						<xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::html:title)]"/>
+						<xslt:copy-of select="$metadata/node()[not(self::html:title or self::html:meta and @name='generator')]"/>
 						<html:meta name="generator">
 							<xslt:attribute name="content">
-								<xslt:for-each select="exsl:node-set($metadata)/html:meta[@name='generator']">
+								<xslt:for-each select="$metadata/html:meta[@name='generator']">
 									<xslt:value-of select="@content"/>
 									<xslt:text>
 										<text>, </text>
 									</xslt:text>
 								</xslt:for-each>
 								<xslt:text>
-									<text>⛩️📰 书社</text>
+									<text>⛩📰 书社</text>
 								</xslt:text>
 								<xslt:if test="$THISREV">
 									<xslt:text>
@@ -228,20 +255,20 @@ 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="$nodes[self::html:html]/html:body/@*|$nodes[self::html:body]/@*"/>
-						<xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:header"/>
+						<xslt:apply-templates select="$modalinput/node()" mode="书社:header"/>
 						<xslt:copy-of select="$nodes[not(self::html:html or self::html:head or self::html:body)]|$nodes[self::html:html]/node()[not(self::html:head or self::html:body)]|$nodes[self::html:html]/html:body/node()|$nodes[self::html:body]/node()"/>
-						<xslt:apply-templates select="exsl:node-set($modalinput)/node()" mode="书社:footer"/>
+						<xslt:apply-templates select="$modalinput/node()" mode="书社:footer"/>
 					</html:body>
 				</html:html>
 			</xslt:template>
 			<xslt:template match="/" priority="1">
-				<xslt:variable name="result-nodes" select="exsl:node-set($书社:result)/node()[not(self::书社:apply-attributes-to-root)]|exsl:node-set($书社: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="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|exsl:node-set($书社: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="exsl:node-set($书社:result)//书社:apply-attributes-to-root"/>
+								<xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>
 								<xslt:with-param name="destination-nodes" select="$result-nodes"/>
 							</xslt:call-template>
 						</xslt:when>
@@ -253,135 +280,211 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 							</xslt:variable>
 							<xslt:call-template name="书社:apply-attributes">
 								<xslt:with-param name="and-version" select="true()"/>
-								<xslt:with-param name="context-nodes" select="exsl:node-set($书社:result)//书社:apply-attributes-to-root"/>
+								<xslt:with-param name="context-nodes" select="$书社:result//书社:apply-attributes-to-root"/>
 								<xslt:with-param name="destination-nodes" select="exsl:node-set($wrapped-result)/node()"/>
 							</xslt:call-template>
 						</xslt:otherwise>
 					</xslt:choose>
 				</xslt:variable>
-				<xslt:apply-templates select="exsl:node-set($root-with-attributes)/node()" mode="书社:application"/>
+				<xslt:apply-templates select="exsl:node-set($root-with-attributes)/node()" mode="书社:apply"/>
 			</xslt:template>
 			<xslt:template match="@*|node()" priority="-1">
 				<xslt:copy>
 					<xslt:apply-templates select="@*|node()"/>
 				</xslt:copy>
 			</xslt:template>
-			<xslt:template match="@*|node()" mode="书社:application">
-				<xslt:copy>
-					<xslt:apply-templates select="@*|node()" mode="书社:application"/>
-				</xslt:copy>
-			</xslt:template>
-			<xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:application" priority="1"/>
-			<xslt:template match="书社:archive" mode="书社:application">
+			<xslt:template match="@书社:destination|@书社:disable-output-wrapping|@书社:archived-as[../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]]" mode="书社:apply" priority="1"/>
+			<xslt:template match="书社:archive" mode="书社:apply" priority="1">
 				<xslt:copy>
-					<xslt:for-each select="@*|node()">
+					<xslt:for-each select="@*">
+						<xslt:choose>
+							<xslt:when test="local-name()='archived-as' and namespace-uri()='&书社;' and ../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)]"/>
+							<xslt:otherwise>
+								<xslt:apply-templates select="." mode="书社:apply"/>
+							</xslt:otherwise>
+						</xslt:choose>
+					</xslt:for-each>
+					<xslt:for-each select="node()">
 						<xslt:choose>
 							<xslt:when test="self::*">
-								<xslt:variable name="component">
-									<xslt:choose>
-										<xslt:when test="self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive']|@书社:disable-output-wrapping">
-											<xslt:copy-of select="."/>
-										</xslt:when>
-										<xslt:otherwise>
-											<xslt:call-template name="书社:wrap">
-												<xslt:with-param name="nodes" select="."/>
-											</xslt:call-template>
-										</xslt:otherwise>
-									</xslt:choose>
+								<xslt:variable name="component-fragment">
+									<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">
+														<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:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
+											</xslt:when>
+											<xslt:otherwise>
+												<xslt:copy-of select="@*|node()"/>
+											</xslt:otherwise>
+										</xslt:choose>
+									</xslt:copy>
 								</xslt:variable>
-								<xslt:apply-templates select="exsl:node-set($component)/node()" mode="书社:application"/>
+								<xslt:variable name="wrapped-component-fragment">
+									<xslt:for-each select="exsl:node-set($component-fragment)/*">
+										<xslt:choose>
+											<xslt:when test="self::书社:*[local-name()='raw-text' or local-name()='base64-binary' or local-name()='archive']|@书社:disable-output-wrapping">
+												<xslt:copy-of select="."/>
+											</xslt:when>
+											<xslt:otherwise>
+												<xslt:call-template name="书社:wrap">
+													<xslt:with-param name="nodes" select="."/>
+												</xslt:call-template>
+											</xslt:otherwise>
+										</xslt:choose>
+									</xslt:for-each>
+								</xslt:variable>
+								<xslt:apply-templates select="exsl:node-set($wrapped-component-fragment)/node()" mode="书社:apply"/>
 							</xslt:when>
-							<xslt:when test="../ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)] and local-name()='archived-as' and namespace-uri()='&书社;'"/>
 							<xslt:otherwise>
-								<xslt:apply-templates select="." mode="书社:application"/>
+								<xslt:apply-templates select="." mode="书社:apply"/>
 							</xslt:otherwise>
 						</xslt:choose>
 					</xslt:for-each>
 				</xslt:copy>
 			</xslt:template>
-			<xslt:template match="书社:apply-attributes" mode="书社:application" priority="1">
+			<xslt:template match="书社:apply-attributes" mode="书社:apply" priority="1">
 				<xslt:variable name="children">
-					<xslt:apply-templates select="node()" mode="书社:application"/>
+					<xslt:apply-templates mode="书社:apply"/>
 				</xslt:variable>
 				<xslt:call-template name="书社:apply-attributes">
 					<xslt:with-param name="context-nodes" select="."/>
 					<xslt:with-param name="destination-nodes" select="exsl:node-set($children)/node()"/>
 				</xslt:call-template>
 			</xslt:template>
-			<xslt:template match="书社:apply-attributes-to-root" mode="书社:application" priority="1">
-				<xslt:apply-templates select="node()" mode="书社:application"/>
+			<xslt:template match="书社:apply-attributes-to-root" mode="书社:apply" priority="1">
+				<xslt:apply-templates mode="书社:apply"/>
+			</xslt:template>
+			<xslt:template match="@*|node()" mode="书社:apply" priority="-1">
+				<xslt:copy>
+					<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="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:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
+										</xslt:when>
+										<xslt:otherwise>
+											<xslt:copy-of select="@*|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:attribute name="书社:identifier">
-						<xslt:value-of select="$IDENTIFIER"/>
-					</xslt:attribute>
+					<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:text>
-									<text>&书社;:document</text>
-								</xslt:text>
-								<xslt:for-each select="exslstr:tokenize(@itemtype)/token">
-									<xslt:text>
-										<text> </text>
-									</xslt:text>
+								<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'))]|node()" mode="书社:expand"/>
+							<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="@*|node()" mode="书社:expand"/>
+							<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="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
-				<xslt:variable name="identifier" select="string(@xlink:href)"/>
-				<xslt:variable name="uri" select="substring-before(document($CATALOG)//catalog:uri[@name=$identifier]/@uri[1], '#')"/>
-				<xslt:choose>
-					<xslt:when test="$uri">
-						<xslt:variable name="expanded">
-							<xslt:apply-templates select="document($uri)" mode="书社:expand"/>
-						</xslt:variable>
-						<xslt:for-each select="exsl:node-set($expanded)/node()">
-							<xslt:copy>
-								<xslt:attribute name="书社:identifier">
-									<xslt:value-of select="$identifier"/>
-								</xslt:attribute>
-								<xslt:choose>
-									<xslt:when test="self::html:*">
-										<xslt:attribute name="itemscope">itemscope</xslt:attribute>
-										<xslt:attribute name="itemtype">
-											<xslt:text>
-												<text>&书社;:embed</text>
-											</xslt:text>
-											<xslt:for-each select="exslstr:tokenize(@itemtype)/token[string()!='&书社;:document']">
-												<xslt:text>
-													<text> </text>
-												</xslt:text>
-												<xslt:value-of select="."/>
-											</xslt:for-each>
-										</xslt:attribute>
-										<xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype')) and not(namespace-uri()='&书社;' and local-name()='identifier')]|node()"/>
-									</xslt:when>
-									<xslt:otherwise>
-										<xslt:apply-templates select="@*[not(namespace-uri()='&书社;' and local-name()='identifier')]|node()" mode="书社:expand"/>
-									</xslt:otherwise>
-								</xslt:choose>
-							</xslt:copy>
-						</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()[not(self::书社:link) or not(@xlink:show='embed')]" mode="书社:expand" priority="-1">
+			<xslt:template match="@*|node()" mode="书社:expand" priority="-1">
 				<xslt:copy>
 					<xslt:apply-templates select="@*|node()" mode="书社:expand"/>
 				</xslt:copy>
@@ -389,7 +492,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<xslt:template match="text()" mode="书社:header"/>
 			<xslt:template match="text()" mode="书社:footer"/>
 			<xslt:template match="text()" mode="书社:metadata"/>
-			<xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea 书社:raw-text"/>
+			<xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea 书社:raw-output 书社:raw-text"/>
 		</xslt:transform>
 	</template>
 	<output method="xml" encoding="UTF-8"/>