Don’t use literal result elements in transforms

[Shushe] / transforms / asset.xslt

diff --git a/transforms/asset.xslt b/transforms/asset.xslt
index 8ed07c4c56068ff5c3bd5b7619a1be85045e0d13..89f1475598f78bf318947bd031cc53c2ecbaafb8 100644 (file)
--- a/transforms/asset.xslt
+++ b/transforms/asset.xslt
@@ -11,43 +11,73 @@ SPDX-License-Identifier: MPL-2.0
 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 wrapped "ancestor::html:html[not(parent::* or @书社:disable-output-wrapping)]">
+       <!ENTITY xhtml "http://www.w3.org/1999/xhtml">
+]>
 <transform
        xmlns="http://www.w3.org/1999/XSL/Transform"
        xmlns:exsl="http://exslt.org/common"
-       xmlns:html="http://www.w3.org/1999/xhtml"
+       xmlns:html="&xhtml;"
        xmlns:书社="urn:fdc:ladys.computer:20231231:Shu1She4"
        extension-element-prefixes="exsl"
        version="1.0"
 >
        <书社:id>urn:fdc:ladys.computer:20231231:Shu1She4:asset.xslt</书社:id>
-       <template match="html:style|html:object[@type='text/css']"/>
-       <template match="html:object[@type='text/javascript']">
-               <html:script type="{@type}" src="{@data}">
+       <template match="html:style[&wrapped; and not(ancestor::html:head)]|html:object[@type='text/css' and &wrapped;]" mode="书社:finalize" priority="0"/>
+       <template match="html:object[@type='text/javascript']" mode="书社:finalize" priority="0">
+               <element name="script" namespace="&xhtml;">
+                       <attribute name="type">
+                               <value-of select="@type"/>
+                       </attribute>
+                       <attribute name="src">
+                               <value-of select="@data"/>
+                       </attribute>
                        <copy-of select="@书社:identifier"/>
-               </html:script>
+               </element>
        </template>
-       <template match="html:object[starts-with(@type, 'audio/')]">
-               <html:audio controls="" src="{@data}">
+       <template match="html:object[starts-with(@type, 'audio/')]" mode="书社:finalize" priority="0">
+               <element name="audio" namespace="&xhtml;">
+                       <attribute name="controls"/>
+                       <attribute name="src">
+                               <value-of select="@data"/>
+                       </attribute>
                        <copy-of select="@书社:identifier"/>
-               </html:audio>
+               </element>
        </template>
-       <template match="html:object[starts-with(@type, 'image/') and not(@type='image/svg+xml')]">
-               <html:img src="{@data}">
-                       <copy-of select="@书社:identifier"/>
-               </html:img>
+       <template match="html:object[starts-with(@type, 'image/') and not(@type='image/svg+xml')]" mode="书社:finalize" priority="0">
+               <element name="img" namespace="&xhtml;">
+                       <attribute name="src">
+                               <value-of select="@data"/>
+                       </attribute>
+                       <copy-of select="@书社:identifier|@width|@height"/>
+               </element>
        </template>
-       <template match="html:object[starts-with(@type, 'video/')]">
-               <html:video controls="" src="{@data}">
-                       <copy-of select="@书社:identifier"/>
-               </html:video>
+       <template match="html:object[starts-with(@type, 'video/')]" mode="书社:finalize" priority="0">
+               <element name="video" namespace="&xhtml;">
+                       <attribute name="controls"/>
+                       <attribute name="src">
+                               <value-of select="@data"/>
+                       </attribute>
+                       <copy-of select="@书社:identifier|@width|@height"/>
+               </element>
        </template>
        <template match="书社:id[string(.)='urn:fdc:ladys.computer:20231231:Shu1She4:asset.xslt']" mode="书社:metadata">
                <for-each select="$书社:expansion//html:object[@type='text/css']">
-                       <html:link rel="stylesheet" type="text/css" href="{@data}">
+                       <element name="link" namespace="&xhtml;">
+                               <attribute name="rel">
+                                       <text>stylesheet</text>
+                               </attribute>
+                               <attribute name="type">
+                                       <text>text/css</text>
+                               </attribute>
+                               <attribute name="href">
+                                       <value-of select="@data"/>
+                               </attribute>
                                <copy-of select="@书社:identifier"/>
-                       </html:link>
+                       </element>
                </for-each>
-               <for-each select="$书社:expansion//html:style">
+               <for-each select="$书社:expansion//html:style[not(ancestor::html:head)]">
                        <copy-of select="."/>
                </for-each>
        </template>