html-chunker has changed into an XProc step

Also remove an old comment: html-chunker corrects links (was fixed in commit 4401d28)
daisy · Oct 1, 2018 · 7e83d5c · 7e83d5c
1 parent 118d7f1
commit 7e83d5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -128,7 +128,7 @@
       <dependency>
         <groupId>org.daisy.pipeline.modules.braille</groupId>
         <artifactId>zedai-to-pef</artifactId>
-        <version>3.3.4</version>
+        <version>3.3.5-SNAPSHOT</version>
       </dependency>
       <!--
           Third-Party Libraries

diff --git a/zedai-to-epub3/src/main/resources/xml/xproc/zedai-to-epub3.convert.xpl b/zedai-to-epub3/src/main/resources/xml/xproc/zedai-to-epub3.convert.xpl
@@ -26,6 +26,7 @@
     <p:option name="output-dir" required="true"/>
     <p:option name="audio" required="false" select="'false'"/>
 
+    <p:import href="http://www.daisy.org/pipeline/modules/html-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/epub3-nav-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/epub3-ocf-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/epub3-pub-utils/library.xpl"/>
@@ -177,24 +178,12 @@
                 <p:empty/>
             </p:input>
         </p:xslt>
-        <p:xslt name="zedai-to-html.html-chunks">
-            <!--TODO fix links while chunking (see links-to-chunks) -->
-            <p:input port="stylesheet">
-                <p:document href="http://www.daisy.org/pipeline/modules/html-utils/html-chunker.xsl"/>
-            </p:input>
-            <p:input port="parameters">
-                <p:empty/>
-            </p:input>
-        </p:xslt>
-        <p:sink/>
+        <px:html-chunker name="zedai-to-html.html-chunks"/>
         <p:for-each name="zedai-to-html.iterate">
             <p:output port="fileset" primary="true"/>
             <p:output port="html-files" sequence="true">
                 <p:pipe port="result" step="zedai-to-html.iterate.html"/>
             </p:output>
-            <p:iteration-source>
-                <p:pipe port="secondary" step="zedai-to-html.html-chunks"/>
-            </p:iteration-source>
             <p:variable name="result-uri" select="base-uri(/*)"/>
             <p:identity name="zedai-to-html.iterate.html"/>
             <px:fileset-create>

diff --git a/zedai-to-html/src/main/resources/xml/xproc/zedai-to-html.convert.xpl b/zedai-to-html/src/main/resources/xml/xproc/zedai-to-html.convert.xpl
@@ -22,6 +22,7 @@
 
     <p:import href="http://www.daisy.org/pipeline/modules/fileset-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/common-utils/library.xpl"/>
+    <p:import href="http://www.daisy.org/pipeline/modules/html-utils/library.xpl"/>
 
     <!--=========================================================================-->
     <!-- GET ZEDAI FROM FILESET                                                  -->
@@ -138,18 +139,8 @@
         </p:add-attribute>
         <p:choose>
             <p:when test="$chunk='true'">
-                <p:output port="result" sequence="true">
-                    <p:pipe port="secondary" step="html-chunks"/>
-                </p:output>
-                <p:xslt name="html-chunks">
-                    <p:input port="stylesheet">
-                        <p:document href="http://www.daisy.org/pipeline/modules/html-utils/html-chunker.xsl"/>
-                    </p:input>
-                    <p:input port="parameters">
-                        <p:empty/>
-                    </p:input>
-                </p:xslt>
-                <p:sink/>
+                <p:output port="result" sequence="true"/>
+                <px:html-chunker/>
             </p:when>
             <p:otherwise>
                 <p:output port="result" sequence="true"/>