Do asset transforms during application

[Shushe] / lib / catalog2transform.xslt

diff --git a/lib/catalog2transform.xslt b/lib/catalog2transform.xslt
index e169fa7495a63c64340845b06a51594f1d99a71a..1cc6bad4aacc22fddc33ac797ba32fd910664d76 100644 (file)
--- 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,25 +340,17 @@ 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: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"/>
@@ -437,7 +424,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>