Remove EvenSizeVolumeSplitter code

The reason is explained in issue https://github.com/mtmse/dotify.formatter.impl/issues/5. While an algorithm that favours solutions with more even volumes would be useful to have, EvenSizeVolumeSplitter (despite its name) does not actually accomplish this. Moreover, it has many problems, deteriorating the volume breaking more than improving it. Until we find a way to implement it properly, the whole feature is dropped.
bertfrees · Dec 10, 2020 · 3395fa9 · 3395fa9
1 parent f4ae2e7
commit 3395fa9
Show file tree

Hide file tree

Showing 20 changed files with 106 additions and 841 deletions.
diff --git a/.../org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-page-vol-input.obfl b/.../org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-page-vol-input.obfl
@@ -17,15 +17,15 @@
 			<footer/>
 		</default-template>
 	</layout-master>
-	<volume-template sheets-in-volume-max="10" use-when="(= $volume 1)">
+	<volume-template sheets-in-volume-max="1000" use-when="(= $volume 1)">
 		<pre-content>
 			<sequence master="main" initial-page-number="1">
 				<block>⠿⠿<marker class="pagenum" value="1"/>⠿⠿<marker class="pagenum" value="2"/>⠿⠿<marker class="pagenum" value="3"/></block>
 			</sequence>
 		</pre-content>
 		<post-content/>
 	</volume-template>
-	<volume-template sheets-in-volume-max="10" use-when="(&gt; $volume 1)">
+	<volume-template sheets-in-volume-max="1000" use-when="(&gt; $volume 1)">
 		<pre-content>
 			<sequence master="main" initial-page-number="1">
 				<block>⠤⠤<marker class="pagenum" value="4"/>⠤⠤<marker class="pagenum" value="5"/>⠤⠤<marker class="pagenum" value="6"/></block>
@@ -41,6 +41,8 @@
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
+	</sequence>
+	<sequence master="main" break-before="volume">
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>

diff --git a/.../daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-sequence-vol-input.obfl b/.../daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-sequence-vol-input.obfl
@@ -14,7 +14,7 @@
 			<footer/>
 		</default-template>
 	</layout-master>
-	<volume-template sheets-in-volume-max="10" use-when="(= $volume 1)">
+	<volume-template sheets-in-volume-max="1000" use-when="(= $volume 1)">
 		<pre-content>
 			<sequence master="main" initial-page-number="1">
 				<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
@@ -24,7 +24,7 @@
 		</pre-content>
 		<post-content/>
 	</volume-template>
-	<volume-template sheets-in-volume-max="10" use-when="(&gt; $volume 1)">
+	<volume-template sheets-in-volume-max="1000" use-when="(&gt; $volume 1)">
 		<pre-content>
 			<sequence master="main" initial-page-number="1">
 				<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
@@ -41,6 +41,8 @@
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
+	</sequence>
+	<sequence master="main" break-before="volume">
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>

diff --git a/integrationtest/org/daisy/dotify/formatter/test/resource-files/page/page-number8-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/page/page-number8-input.obfl
@@ -17,7 +17,7 @@
 			<footer/>
 		</default-template>
 	</layout-master>
-	<volume-template sheets-in-volume-max="5">
+	<volume-template sheets-in-volume-max="1000">
 		<pre-content>
 			<sequence master="front"><block>⠞⠊⠞⠇⠑</block></sequence>
 		</pre-content>
@@ -29,12 +29,18 @@
 		<block break-before="page">⠤⠤⠤</block>
 		<block break-before="page">⠤⠤⠤</block>
 		<block break-before="page">⠤⠤⠤</block>
+	</sequence>
+	<sequence master="body" page-number-counter="A" break-before="volume">
 		<block break-before="page">⠤⠤⠤</block>
 		<block break-before="page">⠤⠤⠤</block>
 		<block break-before="page">⠤⠤⠤</block>
+	</sequence>
+	<sequence master="body" page-number-counter="A" break-before="volume">
 		<block break-before="page">⠤⠤⠤</block>
 		<block break-before="page">⠤⠤⠤</block>
+	</sequence>
+	<sequence master="body" page-number-counter="A" break-before="volume">
 		<block break-before="page">⠤⠤⠤</block>
 		<block break-before="page">⠤⠤⠤</block>
 	</sequence>
-</obfl>
+</obfl>
diff --git a/...isy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-expected.pef b/...isy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-expected.pef
@@ -125,8 +125,6 @@
 <row>⠤⠤⠀⠤⠤⠀⠤⠸</row>
 </page>
 </section>
-</volume>
-<volume cols="10" rows="6" rowgap="0" duplex="true">
 <section>
 <page>
 <row>⠸⠤⠀⠤⠤⠀⠤⠤</row>
@@ -142,10 +140,14 @@
 <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>
@@ -160,6 +162,10 @@
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 </page>
+<page>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
+</page>
 </section>
 </volume>
 </body>

diff --git a/...daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-input.obfl b/...daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-input.obfl
@@ -1,7 +1,7 @@
 <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>
+		<dc:title>???</dc:title>
+		<dc:description>???</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="true">
 		<default-template>
@@ -42,7 +42,8 @@
 	</sequence>
 	<sequence master="body">
 		<block>⠸⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
-		<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
+		<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
+		<block>⠤⠤ ⠤⠤ ⠤⠤</block>
 		<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
 		<block>⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤</block>
 	</sequence>

diff --git a/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced2-input.obfl b/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced2-input.obfl
@@ -1,7 +1,7 @@
 <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>
+		<dc:title>???</dc:title>
+		<dc:description>???</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="false">
 		<default-template>

diff --git a/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced3-input.obfl b/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced3-input.obfl
@@ -1,7 +1,7 @@
 <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>
+		<dc:title>???</dc:title>
+		<dc:description>???</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="true">
 		<default-template>

diff --git a/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced4-input.obfl b/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced4-input.obfl
@@ -1,7 +1,7 @@
 <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>
+		<dc:title>???</dc:title>
+		<dc:description>???</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="true">
 		<default-template>

diff --git a/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-keep-next-input.obfl b/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-keep-next-input.obfl
@@ -1,10 +1,9 @@
 <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>Volume keep priority test</dc:title>
-		<dc:description>Tests that keep-with-next-sheets work. In this test, 7 sheets in each volume is optimal.
-		The maximum is set to 10 sheets in each volume, which (by the current configuration of the implementation)
-		allows for 2 pages deviation. This is sufficient to shift the balance by 1 page to accommodate
-		keep-with-next-sheets.</dc:description>
+		<dc:description>Tests that volume keep keep-with-next-sheets works.
+		Without the keep-with-next-sheets, the first volume would be 10 sheets (the target size) and the second would be 4 sheets.
+		With the keep-with-next-sheets, the first volume is 6 sheets and the second 8 sheets.</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="false">
 		<default-template>
@@ -23,7 +22,12 @@
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
-		<block keep-with-next-sheets="1">⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
+		<block keep-with-next-sheets="3">
+			⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿
+		</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>

diff --git a/...daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority-input.obfl b/...daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority-input.obfl
@@ -1,10 +1,9 @@
 <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>Volume keep priority test</dc:title>
-		<dc:description>Tests that volume keep priority works. In this test, 7 sheets in each volume is optimal.
-		The maximum is set to 10 sheets in each volume, which (by the current configuration of the implementation)
-		allows for 2 pages deviation. This is sufficient to shift the balance by 1 page to accommodate the
-		volume-keep-priority.</dc:description>
+		<dc:description>Tests that volume keep priority works.
+		Without priorities, the first volume would be 10 sheets (the target size) and the second would be 4 sheets.
+		With the volume-keep-priority, the first volume is 6 sheets and the second 8 sheets.</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="false">
 		<default-template>

diff --git a/...sy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-expected.pef b/...sy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-expected.pef
@@ -48,10 +48,14 @@
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
-<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠿</row>
 </page>
+</section>
+</volume>
+<volume cols="10" rows="6" rowgap="0" duplex="false">
+<section>
 <page>
-<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
+<row>⠿⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
@@ -72,38 +76,34 @@
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
-<row>⠤⠤⠀⠤⠤⠀⠤⠿</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 </page>
-</section>
-</volume>
-<volume cols="10" rows="6" rowgap="0" duplex="false">
-<section>
 <page>
-<row>⠿⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <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>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 </page>
 <page>
-<row>⠿⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
-<row>⠤⠤⠀⠤⠤⠀⠤⠿</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 </page>
 <page>
-<row>⠿⠤⠀⠤⠤⠀⠤⠤</row>
+<row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>
 <row>⠤⠤⠀⠤⠤⠀⠤⠤</row>

diff --git a/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-input.obfl b/...aisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-input.obfl
@@ -1,10 +1,9 @@
 <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>Volume keep priority test</dc:title>
-		<dc:description>Tests that volume keep priority works. In this test, 7 sheets in each volume is optimal.
-		The maximum is set to 10 sheets in each volume, which (by the current configuration of the implementation)
-		allows for 2 pages deviation. This is sufficient to shift the balance by 1 page to accommodate the
-		volume-keep-priority.</dc:description>
+		<dc:description>Tests that volume keep priority works.
+		Without priorities, the first volume would be 10 sheets (the target size) and the second would be 4 sheets.
+		With the volume-keep-priority, the first volume is 5 sheets and the second 9 sheets.</dc:description>
 	</meta>
 	<layout-master name="body" page-width="10" page-height="6" duplex="false">
 		<default-template>
@@ -21,11 +20,16 @@
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
-		<block volume-keep-priority="7">⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
-		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
-		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
-		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
+		<block volume-keep-priority="7">
+			⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤
+			⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿
+		</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 		<block>⠿⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠤ ⠤⠿</block>
 	</sequence>

diff --git a/src/org/daisy/dotify/formatter/impl/FormatterImpl.java b/src/org/daisy/dotify/formatter/impl/FormatterImpl.java
@@ -187,7 +187,7 @@ private Iterable<? extends Volume> getVolumes() {
             try {
                 ret = new ArrayList<>();
                 volumeProvider.prepare();
-                for (int i = 1; i <= volumeProvider.getVolumeCount(); i++) {
+                while (volumeProvider.hasNext()) {
                     ret.add(volumeProvider.nextVolume());
                 }