Merged in feature/PIP-60-bestanden-met-dtbook110dtd-worden (pull requ…

…est #20) Feature/PIP-60 bestanden met dtbook110dtd worden Approved-by: Paul Rambags <[email protected]>
snaekobbi · Mar 20, 2018 · 43fea3c · 43fea3c
2 parents d471422 + 64fbc1a
commit 43fea3c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 3,920 deletions.
diff --git a/src/main/resources/META-INF/catalog.xml b/src/main/resources/META-INF/catalog.xml
@@ -5,6 +5,7 @@
   <uri name="http://www.dedicon.nl/pipeline/modules/braille/library.xpl" uri="../xml/xproc/library.xpl"/>
   <uri name="http://www.dedicon.nl/pipeline/modules/braille/default.scss" uri="../css/dedicon-default.scss"/>
   <uri name="http://www.dedicon.nl/pipeline/modules/braille/symbols_code.xml" uri="../xml/symbols_code2009.xml"/>
+  <uri name="http://www.dedicon.nl/pipeline/modules/braille/dtbook110.dtd" uri="../dtd/dtbook110.dtd"/>
   <nextCatalog catalog="org:daisy:pipeline:modules:braille:css-utils"/>
   <nextCatalog catalog="org:daisy:pipeline:modules:braille:liblouis-utils"/>
   <nextCatalog catalog="org:daisy:pipeline:modules:braille:liblouis-tables"/>

diff --git a/src/main/resources/css/dedicon-default.scss b/src/main/resources/css/dedicon-default.scss
@@ -33,10 +33,10 @@
 /* level1 {
 	-obfl-keep-with-previous-sheets: 2;
 	-obfl-keep-with-next-sheets: 2;
-}
+} */
 p {
 	volume-break-inside: -obfl-keep(1);
-} */
+}
 
 /* --------------------------------------------------------------------------------
  * Page layout

diff --git a/src/main/resources/xml/xproc/dtbook-to-pef.xpl b/src/main/resources/xml/xproc/dtbook-to-pef.xpl
@@ -197,7 +197,7 @@
     <p:option name="temp-dir" select="''"/>
 
     <p:import href="http://www.daisy.org/pipeline/modules/braille/dtbook-to-pef/library.xpl"/>
-    <p:import href="http://www.daisy.org/pipeline/modules/braille/xml-to-pef/library.xpl"/>
+    <p:import href="http://www.daisy.org/pipeline/modules/braille/common-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/braille/pef-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/file-utils/library.xpl"/>
     <p:import href="http://www.daisy.org/pipeline/modules/common-utils/library.xpl"/>
@@ -288,7 +288,7 @@
             <dedicon:remove-print-toc/>
         </p:when>
         <p:otherwise>
-            <p:identity/>
+            <dedicon:message severity="TRACE" message="Keeping print TOC"/>
         </p:otherwise>
     </p:choose>
     <dedicon:message message="Applying fix for backslashes in attribute src"/>

diff --git a/src/test/resources/pef/volumes-test-1.pef b/src/test/resources/pef/volumes-test-1.pef
@@ -4,7 +4,7 @@
       <meta xmlns:dc="http://purl.org/dc/elements/1.1/">
          <dc:format>application/x-pef+xml</dc:format>
          <dc:identifier>identifier?</dc:identifier>
-         <dc:date>2017-09-25</dc:date>
+         <dc:date>2018-03-20</dc:date>
          <dc:title>Maximum number of sheets 1</dc:title>
          <dc:language>nl</dc:language>
       </meta>
@@ -38,7 +38,6 @@
                <row>⠃⠇⠁⠃⠇⠁</row>
                <row>⠃⠇⠁⠃⠇⠁</row>
                <row>⠃⠇⠁⠃⠇⠁</row>
-               <row>⠃⠇⠁⠃⠇⠁</row>
             </page>
          </section>
       </volume>
@@ -65,6 +64,9 @@
                <row>⠃⠇⠁⠃⠇⠁</row>
                <row>⠃⠇⠁⠃⠇⠁</row>
             </page>
+            <page>
+               <row>⠃⠇⠁⠃⠇⠁</row>
+            </page>
          </section>
       </volume>
    </body>

diff --git a/src/test/resources/pef/volumes-test-2.pef b/src/test/resources/pef/volumes-test-2.pef
@@ -4,7 +4,7 @@
       <meta xmlns:dc="http://purl.org/dc/elements/1.1/">
          <dc:format>application/x-pef+xml</dc:format>
          <dc:identifier>identifier?</dc:identifier>
-         <dc:date>2017-10-20</dc:date>
+         <dc:date>2018-03-20</dc:date>
       </meta>
    </head>
    <body>
@@ -38,10 +38,6 @@
                <row>⠁⠁⠁⠁⠁</row>
                <row>⠃⠃⠃⠃⠃⠤</row>
             </page>
-         </section>
-      </volume>
-      <volume cols="8" rows="5" rowgap="0" duplex="true">
-         <section>
             <page>
                <row>⠃⠃⠃⠃⠃</row>
                <row>⠁⠁⠁⠁⠁</row>
@@ -53,6 +49,10 @@
                <row>⠁⠁⠁⠁⠁</row>
                <row>⠃⠃⠃⠃⠃⠤</row>
             </page>
+         </section>
+      </volume>
+      <volume cols="8" rows="5" rowgap="0" duplex="true">
+         <section>
             <page>
                <row>⠃⠃⠃⠃⠃</row>
                <row>⠁⠁⠁⠁⠁</row>

diff --git a/src/test/resources/xml/313542.xml b/src/test/resources/xml/313542.xml
diff --git a/src/test/resources/xml/volumes-test-2.xml b/src/test/resources/xml/volumes-test-2.xml
@@ -20,6 +20,9 @@ level1 {
 level1, h1, p {
 	display: block;
 }
+p {
+	volume-break-inside: -obfl-keep(1);
+}
 
 docauthor {
 	display: none;

diff --git a/src/test/xprocspec/test_css_translator.xprocspec b/src/test/xprocspec/test_css_translator.xprocspec
@@ -39,8 +39,8 @@
     <x:expect label="result" type="compare" normalize-space="false">
       <x:document type="inline">
         <_ style="text-transform: none"><div xmlns="http://www.w3.org/1999/xhtml" style="{ display: block } @volume { @begin { counter-set: my-page; content: flow(title-page) flow(volume-toc); text-transform: auto } @end { counter-set: my-page; text-transform: auto } }">
-            <p style="display: block">⠨⠝⠕⠞   ⠏⠗⠑⠎⠑⠗⠧⠊⠝⠛   ⠺⠓⠊⠞⠑⠎⠏⠁⠉⠑</p>
-            <p xml:space="preserve" style="display: block; white-space: pre-wrap">⠨⠏⠗⠑⠎⠑⠗⠧⠊⠝⠛   ⠺⠓⠊⠞⠑⠎⠏⠁⠉⠑</p>
+            <p style="display: block; volume-break-inside: -obfl-keep(1)">⠨⠝⠕⠞   ⠏⠗⠑⠎⠑⠗⠧⠊⠝⠛   ⠺⠓⠊⠞⠑⠎⠏⠁⠉⠑</p>
+            <p xml:space="preserve" style="display: block; volume-break-inside: -obfl-keep(1); white-space: pre-wrap">⠨⠏⠗⠑⠎⠑⠗⠧⠊⠝⠛   ⠺⠓⠊⠞⠑⠎⠏⠁⠉⠑</p>
           </div></_>
       </x:document>
     </x:expect>