Wrap EXTRAFINDRULES in parentheses

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index c91b0114a4db5e31c684d648f2bb3d68abbef38d..67ddb882cb1526ea98a76922eec3babb6074ef55 100644 (file)
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -1,14 +1,19 @@
 <?xml version="1.0"?>
 <!--
 <?xml version="1.0"?>
 <!--

+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 [@ Lady’s 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/>.
 -->
 <!DOCTYPE transform [
        <!ENTITY 书社 "urn:fdc:ladys.computer:20231231:Shu1She4">
 
 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/>.
 -->
 <!DOCTYPE transform [
        <!ENTITY 书社 "urn:fdc:ladys.computer:20231231:Shu1She4">

+       <!ENTITY xml "http://www.w3.org/XML/1998/namespace">

 ]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
 ]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"


@@ -16,6 +21,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"
        xmlns:catalog="urn:oasis:names:tc:entity:xmlns:xml:catalog"
        xmlns:exsl="http://exslt.org/common"
        xmlns:exslstr="http://exslt.org/strings"

+       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:xlink="http://www.w3.org/1999/xlink"
        xmlns:xslt="http://www.w3.org/1999/XSL/TransformAlias"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"


@@ -23,16 +29,34 @@ 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="/">
 >
        <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:transform exclude-result-prefixes="catalog" 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="书社:expansion">

-                               <xslt:apply-templates select="/" mode="书社:expand"/>
+                               <xslt:apply-templates select="$书社:source/node()" mode="书社:expand"/>

                        </xslt:variable>
                        <xslt:variable name="书社:result">
                        </xslt:variable>
                        <xslt:variable name="书社:result">

-                               <xslt:apply-templates select="exsl:node-set($书社:expansion)/*"/>
+                               <xslt:apply-templates select="exsl:node-set($书社:expansion)/node()"/>
+                       </xslt:variable>
+                       <xslt:variable name="书社:destination">
+                               <xslt:choose>
+                                       <xslt:when test="string($书社:source/@书社:destination)!=''">
+                                               <xslt:value-of select="$书社:source/@书社:destination"/>
+                                       </xslt:when>
+                                       <xslt:when test="starts-with($PATH, '/')">
+                                               <xslt:value-of select="substring-after($PATH, '/')"/>
+                                       </xslt:when>
+                                       <xslt:otherwise>
+                                               <xslt:value-of select="$PATH"/>
+                                       </xslt:otherwise>
+                               </xslt:choose>

                        </xslt:variable>
                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">
                        </xslt:variable>
                        <for-each select="//catalog:uri">
                                <xslt:include href="{@uri}">


@@ -43,57 +67,330 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                        </if>
                                </xslt:include>
                        </for-each>
                                        </if>
                                </xslt:include>
                        </for-each>

-                       <xslt:template match="/" priority="1">
-                               <xslt:choose>
-                                       <xslt:when test="exsl:node-set($书社:result)/*[@书社:disable-output-wrapping]">
-                                               <xslt:for-each select="exsl:node-set($书社:result)/*">
+                       <xslt:template name="书社:apply-attributes">
+                               <xslt:param name="and-version" select="false()"/>
+                               <xslt:param name="context-nodes" select="/.."/>
+                               <xslt:param name="destination-nodes" select="/.."/>
+                               <xslt:variable name="additional-attributes" select="$context-nodes/@*"/>
+                               <xslt:for-each select="$destination-nodes">
+                                       <xslt:variable name="existing-attributes" select="@*"/>
+                                       <xslt:choose>
+                                               <xslt:when test="self::*">
+                                                       <xslt:variable name="context" select="."/>
+                                                       <xslt:variable name="attribute-names">
+                                                               <xslt:for-each select="$existing-attributes|$additional-attributes">
+                                                                       <书社:attribute>
+                                                                               <attribute name="local-name">
+                                                                                       <text>{local-name()}</text>
+                                                                               </attribute>
+                                                                               <attribute name="name">
+                                                                                       <text>{name()}</text>
+                                                                               </attribute>
+                                                                               <attribute name="namespace-uri">
+                                                                                       <text>{namespace-uri()}</text>
+                                                                               </attribute>
+                                                                       </书社:attribute>
+                                                               </xslt:for-each>
+                                                       </xslt:variable>
+                                                       <xslt:variable name="lang">
+                                                               <xslt:choose>
+                                                                       <xslt:when test="(self::html:*|self::svg:*)/@lang">
+                                                                               <xslt:value-of select="@lang"/>
+                                                                       </xslt:when>
+                                                                       <xslt:when test="@xml:lang">
+                                                                               <xslt:value-of select="@xml:lang"/>
+                                                                       </xslt:when>
+                                                                       <xslt:when test="$additional-attributes[(parent::html:* or parent::svg:*) and namespace-uri()='' and local-name()='lang']">
+                                                                               <xslt:value-of select="$additional-attributes[(parent::html:* or parent::svg:*) and namespace-uri()='' and local-name()='lang']"/>
+                                                                       </xslt:when>
+                                                                       <xslt:when test="(self::html:* or self::svg:*) and $additional-attributes[(parent::书社:apply-attributes or parent::书社:apply-attributes-to-root) and namespace-uri()='' and local-name()='lang']">
+                                                                               <xslt:value-of select="$additional-attributes[(parent::书社:apply-attributes or parent::书社:apply-attributes-to-root) and namespace-uri()='' and local-name()='lang']"/>
+                                                                       </xslt:when>
+                                                                       <xslt:when test="$additional-attributes[namespace-uri()='&xml;' and local-name()='lang']">
+                                                                               <xslt:value-of select="$additional-attributes[namespace-uri()='&xml;' and local-name()='lang']"/>
+                                                                       </xslt:when>
+                                                               </xslt:choose>
+                                                       </xslt:variable>

                                                        <xslt:copy>
                                                        <xslt:copy>

-                                                               <xslt:copy-of select="@*[not(namespace-uri()='&书社;' and local-name()='disable-output-wrapping')]|node()"/>
+                                                               <xslt:if test="$and-version and $THISREV">
+                                                                       <xslt:attribute name="书社:version">
+                                                                               <xslt:value-of select="$THISREV"/>
+                                                                       </xslt:attribute>
+                                                               </xslt:if>
+                                                               <xslt:if test="string($lang)!=''">
+                                                                       <xslt:if test="self::html:* or self::svg:*">
+                                                                               <xslt:attribute name="lang">
+                                                                                       <xslt:value-of select="$lang"/>
+                                                                               </xslt:attribute>
+                                                                       </xslt:if>
+                                                                       <xslt:attribute name="xml:lang">
+                                                                               <xslt:value-of select="$lang"/>
+                                                                       </xslt:attribute>
+                                                               </xslt:if>
+                                                               <xslt:for-each select="exsl:node-set($attribute-names)/*">
+                                                                       <xslt:choose>
+                                                                               <xslt:when test="@namespace-uri='&xml;'"/>
+                                                                               <xslt:when test="$context[self::html:* or self::svg:*] and @namespace-uri='' and @local-name='lang'"/>
+                                                                               <xslt:when test="@namespace-uri='&书社;' and @local-name='archived-as' and not($context-nodes/ancestor::*[not(self::书社:apply-attributes-to-root or self::书社:apply-attributes)][1][self::书社:archive])"/>
+                                                                               <xslt:when test="@namespace-uri='&书社;' and (@local-name='destination' or @local-name='disable-output-wrapping' or @local-name='version')"/>
+                                                                               <xslt:when test="preceding-sibling::*[@local-name=current()/@local-name and @namespace-uri=current()/@namespace-uri]"/>
+                                                                               <xslt:otherwise>
+                                                                                       <xslt:attribute>
+                                                                                               <attribute name="name">
+                                                                                                       <text>{@name}</text>
+                                                                                               </attribute>
+                                                                                               <attribute name="namespace">
+                                                                                                       <text>{@namespace-uri}</text>
+                                                                                               </attribute>
+                                                                                               <xslt:for-each select="$existing-attributes[local-name()=current()/@local-name and namespace-uri()=current()/@namespace-uri]">
+                                                                                                       <xslt:value-of select="."/>
+                                                                                                       <xslt:if test="position()!=last()">
+                                                                                                               <xslt:text>
+                                                                                                                       <text> </text>
+                                                                                                               </xslt:text>
+                                                                                                       </xslt:if>
+                                                                                               </xslt:for-each>
+                                                                                               <xslt:if test="$existing-attributes[local-name()=current()/@local-name and namespace-uri()=current()/@namespace-uri] and $additional-attributes[local-name()=current()/@local-name and namespace-uri()=current()/@namespace-uri]">
+                                                                                                       <xslt:text>
+                                                                                                               <text> </text>
+                                                                                                       </xslt:text>
+                                                                                               </xslt:if>
+                                                                                               <xslt:for-each select="$additional-attributes[local-name()=current()/@local-name and namespace-uri()=current()/@namespace-uri]">
+                                                                                                       <xslt:value-of select="."/>
+                                                                                                       <xslt:if test="position()!=last()">
+                                                                                                               <xslt:text>
+                                                                                                                       <text> </text>
+                                                                                                               </xslt:text>
+                                                                                                       </xslt:if>
+                                                                                               </xslt:for-each>
+                                                                                       </xslt:attribute>
+                                                                               </xslt:otherwise>
+                                                                       </xslt:choose>
+                                                               </xslt:for-each>
+                                                               <xslt:copy-of select="node()"/>

                                                        </xslt:copy>
                                                        </xslt:copy>

-                                               </xslt:for-each>
-                                       </xslt:when>
-                                       <xslt:otherwise>
-                                               <xslt:apply-templates select="exsl:node-set($书社:result)" mode="书社:wrap"/>
-                                       </xslt:otherwise>
-                               </xslt:choose>
+                                               </xslt:when>
+                                               <xslt:otherwise>
+                                                       <xslt:copy-of select="."/>
+                                               </xslt:otherwise>
+                                       </xslt:choose>
+                               </xslt:for-each>
+                       </xslt:template>
+                       <xslt:template name="书社:wrap">
+                               <xslt:param name="nodes" select="/.."/>
+                               <xslt:variable name="modalinput">
+                                       <xslt:copy-of select="$nodes"/>
+                                       <xslt:copy-of select="document('')/xslt:transform/xslt:include"/>
+                               </xslt:variable>
+                               <xslt:variable name="metadata">
+                                       <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:variable>
+                               <html:html>
+                                       <xslt:copy-of select="$nodes[self::html:html]/@*"/>
+                                       <xslt:if test="not($nodes[self::html:html]/@书社:archived-as) and $nodes/@书社:archived-as">
+                                               <xslt:attribute name="书社:archived-as">
+                                                       <xslt:value-of select="$nodes/@书社:archived-as"/>
+                                               </xslt:attribute>
+                                       </xslt:if>
+                                       <xslt:if test="not($nodes[self::html:html]/@lang) and $nodes[self::html:*]/@lang|$nodes[self::svg:*]/@lang|$nodes/@xml:lang">
+                                               <xslt:attribute name="lang">
+                                                       <xslt:value-of select="$nodes[self::html:*]/@lang|$nodes[self::svg:*]/@lang|$nodes/@xml:lang"/>
+                                               </xslt:attribute>
+                                       </xslt:if>
+                                       <xslt:if test="not($nodes[self::html:html]/@xml:lang) and $nodes[self::html:*]/@lang|$nodes[self::svg:*]/@lang|$nodes/@xml:lang">
+                                               <xslt:attribute name="xml:lang">
+                                                       <xslt:value-of select="$nodes[self::html:*]/@lang|$nodes[self::svg:*]/@lang|$nodes/@xml:lang"/>
+                                               </xslt:attribute>
+                                       </xslt:if>
+                                       <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:value-of select="."/>
+                                                               <xslt:if test="position()!=last()">
+                                                                       <xslt:text>
+                                                                               <text> </text>
+                                                                       </xslt:text>
+                                                               </xslt:if>
+                                                       </xslt:for-each>
+                                               </html:title>
+                                               <xslt:copy-of select="exsl:node-set($metadata)/node()[not(self::html:title)]"/>
+                                               <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>
+                                                                               <text>, </text>
+                                                                       </xslt:text>
+                                                               </xslt:for-each>
+                                                               <xslt:text>
+                                                                       <text>⛩️📰 书社</text>
+                                                               </xslt:text>
+                                                               <xslt:if test="$THISREV">
+                                                                       <xslt:text>
+                                                                               <text> (</text>
+                                                                       </xslt:text>
+                                                                       <xslt:value-of select="$THISREV"/>
+                                                                       <xslt:text>
+                                                                               <text>)</text>
+                                                                       </xslt:text>
+                                                               </xslt:if>
+                                                       </xslt:attribute>
+                                               </html:meta>
+                                       </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: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"/>
+                                       </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="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: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="destination-nodes" select="$result-nodes"/>
+                                                       </xslt:call-template>
+                                               </xslt:when>
+                                               <xslt:otherwise>
+                                                       <xslt:variable name="wrapped-result">
+                                                               <xslt:call-template name="书社:wrap">
+                                                                       <xslt:with-param name="nodes" select="$result-nodes"/>
+                                                               </xslt:call-template>
+                                                       </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="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:template>
                        </xslt:template>

-                       <xslt:template match="/*/*//@书社:disable-output-wrapping" priority="0"/>

                        <xslt:template match="@*|node()" priority="-1">
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()"/>
                                </xslt:copy>
                        </xslt:template>
                        <xslt:template match="@*|node()" priority="-1">
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()"/>
                                </xslt:copy>
                        </xslt:template>

-                       <xslt:template match="/*" mode="书社:expand" priority="0">
+                       <xslt:template match="@*|node()" mode="书社:application">

                                <xslt:copy>
                                <xslt:copy>

-                                       <xslt:attribute name="itemscope">itemscope</xslt:attribute>
-                                       <xslt:attribute name="itemtype">
-                                               <xslt:text>&书社;:document</xslt:text>
-                                               <xslt:for-each select="exslstr:tokenize(@itemtype)/token">
-                                                       <xslt:text> </xslt:text>
-                                                       <xslt:value-of select="."/>
-                                               </xslt:for-each>
+                                       <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" priority="1">
+                               <xslt:copy>
+                                       <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="书社:application"/>
+                                                       </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>
+                                                               <xslt:apply-templates select="exsl:node-set($component)/node()" mode="书社:application"/>
+                                                       </xslt:when>
+                                                       <xslt:otherwise>
+                                                               <xslt:apply-templates select="." mode="书社:application"/>
+                                                       </xslt:otherwise>
+                                               </xslt:choose>
+                                       </xslt:for-each>
+                               </xslt:copy>
+                       </xslt:template>
+                       <xslt:template match="书社:apply-attributes" mode="书社:application" priority="1">
+                               <xslt:variable name="children">
+                                       <xslt:apply-templates mode="书社:application"/>
+                               </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 mode="书社:application"/>
+                       </xslt:template>
+                       <xslt:template match="/node()" mode="书社:expand" priority="0">
+                               <xslt:copy>
+                                       <xslt:attribute name="书社:identifier">
+                                               <xslt:value-of select="$IDENTIFIER"/>

                                        </xslt:attribute>
                                        </xslt:attribute>

-                                       <xslt:apply-templates select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()" mode="书社:expand"/>
+                                       <xslt:choose>
+                                               <xslt:when test="self::html:*">
+                                                       <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:value-of select="."/>
+                                                               </xslt:for-each>
+                                                       </xslt:attribute>
+                                                       <xslt:apply-templates select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()" mode="书社:expand"/>
+                                               </xslt:when>
+                                               <xslt:otherwise>
+                                                       <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
+                                               </xslt:otherwise>
+                                       </xslt:choose>

                                </xslt:copy>
                        </xslt:template>
                        <xslt:template match="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
                                </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="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: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)/*">
+                                               <xslt:for-each select="exsl:node-set($expanded)/node()">

                                                        <xslt:copy>
                                                        <xslt:copy>

-                                                               <xslt:attribute name="itemscope">itemscope</xslt:attribute>
-                                                               <xslt:attribute name="itemtype">
-                                                                       <xslt:text>&书社;:embed</xslt:text>
-                                                                       <xslt:for-each select="exslstr:tokenize(@itemtype)/token[string()!='&书社;:document']">
-                                                                               <xslt:text> </xslt:text>
-                                                                               <xslt:value-of select="."/>
-                                                                       </xslt:for-each>
+                                                               <xslt:attribute name="书社:identifier">
+                                                                       <xslt:value-of select="$identifier"/>

                                                                </xslt:attribute>
                                                                </xslt:attribute>

-                                                               <xslt:copy-of select="@*[not(namespace-uri()='' and (local-name()='itemscope' or local-name()='itemtype'))]|node()"/>
+                                                               <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:copy>
                                                </xslt:for-each>
                                        </xslt:when>


@@ -104,7 +401,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:otherwise>
                                </xslt:choose>
                        </xslt:template>

-                       <xslt:template match="@*|text()|*[not(self::书社:link) or not(@xlink:show='embed')]" mode="书社:expand" priority="-1">
+                       <xslt:template match="@*|node()[not(self::书社:link) or not(@xlink:show='embed')]" mode="书社:expand" priority="-1">

                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
                                </xslt:copy>
                                <xslt:copy>
                                        <xslt:apply-templates select="@*|node()" mode="书社:expand"/>
                                </xslt:copy>


@@ -112,36 +409,8 @@ 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:template match="text()" mode="书社:header"/>
                        <xslt:template match="text()" mode="书社:footer"/>
                        <xslt:template match="text()" mode="书社:metadata"/>

-                       <xslt:template match="/" mode="书社:wrap">
-                               <xslt:variable name="metadata">
-                                       <xslt:copy-of select="html/head/*"/>
-                                       <xslt:apply-templates select="." mode="书社:metadata"/>
-                                       <xslt:apply-templates select="document('')/xslt:transform/xslt:include" mode="书社:metadata"/>
-                               </xslt:variable>
-                               <html:html>
-                                       <xslt:copy-of select="html:html/@*"/>
-                                       <html:head>
-                                               <xslt:copy-of select="html:html/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:if test="not(exsl:node-set($metadata)/html:meta[@name='generator'])">
-                                                       <html:meta name="generator" content="⛩️📰 书社"/>
-                                               </xslt:if>
-                                       </html:head>
-                                       <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"/>
-                                       </html:body>
-                               </html:html>
-                       </xslt:template>
-                       <xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea"/>
+                       <xslt:output method="xml" encoding="UTF-8" cdata-section-elements="html:script html:style html:textarea 书社:raw-output 书社:raw-text"/>

                </xslt:transform>
        </template>
                </xslt:transform>
        </template>

+       <output method="xml" encoding="UTF-8"/>

 </transform>
 </transform>