Skip to content

Commit

Permalink
Enhance volume-transition
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Håkansson committed Dec 4, 2018
1 parent ae5f8d0 commit 03f238a
Show file tree
Hide file tree
Showing 11 changed files with 312 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ repositories {

dependencies {
compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
compile "org.daisy.dotify:dotify.api:4.4.0"
compile "org.daisy.dotify:dotify.api:4.5.0"
compile "org.daisy.dotify:dotify.common:4.3.0"
compile 'org.daisy.streamline:streamline-api:1.2.0'
compile (group: 'org.daisy.libs', name: 'saxon-he', version: '9.5.1.5') {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ repositoryURL=https://github.com/brailleapps/dotify.formatter.impl
repositorySCM=scm:git:https://github.com/brailleapps/dotify.formatter.impl.git
moduleName=org.daisy.dotify.formatter
bundleName=org.daisy.dotify.formatter.impl
version=4.4.1-SNAPSHOT
version=4.5.0-SNAPSHOT
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ public void testAdvancedVolumeBreak_02() throws LayoutEngineException, IOExcepti
public void testAdvancedVolumeBreak_03() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
testPEF("resource-files/volume-breaks-advanced3-input.obfl", "resource-files/volume-breaks-advanced3-expected.pef", false);
}

@Test
public void testAdvancedVolumeBreak_04() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
testPEF("resource-files/volume-breaks-advanced4-input.obfl", "resource-files/volume-breaks-advanced4-expected.pef", false);
}

@Test
public void testVolumeKeepPriority() throws LayoutEngineException, IOException, PagedMediaWriterConfigurationException {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
<?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>2018-09-21</dc:date>
<dc:title>Several break before volume test</dc:title>
<dc:description>Tests that break-before volume works when the number of volumes is increased.</dc:description>
</meta>
</head>
<body>
<volume cols="10" rows="6" rowgap="0" duplex="true">
<section>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
</section>
<section>
<page>
<row>⠸⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠸⠤⠸⠤⠸⠤⠸⠤⠸</row>
</page>
</section>
</volume>
<volume cols="10" rows="6" rowgap="0" duplex="true">
<section>
<page>
<row>⠸⠸⠸⠤⠸⠸⠤⠸⠸⠸</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠸⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠸</row>
<row>⠸⠤⠸⠤⠸⠤⠸⠤⠸</row>
</page>
</section>
</volume>
<volume cols="10" rows="6" rowgap="0" duplex="true">
<section>
<page>
<row>⠸⠸⠸⠤⠸⠸⠤⠸⠸⠸</row>
<row>⠸⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
</page>
<page>
<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
<row>⠸⠸⠸⠤⠸⠤⠸⠸⠸</row>
</page>
</section>
</volume>
</body>
</pef>
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<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>Several break before volume test</dc:title>
<dc:description>Tests that break-before volume works when the number of volumes is increased.</dc:description>
</meta>
<layout-master name="body" page-width="10" page-height="6" duplex="true">
<default-template>
<header/>
<footer/>
</default-template>
</layout-master>
<volume-template sheets-in-volume-max="4">
<pre-content/>
<post-content/>
</volume-template>
<volume-transition range="page">
<any-interrupted>
<block>⠸⠤⠸⠤⠸⠤⠸⠤⠸</block>
</any-interrupted>
<any-resumed>
<block>⠸⠸⠸⠤⠸⠸⠤⠸⠸⠸</block>
</any-resumed>
</volume-transition>
<sequence master="body">
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
</sequence>
<sequence master="body">
<block>⠸⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠸⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ </block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠸</block>
</sequence>
<sequence master="body">
<block>⠸⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
<block>⠸⠸⠸⠤⠸⠤⠸⠸⠸</block>
</sequence>
</obfl>
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,25 @@ public class TransitionBuilderImpl implements TransitionBuilder {
private final FormatterCoreImpl blockInterrupted;
private final FormatterCoreImpl seqResumed;
private final FormatterCoreImpl seqInterrupted;
private final FormatterCoreImpl anyResumed;
private final FormatterCoreImpl anyInterrupted;

public TransitionBuilderImpl(FormatterCoreContext fc) {
this.props = new TransitionBuilderProperties.Builder().build();
this.blockResumed = new FormatterCoreImpl(fc);
this.blockInterrupted = new FormatterCoreImpl(fc);
this.seqResumed = new FormatterCoreImpl(fc);
this.seqInterrupted = new FormatterCoreImpl(fc);
this.seqInterrupted = new FormatterCoreImpl(fc);
this.anyResumed = new FormatterCoreImpl(fc);
this.anyInterrupted = new FormatterCoreImpl(fc);
}

public TransitionContent getInterruptTransition() {
return new TransitionContent(Type.INTERRUPT, blockInterrupted, seqInterrupted);
return new TransitionContent(Type.INTERRUPT, blockInterrupted, seqInterrupted, anyInterrupted);
}

public TransitionContent getResumeTransition() {
return new TransitionContent(Type.RESUME, blockResumed, seqResumed);
return new TransitionContent(Type.RESUME, blockResumed, seqResumed, anyResumed);
}

@Override
Expand Down Expand Up @@ -60,4 +64,14 @@ public void setProperties(TransitionBuilderProperties props) {
this.props = props;
}

@Override
public BlockBuilder getAnyResumedBuilder() {
return anyResumed;
}

@Override
public BlockBuilder getAnyInterruptedBuilder() {
return anyInterrupted;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ public enum Type {
private final Type type;
private final List<Block> inBlock;
private final List<Block> inSeq;
private final List<Block> inAny;

public TransitionContent(Type type, FormatterCoreImpl inBlock, FormatterCoreImpl inSeq) {
public TransitionContent(Type type, FormatterCoreImpl inBlock, FormatterCoreImpl inSeq, FormatterCoreImpl inAny) {
this.type = type;
this.inBlock = Collections.unmodifiableList(inBlock);
this.inSeq = Collections.unmodifiableList(inSeq);
this.inAny = Collections.unmodifiableList(inAny);
}

public Type getType() {
Expand All @@ -29,4 +31,8 @@ public List<Block> getInBlock() {
public List<Block> getInSequence() {
return inSeq;
}

public List<Block> getInAny() {
return inAny;
}
}
6 changes: 5 additions & 1 deletion src/org/daisy/dotify/formatter/impl/obfl/ObflParserImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,10 @@ private void parseVolumeTransition(XMLEvent event, XMLEventIterator input, TextP
parseTransitionSequence(event, input, template.getSequenceInterruptedBuilder(), tp);
} else if (equalsStart(event, ObflQName.SEQUENCE_RESUMED)) {
parseTransitionSequence(event, input, template.getSequenceResumedBuilder(), tp);
} else if (equalsStart(event, ObflQName.ANY_INTERRUPTED)) {
parseTransitionSequence(event, input, template.getAnyInterruptedBuilder(), tp);
} else if (equalsStart(event, ObflQName.ANY_RESUMED)) {
parseTransitionSequence(event, input, template.getAnyResumedBuilder(), tp);
} else if (equalsEnd(event, ObflQName.VOLUME_TRANSITION)) {
break;
} else {
Expand All @@ -1456,7 +1460,7 @@ private void parseTransitionSequence(XMLEvent event, XMLEventIterator input, Blo
event=input.nextEvent();
if (equalsStart(event, ObflQName.BLOCK)) {
parseBlock(event, input, builder, tp);
} else if (equalsEnd(event, ObflQName.SEQUENCE_INTERRUPTED, ObflQName.SEQUENCE_RESUMED)) {
} else if (equalsEnd(event, ObflQName.SEQUENCE_INTERRUPTED, ObflQName.SEQUENCE_RESUMED, ObflQName.ANY_INTERRUPTED, ObflQName.ANY_RESUMED)) {
break;
} else {
report(event);
Expand Down
2 changes: 2 additions & 0 deletions src/org/daisy/dotify/formatter/impl/obfl/ObflQName.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ interface ObflQName {
static final QName BLOCK_RESUMED = new QName(OBFL_NS, "block-resumed");
static final QName SEQUENCE_INTERRUPTED = new QName(OBFL_NS, "sequence-interrupted");
static final QName SEQUENCE_RESUMED = new QName(OBFL_NS, "sequence-resumed");
static final QName ANY_INTERRUPTED = new QName(OBFL_NS, "any-interrupted");
static final QName ANY_RESUMED = new QName(OBFL_NS, "any-resumed");

static final QName TABLE_OF_CONTENTS = new QName(OBFL_NS, "table-of-contents");

Expand Down
Loading

0 comments on commit 03f238a

Please sign in to comment.