X-Git-Url: https://git.ladys.computer/Shushe/blobdiff_plain/f509d1fdfdce6dd392e17048b08b0b84954fb946..3906b3ed495704281e4abf387ffbafe5ef0e2087:/lib/catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index d575a72..7e503be 100644
--- a/lib/catalog2transform.xslt
+++ b/lib/catalog2transform.xslt
@@ -344,25 +344,12 @@ 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="书社: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:choose>
 					<xslt:when test="$included">
-						<xslt:variable name="uri">
-							<xslt:text>
-								<value-of select="$builddir"/>
-							</xslt:text>
-							<xslt:choose>
-								<xslt:when test="$included/self::书社vocab:SourceFile">
-									<xslt:text>/sources/</xslt:text>
-								</xslt:when>
-								<xslt:when test="$included/self::书社vocab:IncludeFile">
-									<xslt:text>/includes/</xslt:text>
-								</xslt:when>
-							</xslt:choose>
-							<xslt:value-of select="$included/@书社vocab:path"/>
-						</xslt:variable>
+						<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"/>
@@ -436,7 +423,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>