X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/f83690a5b2bbe2d1781f0c2381022da5587f0161..335a406ad5f1d3b28498ed47eca5863099875d5e:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index 6d721a7..88644aa 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -293,11 +293,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					<xslt:apply-templates select="@*|node()"/>
 				</xslt:copy>
 			</xslt:template>
-			<xslt:template match="@*|node()" mode="书社:apply">
-				<xslt:copy>
-					<xslt:apply-templates select="@*|node()" mode="书社:apply"/>
-				</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="书社:apply" priority="1"/>
 			<xslt:template match="书社:archive" mode="书社:apply" priority="1">
 				<xslt:copy>
@@ -345,40 +340,49 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 			<xslt:template match="书社:apply-attributes-to-root" mode="书社:apply" priority="1">
 				<xslt:apply-templates mode="书社:apply"/>
 			</xslt:template>
-			<xslt:template match="书社:link[@xlink:show='embed']" mode="书社:expand" priority="1">
+			<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="included" select="$书社:about//*[@rdf:about=$identifier]"/>
+				<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:variable name="uri" select="$included/书社vocab:hasParsedFile/@nfo:fileUrl"/>
-						<xslt:variable name="expanded">
-							<xslt:apply-templates select="document($uri)" mode="书社:expand">
-								<xslt:with-param name="identifier" select="$identifier"/>
-							</xslt:apply-templates>
-						</xslt:variable>
-						<xslt:for-each select="exsl:node-set($expanded)/node()">
-							<xslt:copy>
-								<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: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:attribute name="itemscope">itemscope</xslt:attribute>
+											<xslt:attribute name="itemtype">
 												<xslt:text>
-													<text> </text>
+													<text>&书社;:embed</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'))]|node()"/>
-									</xslt:when>
-									<xslt:otherwise>
-										<xslt:apply-templates select="@*|node()" mode="书社:expand"/>
-									</xslt:otherwise>
-								</xslt:choose>
-							</xslt:copy>
+												<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'))]|node()"/>
+										</xslt:when>
+										<xslt:otherwise>
+											<xslt:apply-templates select="@*|node()" mode="书社:expand"/>
+										</xslt:otherwise>
+									</xslt:choose>
+								</xslt:copy>
+							</xslt:for-each>
 						</xslt:for-each>
 					</xslt:when>
 					<xslt:otherwise>
@@ -424,7 +428,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
 					</xslt:choose>
 				</xslt:copy>
 			</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>