brailleapps#32: Parsing

PaulRambags · Aug 7, 2020 · da3bb59 · da3bb59
1 parent f4ae2e7
commit da3bb59
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 3 deletions.
diff --git a/integrationtest/org/daisy/dotify/formatter/test/SequenceBreakTest.java b/integrationtest/org/daisy/dotify/formatter/test/SequenceBreakTest.java
@@ -0,0 +1,30 @@
+package org.daisy.dotify.formatter.test;
+
+import org.daisy.dotify.api.engine.LayoutEngineException;
+import org.daisy.dotify.api.writer.PagedMediaWriterConfigurationException;
+import org.junit.Test;
+
+import java.io.IOException;
+
+/**
+ * Unit tests for sequence breaks.
+ * TODO: true -> false
+ * 
+ * @author Paul Rambags
+ */
+@SuppressWarnings("javadoc")
+public class SequenceBreakTest extends AbstractFormatterEngineTest {
+
+    @Test
+    public void testParsing() throws
+            LayoutEngineException,
+            IOException,
+            PagedMediaWriterConfigurationException {
+        testPEF(
+            "resource-files/sequence-break/parsing-input.obfl",
+            "resource-files/sequence-break/parsing-expected.pef",
+            true
+        );
+    }
+
+}
diff --git a/...ontest/org/daisy/dotify/formatter/test/resource-files/sequence-break/parsing-expected.pef b/...ontest/org/daisy/dotify/formatter/test/resource-files/sequence-break/parsing-expected.pef
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pef version="2008-1" xmlns="http://www.daisy.org/ns/2008/pef">
+    <head>
+        <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>2020-08-07</dc:date>
+            <dc:title>Parsing of sequence breaks test</dc:title>
+            <dc:description>Tests the parsing of sequence breaks</dc:description>
+        </meta>
+    </head>
+    <body>
+        <volume cols="10" rows="6" rowgap="0" duplex="false">
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+        </volume>
+        <volume cols="10" rows="6" rowgap="0" duplex="false">
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+            <section>
+                <page>
+                    <row>⠤⠤⠤</row>
+                </page>
+            </section>
+        </volume>
+    </body>
+</pef>
diff --git a/...tiontest/org/daisy/dotify/formatter/test/resource-files/sequence-break/parsing-input.obfl b/...tiontest/org/daisy/dotify/formatter/test/resource-files/sequence-break/parsing-input.obfl
@@ -0,0 +1,56 @@
+<obfl xmlns="http://www.daisy.org/ns/2011/obfl" version="2011-1" xml:lang="en">
+    <meta xmlns:dc="http://purl.org/dc/elements/1.1/">
+        <dc:title>Parsing of sequence breaks test</dc:title>
+        <dc:description>Tests the parsing of sequence breaks</dc:description>
+    </meta>
+    <layout-master name="main" page-width="10" page-height="6" duplex="false">
+        <default-template>
+            <header/>
+            <footer/>
+        </default-template>
+    </layout-master>
+    <table-of-contents name="toc">
+        <toc-block/>
+    </table-of-contents>
+    <volume-template sheets-in-volume-max="5" use-when="(= $volume 1)">
+        <pre-content>
+            <dynamic-sequence master="main" break-before="page" break-after="page">
+                <block>⠤⠤⠤</block>
+            </dynamic-sequence>
+            <sequence master="main" break-before="page" break-after="page">
+                <block>⠤⠤⠤</block>
+            </sequence>
+        </pre-content>
+        <post-content>
+            <toc-sequence toc="toc" range="document" master="main" break-before="page" break-after="page"/>
+        </post-content>
+    </volume-template>
+    <volume-template sheets-in-volume-max="5" use-when="(> $volume 1)">
+        <pre-content>
+            <dynamic-sequence master="main" break-before="sheet" break-after="sheet">
+                <block>⠤⠤⠤</block>
+            </dynamic-sequence>
+            <sequence master="main" break-before="sheet" break-after="sheet">
+                <block>⠤⠤⠤</block>
+            </sequence>
+        </pre-content>
+        <post-content>
+            <toc-sequence toc="toc" range="document" master="main" break-before="sheet" break-after="sheet"/>
+        </post-content>
+    </volume-template>
+    <sequence master="main">
+        <block>⠤⠤⠤</block>
+    </sequence>
+    <sequence master="main" break-before="auto" break-after="page">
+        <block>⠤⠤⠤</block>
+    </sequence>
+    <sequence master="main" break-before="page" break-after="sheet">
+        <block>⠤⠤⠤</block>
+    </sequence>
+    <sequence master="main" break-before="sheet" break-after="volume">
+        <block>⠤⠤⠤</block>
+    </sequence>
+    <sequence master="main" break-before="volume" break-after="auto">
+        <block>⠤⠤⠤</block>
+    </sequence>
+</obfl>
diff --git a/src/org/daisy/dotify/formatter/impl/VolumeProvider.java b/src/org/daisy/dotify/formatter/impl/VolumeProvider.java
@@ -1,6 +1,6 @@
 package org.daisy.dotify.formatter.impl;
 
-import org.daisy.dotify.api.formatter.SequenceProperties.SequenceBreakBefore;
+import org.daisy.dotify.api.formatter.SequenceProperties.SequenceBreak;
 import org.daisy.dotify.common.splitter.SplitPoint;
 import org.daisy.dotify.common.splitter.SplitPointCost;
 import org.daisy.dotify.common.splitter.SplitPointDataSource;
@@ -324,7 +324,7 @@ private Iterable<SheetDataSource> prepareToPaginateWithVolumeGroups(
         List<BlockSequence> currentGroup = new ArrayList<>();
         volGroups.add(currentGroup);
         for (BlockSequence bs : fs) {
-            if (bs.getSequenceProperties().getBreakBeforeType() == SequenceBreakBefore.VOLUME) {
+            if (bs.getSequenceProperties().getBreakBeforeType() == SequenceBreak.VOLUME) {
                 currentGroup = new ArrayList<>();
                 volGroups.add(currentGroup);
             }

diff --git a/src/org/daisy/dotify/formatter/impl/obfl/ObflParserImpl.java b/src/org/daisy/dotify/formatter/impl/obfl/ObflParserImpl.java
@@ -661,7 +661,11 @@ private void parseSequence(XMLEvent event, XMLEventIterator input, TextPropertie
         }
         String breakBefore = getAttr(event, "break-before");
         if (breakBefore != null) {
-            builder.breakBefore(SequenceProperties.SequenceBreakBefore.valueOf(breakBefore.toUpperCase()));
+            builder.breakBefore(SequenceProperties.SequenceBreak.valueOf(breakBefore.toUpperCase()));
+        }
+        String breakAfter = getAttr(event, "break-after");
+        if (breakAfter != null) {
+            builder.breakAfter(SequenceProperties.SequenceBreak.valueOf(breakAfter.toUpperCase()));
         }
         String pageNumberCounter = getAttr(event, "page-number-counter");
         if (pageNumberCounter != null) {