From 3395fa96cacac99271019452711155074306a3ea Mon Sep 17 00:00:00 2001
From: Bert Frees <bertfrees@gmail.com>
Date: Wed, 9 Dec 2020 20:50:50 +0100
Subject: [PATCH] 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.
---
 .../marker-ref/marker-ref-page-vol-input.obfl |   6 +-
 .../marker-ref-sequence-vol-input.obfl        |   6 +-
 .../page/page-number8-input.obfl              |  10 +-
 .../volume-breaks-advanced-expected.pef       |  14 +-
 .../volume-breaks-advanced-input.obfl         |   7 +-
 .../volume-breaks-advanced2-input.obfl        |   4 +-
 .../volume-breaks-advanced3-input.obfl        |   4 +-
 .../volume-breaks-advanced4-input.obfl        |   4 +-
 .../volume-breaks-keep-next-input.obfl        |  14 +-
 .../volume-breaks-priority-input.obfl         |   7 +-
 .../volume-breaks-priority2-expected.pef      |  28 +-
 .../volume-breaks-priority2-input.obfl        |  20 +-
 .../dotify/formatter/impl/FormatterImpl.java  |   2 +-
 .../dotify/formatter/impl/VolumeProvider.java |  47 ++--
 .../impl/sheet/EvenSizeVolumeSplitter.java    | 150 ----------
 .../EvenSizeVolumeSplitterCalculator.java     | 263 ------------------
 .../formatter/impl/sheet/SheetGroup.java      |  19 --
 .../impl/sheet/SheetGroupManager.java         |  99 +------
 .../formatter/impl/sheet/VolumeSplitter.java  |  36 ---
 .../EvenSizeVolumeSplitterCalculatorTest.java | 207 --------------
 20 files changed, 106 insertions(+), 841 deletions(-)
 delete mode 100644 src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitter.java
 delete mode 100644 src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculator.java
 delete mode 100644 src/org/daisy/dotify/formatter/impl/sheet/VolumeSplitter.java
 delete mode 100644 test/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculatorTest.java

diff --git a/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-page-vol-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-page-vol-input.obfl
index 088bcec3..7dcba916 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-page-vol-input.obfl
+++ b/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-page-vol-input.obfl
@@ -17,7 +17,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>⠿⠿<marker class="pagenum" value="1"/>⠿⠿<marker class="pagenum" value="2"/>⠿⠿<marker class="pagenum" value="3"/></block>
@@ -25,7 +25,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>⠤⠤<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/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-sequence-vol-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-sequence-vol-input.obfl
index f8ad3bc5..52246e10 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/marker-ref/marker-ref-sequence-vol-input.obfl
+++ b/integrationtest/org/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
index 6915427d..6bede6b7 100644
--- 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>
\ No newline at end of file
+</obfl>
diff --git a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-expected.pef b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-expected.pef
index 734481a7..cd2e2fe9 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-expected.pef
+++ b/integrationtest/org/daisy/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-input.obfl
index 44f48ae6..a9607115 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced-input.obfl
+++ b/integrationtest/org/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced2-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced2-input.obfl
index fcbe620f..14b7bf8b 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced2-input.obfl
+++ b/integrationtest/org/daisy/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced3-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced3-input.obfl
index d86271ab..adc3b477 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced3-input.obfl
+++ b/integrationtest/org/daisy/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced4-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced4-input.obfl
index c679aa4d..75f3587d 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-advanced4-input.obfl
+++ b/integrationtest/org/daisy/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-keep-next-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-keep-next-input.obfl
index 3bdde499..edce27d1 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-keep-next-input.obfl
+++ b/integrationtest/org/daisy/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority-input.obfl
index 211b9d17..940c36e3 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority-input.obfl
+++ b/integrationtest/org/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-expected.pef b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-expected.pef
index 7321793c..003c35ef 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-expected.pef
+++ b/integrationtest/org/daisy/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/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-input.obfl b/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-input.obfl
index 6fb939aa..b7bbe424 100644
--- a/integrationtest/org/daisy/dotify/formatter/test/resource-files/volume-break/volume-breaks-priority2-input.obfl
+++ b/integrationtest/org/daisy/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
index 6bd40946..97513df1 100644
--- 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());
                 }
 
diff --git a/src/org/daisy/dotify/formatter/impl/VolumeProvider.java b/src/org/daisy/dotify/formatter/impl/VolumeProvider.java
index a8be4605..17e50670 100644
--- a/src/org/daisy/dotify/formatter/impl/VolumeProvider.java
+++ b/src/org/daisy/dotify/formatter/impl/VolumeProvider.java
@@ -44,13 +44,12 @@
  * <p>The input is a list of {@link BlockSequence}s, which are first converted to a sequence of
  * "volume groups", where every group is a list of {@link BlockSequence}s, of which the first one
  * has a hard volume break (<code>break-before="volume"</code>). For every volume group a {@link
- * SheetDataSource} is then created, which is wrapped in a {@link SheetGroup} together with its
- * respective {@link org.daisy.dotify.formatter.impl.sheet.VolumeSplitter}, which determines the
- * number of required volumes and their target sizes. All groups are managed in a {@link
- * SheetGroupManager}. {@link SheetDataSource}s that do not fit in a volume are broken, using {@link
- * SplitPointHandler}. The cost function takes into account how much the total size of a volume
- * deviates from the target size, the <code>volume-break-priority</code> of the last sheet, and
- * whether the {@link Sheet#isBreakable() isBreakable} constraint of the last sheet is violated.</p>
+ * SheetDataSource} is then created, which is wrapped in a {@link SheetGroup}. All groups are
+ * managed in a {@link SheetGroupManager}. {@link SheetDataSource}s that do not fit in a volume are
+ * broken, using {@link SplitPointHandler}. The cost function takes into account how much the total
+ * size of a volume deviates from the target size, the <code>volume-break-priority</code> of the
+ * last sheet, and whether the {@link Sheet#isBreakable() isBreakable} constraint of the last sheet
+ * is violated.</p>
  *
  * <p>Pre- and post-content is added to every volume based on the provided {@link
  * VolumeTemplate}s.</p>
@@ -111,18 +110,17 @@ public class VolumeProvider {
      */
     void prepare() {
         if (!init) {
-            groups = new SheetGroupManager(splitterLimit);
+            groups = new SheetGroupManager();
             // make a preliminary calculation based on a contents only
             Iterable<SheetDataSource> allUnits = prepareToPaginateWithVolumeGroups(
                 blocks,
                 new DefaultContext.Builder(crh).space(Space.BODY).build()
             );
-            int volCount = 0;
+            int volCount = 0; // initial estimate of volume count
             for (SheetDataSource data : allUnits) {
-                SheetGroup g = groups.add();
-                g.setUnits(data);
-                g.getSplitter().updateSheetCount(data.getRemaining().size(), data.getRemaining().size());
-                volCount += g.getSplitter().getVolumeCount();
+                groups.add().setUnits(data);
+                volCount += (1 + (data.getRemaining().size() - 1)
+                                 / splitterLimit.getSplitterLimit(volCount + 1));
             }
             crh.setVolumeCount(volCount);
             //if there is an error, we won't have a proper initialization and have to retry from the beginning
@@ -177,8 +175,7 @@ VolumeImpl nextVolume() {
      */
     private SectionBuilder nextBodyContents(int volumeNumber, final int overhead, ArrayList<AnchorData> ad) {
         groups.currentGroup().setOverheadCount(groups.currentGroup().getOverheadCount() + overhead);
-        final int splitterMax = splitterLimit.getSplitterLimit(volumeNumber);
-        final int targetSheetsInVolume = (groups.lastInGroup() ? splitterMax : groups.sheetsInCurrentVolume());
+        final int targetSheetsInVolume = splitterLimit.getSplitterLimit(volumeNumber);
         //Not using lambda for now, because it's noticeably slower.
         SplitPointCost<Sheet> cost = new SplitPointCost<Sheet>() {
             @Override
@@ -188,7 +185,7 @@ public double getCost(SplitPointDataSource<Sheet, ?> units, int index, int break
                 double priorityPenalty = 0;
                 int sheetCount = index + 1;
                 // Calculates a maximum offset based on the maximum possible number of sheets
-                double range = splitterMax * 0.4;
+                double range = targetSheetsInVolume * 0.4;
                 if (!units.isEmpty()) {
                     VolumeKeepPriority avoid = lastSheet.getAvoidVolumeBreakAfterPriority();
                     if (avoid.hasValue()) {
@@ -217,13 +214,13 @@ public double getCost(SplitPointDataSource<Sheet, ?> units, int index, int break
         SheetDataSource data = groups.currentGroup().getUnits();
         data.setCurrentVolumeNumber(volumeNumber);
         SheetDataSource copySource = new SheetDataSource(data);
-        SplitPointSpecification spec = volSplitter.find(splitterMax - overhead,
+        SplitPointSpecification spec = volSplitter.find(targetSheetsInVolume - overhead,
                 copySource,
                 cost, StandardSplitOption.ALLOW_FORCE);
         crh.setReadWrite();
         sp = volSplitter.split(spec, data);
         /*
-            sp = volSplitter.split(splitterMax-overhead,
+            sp = volSplitter.split(targetSheetsInVolume-overhead,
                     groups.currentGroup().getUnits(),
                     cost, StandardSplitOption.ALLOW_FORCE);
         */
@@ -380,21 +377,13 @@ private SheetDataSource prepareToPaginate(
      * @return returns true if the volumes can be accepted, false otherwise
      */
     boolean done() {
-        if (groups.hasNext() && logger.isLoggable(Level.FINE)) {
-            logger.fine("There is more content (sheets: " +
-                    groups.countRemainingSheets() + ", pages: " +
-                    groups.countRemainingPages() + ")");
-        }
-        // this changes the value of groups.getVolumeCount() to the newly computed
-        // required number of volume based on groups.countTotalSheets()
-        groups.updateAll();
         crh.commitBreakable();
         crh.commitTransitionProperties();
         crh.trimPageDetails();
         crh.setVolumeCount(groups.getVolumeCount());
         crh.setSheetsInDocument(groups.countTotalSheets());
         //crh.setPagesInDocument(value);
-        if (!crh.isDirty() && !groups.hasNext()) {
+        if (!crh.isDirty()) {
             return true;
         } else {
             crh.setDirty(false);
@@ -404,8 +393,8 @@ boolean done() {
         return false;
     }
 
-    int getVolumeCount() {
-        return crh.getVolumeCount();
+    boolean hasNext() {
+        return groups.hasNext();
     }
 
 }
diff --git a/src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitter.java b/src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitter.java
deleted file mode 100644
index d877a84d..00000000
--- a/src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitter.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.daisy.dotify.formatter.impl.sheet;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * {@link VolumeSplitter} implementation that gives preference to even sized volumes.
- *
- * <p>Each {@link SheetGroup volume group} has its own <code>VolumeSplitter</code> instance.</p>
- *
- * <p>The target sizes of the volumes are computed in {@link EvenSizeVolumeSplitterCalculator} based
- * on a total number of sheets and a <code>volumeOffset</code> parameter. By increasing this
- * parameter, extra volumes are added on top of the number strictly needed to accommodate all the
- * sheets, and the volume sizes are decreased. Different configurations are tried and evaluated
- * based on information about the previous iterations, provided through {@link
- * #updateSheetCount(int, int) updateSheetCount}:</p>
- *
- * <ul>
- *   <li>The actual total number of sheets in the volume group. "Total" means including remaining
- *       sheets and sheets coming from the pre- and post-content.</li>
- *   <li>The number of sheets that did not fit in the volume group.</li>
- * </ul>
- *
- * <p>The actual sizes of the volumes are not determined here. This is done in {@link
- * org.daisy.dotify.formatter.impl.VolumeProvider}.</p>
- */
-class EvenSizeVolumeSplitter implements VolumeSplitter {
-    private static final Logger logger = Logger.getLogger(EvenSizeVolumeSplitter.class.getCanonicalName());
-    private EvenSizeVolumeSplitterCalculator sdc;
-    private final SplitterLimit splitterMax;
-    // number of volumes to add on top of the number of volumes strictly needed to accommodate the
-    // total number of sheets
-    int volumeOffset = 0;
-    int initialSheets; // initial number of sheets; assuming that this is the number of sheets
-    // required to fit everything into one volume, without the overhead
-
-    /*
-     * This map keeps track of which split suggestions resulted in a successful split. We
-     * make use of this information in order to not get into an endless loop while looking
-     * for the optimal number of volumes.
-     */
-    private Map<EvenSizeVolumeSplitterCalculator, Boolean> previouslyTried = new HashMap<>();
-
-    EvenSizeVolumeSplitter(SplitterLimit splitterMax) {
-        this.splitterMax = splitterMax;
-    }
-
-    /**
-     * Provide information about the actual volumes in the previous iteration.
-     *
-     * @param sheets          the total number of sheets in the volume group, including remaining sheets and
-     *                        sheets coming from pre- or post-content (overhead)
-     * @param remainingSheets the number of sheets that did not fit in the volume group
-     */
-    @Override
-    public void updateSheetCount(int sheets, int remainingSheets) {
-        if (sdc == null) {
-            sdc = new EvenSizeVolumeSplitterCalculator(sheets, splitterMax, volumeOffset);
-            initialSheets = sheets;
-        } else {
-            boolean sheetsFitInVolumes = remainingSheets == 0;
-            EvenSizeVolumeSplitterCalculator prvSdc = sdc;
-            sdc = null;
-            previouslyTried.put(prvSdc, sheetsFitInVolumes);
-            if (!sheetsFitInVolumes) {
-                EvenSizeVolumeSplitterCalculator esc = new EvenSizeVolumeSplitterCalculator(
-                    sheets,
-                    splitterMax,
-                    volumeOffset
-                );
-
-                // Try increasing the volume count
-                if (remainingSheets >= sheets) {
-                    throw new IllegalStateException();
-                }
-                int volumeInc;
-                {
-                    double inc = (1.0 * prvSdc.getVolumeCount() * remainingSheets) / (sheets - remainingSheets);
-                    // subtract increase in volume count due to increase in sheet count
-                    inc -= (esc.getVolumeCount() - prvSdc.getVolumeCount());
-                    // factor 3/4 because we don't want to adapt too fast
-                    inc *= .75;
-                    volumeInc = (int) Math.floor(inc);
-                }
-
-                // estimate of extra overhead per added volume
-                double overheadPerVolumeEstimate = (sheets - initialSheets) * 1.0 / prvSdc.getVolumeCount();
-                int extraOverheadSheets = (int) Math.floor(
-                        overheadPerVolumeEstimate * (volumeInc + esc.getVolumeCount() - prvSdc.getVolumeCount()));
-                sheets += extraOverheadSheets;
-
-                if (volumeInc > 0) {
-                    volumeOffset += volumeInc;
-                    sdc = new EvenSizeVolumeSplitterCalculator(sheets, splitterMax, volumeOffset);
-                } else {
-
-                    // Try with adjusted number of sheets
-                    if (extraOverheadSheets > 0) {
-                        esc = new EvenSizeVolumeSplitterCalculator(sheets, splitterMax, volumeOffset);
-                    }
-                    if (!previouslyTried.containsKey(esc) || previouslyTried.get(esc)) {
-                        sdc = esc;
-                    } else {
-                        volumeOffset += 1;
-                        sdc = new EvenSizeVolumeSplitterCalculator(sheets, splitterMax, volumeOffset);
-                    }
-                }
-            } else {
-                if (volumeOffset > 0) {
-
-                    // Try decreasing the volume count again
-                    EvenSizeVolumeSplitterCalculator esc = new EvenSizeVolumeSplitterCalculator(
-                        sheets,
-                        splitterMax,
-                        volumeOffset - 1
-                    );
-                    if (!previouslyTried.containsKey(esc)) {
-                        volumeOffset--;
-                        sdc = esc;
-                    }
-                }
-                if (sdc == null) {
-
-                    // Try with up to date sheet count
-                    EvenSizeVolumeSplitterCalculator esc = new EvenSizeVolumeSplitterCalculator(
-                        sheets,
-                        splitterMax,
-                        volumeOffset
-                    );
-                    if (!previouslyTried.containsKey(esc)) {
-                        sdc = esc;
-                    } else {
-                        sdc = prvSdc;
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public int sheetsInVolume(int volIndex) {
-        return sdc.sheetsInVolume(volIndex);
-    }
-
-    @Override
-    public int getVolumeCount() {
-        return sdc.getVolumeCount();
-    }
-}
diff --git a/src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculator.java b/src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculator.java
deleted file mode 100644
index 8eb15661..00000000
--- a/src/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculator.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.daisy.dotify.formatter.impl.sheet;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Provides information needed to split a book into volumes.
- *
- * @author Joel Håkansson
- */
-class EvenSizeVolumeSplitterCalculator {
-    // number of sheets
-    private final int sheets;
-    // breakpoints
-    private final Set<Integer> breakpoints;
-
-    private final List<Integer> volumeSize;
-    private final Map<Integer, Integer> volumeForSheet;
-
-    public EvenSizeVolumeSplitterCalculator(int sheets, final int splitterMax) {
-        this(sheets, splitterMax, 0);
-    }
-
-    /**
-     * @param sheets      total number of sheets
-     * @param splitterMax maximum number of sheets in a volume
-     */
-    public EvenSizeVolumeSplitterCalculator(int sheets, SplitterLimit splitterMax) {
-        this(sheets, splitterMax, 0);
-    }
-
-    public EvenSizeVolumeSplitterCalculator(int sheets, final int splitterMax, int volumeOffset) {
-        this(sheets, new SplitterLimit() {
-            @Override
-            public int getSplitterLimit(int volume) {
-                return splitterMax;
-            }
-        }, volumeOffset);
-    }
-
-    /**
-     * Creates a new instance.
-     *
-     * @param sheets       the total number of sheets
-     * @param splitterMax  the slitter limit
-     * @param volumeOffset when &gt; 0, the specified number of additional volumes is used
-     *                     when creating sheet targets for each volume. A value &gt; 0 is
-     *                     not strictly needed to accommodate the number of sheets.
-     */
-    public EvenSizeVolumeSplitterCalculator(int sheets, SplitterLimit splitterMax, int volumeOffset) {
-        this.sheets = sheets;
-        SplitterSpecification spec = getSplitterSpecification(sheets, splitterMax, volumeOffset);
-        int volumes = spec.volumeCount;
-        this.volumeSize = trimHeadroom(makeVolumeSizes(volumes, splitterMax), spec.sheetCapacity - sheets);
-        this.breakpoints = makeBreakpoints(volumeSize);
-        this.volumeForSheet = makeVolumeForSheetMap(sheets, breakpoints);
-    }
-
-    private static class SplitterSpecification {
-        int sheetCapacity;
-        int volumeCount;
-    }
-
-    /**
-     * Calculates the splitter specification.
-     *
-     * @param sheets       then number of sheets
-     * @param splitterMax  the splitter limits
-     * @param volumeOffset when &gt; 0, the specified number of additional volumes is used
-     *                     when creating sheet targets for each volume. A value &gt; 0 is
-     *                     not strictly needed to accommodate the number of sheets.
-     * @return returns the volume capacity
-     */
-    private static SplitterSpecification getSplitterSpecification(
-            int sheets,
-            SplitterLimit splitterMax,
-            int volumeOffset
-    ) {
-        SplitterSpecification ret = new SplitterSpecification();
-        ret.sheetCapacity = 0;
-        {
-            int i = 0;
-            while (ret.sheetCapacity < sheets) {
-                ret.sheetCapacity += splitterMax.getSplitterLimit(i + 1);
-                i++;
-            }
-            for (int x = 0; x < volumeOffset; x++) {
-                ret.sheetCapacity += splitterMax.getSplitterLimit(i + x + 1);
-            }
-            ret.volumeCount = i + volumeOffset;
-        }
-        return ret;
-    }
-
-    /**
-     * Makes a list of volume sizes.
-     *
-     * @param volumes     the number of volumes
-     * @param splitterMax the volume
-     * @return returns a list with the sizes of volumes
-     */
-    private static List<Integer> makeVolumeSizes(int volumes, SplitterLimit splitterMax) {
-        List<Integer> volumeSize = new ArrayList<>();
-        for (int i = 1; i <= volumes; i++) {
-            volumeSize.add(splitterMax.getSplitterLimit(i));
-        }
-        return volumeSize;
-    }
-
-    /**
-     * Trims down left over headroom by removing an one sheet from each volume,
-     * starting with the last volume until there is no more headroom.
-     *
-     * @param volumeSize the volume sizes
-     * @param headroom   the number of sheets to trim off
-     * @return returns the volumeSize list, for convenience
-     * @throws IllegalArgumentException if the volume size goes below 1
-     */
-    private static List<Integer> trimHeadroom(List<Integer> volumeSize, int headroom) {
-        int volumes = volumeSize.size();
-        int v = 0;
-        for (int i = headroom; i > 0; i--) {
-            int m = (volumes - 1) - (v % volumes); // 4, 3, 2, 1, 0
-            int current = volumeSize.get(m);
-            if (current == 1) {
-                throw new IllegalArgumentException("Volume sizes too uneven: " + volumeSize);
-            }
-            volumeSize.set(m, current - 1);
-            v++;
-        }
-        return volumeSize;
-    }
-
-    /**
-     * Makes a set of volume breakpoints for the volume sizes provided.
-     *
-     * @param volumeSize the volume sizes
-     * @return returns a set of volume breakpoints
-     */
-    private static Set<Integer> makeBreakpoints(List<Integer> volumeSize) {
-        int volumes = volumeSize.size();
-        int vx = volumes - 1;
-        int breakpoint = 0;
-        Set<Integer> breakpoints = new HashSet<Integer>();
-        for (int i = 0; i < vx; i++) {
-            breakpoint += volumeSize.get(i);
-            breakpoints.add(breakpoint);
-        }
-        return breakpoints;
-    }
-
-    /**
-     * Makes a volume for sheet map.
-     * The result maps every sheet to a volume, one-based.
-     *
-     * @param sheets      the number of sheets
-     * @param breakpoints the breakpoints
-     * @return returns a volume for sheet map
-     */
-    private static Map<Integer, Integer> makeVolumeForSheetMap(int sheets, Set<Integer> breakpoints) {
-        Map<Integer, Integer> volumeForSheet = new HashMap<>();
-        int currentVolume = 1;
-        for (int i = 1; i <= sheets; i++) {
-            if (breakpoints.contains(i)) {
-                currentVolume++;
-            }
-            volumeForSheet.put(i, currentVolume);
-        }
-        return volumeForSheet;
-    }
-
-    /**
-     * Tests if the supplied sheetIndex is a breakpoint. This sheetIndex counts all sheets,
-     * including sheets inserted in volume splitting.
-     *
-     * @param sheetIndex sheet index, one based
-     * @return returns true if the sheet is a breakpoint, false otherwise
-     * @throws IndexOutOfBoundsException if sheetIndex is outside of agreed boundaries
-     */
-    public boolean isBreakpoint(int sheetIndex) {
-        if (sheetIndex < 1) {
-            throw new IndexOutOfBoundsException("Sheet index must be greater than zero: " + sheetIndex);
-        }
-        if (sheetIndex > sheets) {
-            throw new IndexOutOfBoundsException("Sheet index must not exceed agreed value.");
-        }
-        return breakpoints.contains(sheetIndex);
-    }
-
-    /**
-     * Gets the number of sheets in a volume.
-     *
-     * @param volIndex volume index, one-based
-     * @return returns the number of sheets in the volume
-     */
-    public int sheetsInVolume(int volIndex) {
-        return volumeSize.get(volIndex - 1);
-    }
-
-    /**
-     * Gets the number of volumes.
-     *
-     * @return returns the number of volumes
-     */
-    public int getVolumeCount() {
-        return volumeSize.size();
-    }
-
-    /**
-     * Gets the volume for the supplied sheetIndex. This sheetIndex counts all sheets,
-     * including sheets inserted in volume splitting.
-     *
-     * @param sheetIndex sheet index, one based
-     * @return returns the volume number, one based
-     * @throws IndexOutOfBoundsException if sheetIndex is outside of agreed boundaries
-     */
-    public int getVolumeForSheet(int sheetIndex) {
-        if (sheetIndex < 1) {
-            throw new IndexOutOfBoundsException("Sheet index must be greater than zero: " + sheetIndex);
-        }
-        if (sheetIndex > sheets) {
-            throw new IndexOutOfBoundsException("Sheet index must not exceed agreed value.");
-        }
-        return volumeForSheet.get(sheetIndex);
-    }
-
-    //volumeForSheet and breakpoints are not included below, as their values can be determined from the other values
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((volumeSize == null) ? 0 : volumeSize.hashCode());
-        return result;
-    }
-
-    //volumeForSheet and breakpoints are not included below, as their values can be determined from the other values
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        EvenSizeVolumeSplitterCalculator other = (EvenSizeVolumeSplitterCalculator) obj;
-        if (volumeSize == null) {
-            if (other.volumeSize != null) {
-                return false;
-            }
-        } else if (!volumeSize.equals(other.volumeSize)) {
-            return false;
-        }
-        return true;
-    }
-
-}
diff --git a/src/org/daisy/dotify/formatter/impl/sheet/SheetGroup.java b/src/org/daisy/dotify/formatter/impl/sheet/SheetGroup.java
index 868f2b2e..484e0be4 100644
--- a/src/org/daisy/dotify/formatter/impl/sheet/SheetGroup.java
+++ b/src/org/daisy/dotify/formatter/impl/sheet/SheetGroup.java
@@ -8,7 +8,6 @@
  */
 public class SheetGroup {
     private SheetDataSource units;
-    private VolumeSplitter splitter;
     private int overheadCount;
     private int sheetCount;
 
@@ -81,24 +80,6 @@ public void setUnits(SheetDataSource units) {
         this.units = units;
     }
 
-    /**
-     * Sets the volume splitter used for this sheet group.
-     *
-     * @param splitter the splitter to use
-     */
-    void setSplitter(VolumeSplitter splitter) {
-        this.splitter = splitter;
-    }
-
-    /**
-     * Gets the volume splitter used for this sheet group.
-     *
-     * @return returns the splitter
-     */
-    public VolumeSplitter getSplitter() {
-        return splitter;
-    }
-
     /**
      * Gets the total sheet count, including processed sheets, overhead sheets and remaining sheets.
      * <b>Note: only use after all volumes have been calculated.</b>
diff --git a/src/org/daisy/dotify/formatter/impl/sheet/SheetGroupManager.java b/src/org/daisy/dotify/formatter/impl/sheet/SheetGroupManager.java
index 37628f96..84dcfc1f 100644
--- a/src/org/daisy/dotify/formatter/impl/sheet/SheetGroupManager.java
+++ b/src/org/daisy/dotify/formatter/impl/sheet/SheetGroupManager.java
@@ -6,26 +6,20 @@
 /**
  * <p>Provides a manager for {@link SheetGroup}.</p>
  *
- * <p>An {@link EvenSizeVolumeSplitter} is associated with every <code>SheetGroup</code>.</p>
- *
  * <p>Used by {@link org.daisy.dotify.formatter.impl.VolumeProvider}.</p>
  *
  * @author Joel Håkansson
  */
 public class SheetGroupManager {
-    private final SplitterLimit splitterLimit;
     private final List<SheetGroup> groups;
-    private int indexInGroup = 0;
-    private int index = 0;
+    private int groupIndex = 0;
+    private int volumeIndex = 0;
 
     /**
      * Creates a new sheet group manager.
-     *
-     * @param splitterLimit the splitter limit
      */
-    public SheetGroupManager(SplitterLimit splitterLimit) {
+    public SheetGroupManager() {
         this.groups = new ArrayList<>();
-        this.splitterLimit = splitterLimit;
     }
 
 
@@ -36,18 +30,6 @@ public SheetGroupManager(SplitterLimit splitterLimit) {
      */
     public SheetGroup add() {
         SheetGroup ret = new SheetGroup();
-        ret.setSplitter(new EvenSizeVolumeSplitter(new SplitterLimit() {
-            private final int groupIndex = groups.size();
-
-            @Override
-            public int getSplitterLimit(int volume) {
-                int offset = 0;
-                for (int i = 0; i < groupIndex; i++) {
-                    offset += groups.get(i).getSplitter().getVolumeCount();
-                }
-                return splitterLimit.getSplitterLimit(volume + offset);
-            }
-        }));
         groups.add(ret);
         return ret;
     }
@@ -77,7 +59,7 @@ int size() {
      * @return returns the current group
      */
     public SheetGroup currentGroup() {
-        return groups.get(index);
+        return groups.get(groupIndex);
     }
 
     /**
@@ -86,37 +68,13 @@ public SheetGroup currentGroup() {
      * the group following that is activated.
      */
     public void nextVolume() {
-        if (indexInGroup + 1 >= currentGroup().getSplitter().getVolumeCount()) {
-            nextGroup();
-            indexInGroup = 0;
-        } else {
-            indexInGroup++;
-        }
-    }
-
-    private void nextGroup() {
-        index++;
-        if (groups.size() < index) {
+        if (groupIndex == groups.size()) {
             throw new IllegalStateException("No more groups.");
         }
-    }
-
-    /**
-     * Returns true if the current volume is the last according to the current group's splitter.
-     *
-     * @return returns true if the current volume is the last, false otherwise
-     */
-    public boolean lastInGroup() {
-        return indexInGroup == currentGroup().getSplitter().getVolumeCount();
-    }
-
-    /**
-     * Gets the number of sheets in the current volume, according the the group's splitter.
-     *
-     * @return returns the number of sheets in the current volume
-     */
-    public int sheetsInCurrentVolume() {
-        return currentGroup().getSplitter().sheetsInVolume(1 + indexInGroup);
+        volumeIndex++;
+        if (!currentGroup().hasNext()) {
+            groupIndex++;
+        }
     }
 
     /**
@@ -126,12 +84,12 @@ public void resetAll() {
         for (SheetGroup g : groups) {
             g.reset();
         }
-        index = 0;
-        indexInGroup = 0;
+        groupIndex = 0;
+        volumeIndex = 0;
     }
 
     /**
-     * Returns true if there is content left or left behind.
+     * Returns true if there is content left.
      *
      * @return returns true if the manager has content, false otherwise
      */
@@ -139,17 +97,6 @@ public boolean hasNext() {
         return groups.stream().anyMatch(g -> g.hasNext());
     }
 
-    /**
-     * Updates the sheet count and adjusts the volume count in every group.
-     * <b>Note: only use after all volumes have been calculated.</b>
-     */
-    public void updateAll() {
-        for (SheetGroup g : groups) {
-            int remaining = g.hasNext() ? g.getUnits().getRemaining().size() : 0;
-            g.getSplitter().updateSheetCount(g.countTotalSheets(), remaining);
-        }
-    }
-
     /**
      * Counts the total number of sheets.
      * <b>Note: only use after all volumes have been calculated.</b>
@@ -160,33 +107,13 @@ public int countTotalSheets() {
         return groups.stream().mapToInt(g -> g.countTotalSheets()).sum();
     }
 
-    /**
-     * Counts the remaining sheets.
-     * <b>Note: only use after all volumes have been calculated.</b>
-     *
-     * @return returns the number of remaining sheets
-     */
-    public int countRemainingSheets() {
-        return groups.stream().mapToInt(g -> g.getUnits().getRemaining().size()).sum();
-    }
-
-    /**
-     * Counts the remaining pages.
-     * <b>Note: only use after all volumes have been calculated.</b>
-     *
-     * @return returns the number of remaining pages
-     */
-    public int countRemainingPages() {
-        return groups.stream().map(g -> g.getUnits().getRemaining()).mapToInt(Sheet::countPages).sum();
-    }
-
     /**
      * Gets the total number of volumes.
      *
      * @return returns the total number of volumes
      */
     public int getVolumeCount() {
-        return groups.stream().mapToInt(g -> g.getSplitter().getVolumeCount()).sum();
+        return volumeIndex;
     }
 
 }
diff --git a/src/org/daisy/dotify/formatter/impl/sheet/VolumeSplitter.java b/src/org/daisy/dotify/formatter/impl/sheet/VolumeSplitter.java
deleted file mode 100644
index 6a55cf82..00000000
--- a/src/org/daisy/dotify/formatter/impl/sheet/VolumeSplitter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.daisy.dotify.formatter.impl.sheet;
-
-/**
- * Allocates a number of volumes required to accomodate the sheets, and determines the target
- * (i.e. optimal) number of sheets for each volume. The maximum number of sheets for each volume is
- * determined by a {@link SplitterLimit}.
- *
- * @author Joel Håkansson
- */
-public interface VolumeSplitter {
-
-    /**
-     * Sets the number of sheets to distribute and adjusts the number of volumes based on
-     * the number of sheets that did not fit in the volumes of the previous iteration.
-     *
-     * @param sheets          the total number of sheets
-     * @param sheetsRemaining the number of sheets that did not fit in the previous iteration
-     */
-    void updateSheetCount(int sheets, int sheetsRemaining);
-
-    /**
-     * Gets the target number of sheets in a volume.
-     *
-     * @param volIndex volume index, one-based
-     * @return returns the number of sheets in the volume
-     */
-    public int sheetsInVolume(int volIndex);
-
-    /**
-     * Gets the number of volumes required according to this splitter.
-     *
-     * @return returns the number of volumes required
-     */
-    int getVolumeCount();
-
-}
diff --git a/test/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculatorTest.java b/test/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculatorTest.java
deleted file mode 100644
index 230fb3f1..00000000
--- a/test/org/daisy/dotify/formatter/impl/sheet/EvenSizeVolumeSplitterCalculatorTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.daisy.dotify.formatter.impl.sheet;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-/**
- * TODO: Write java doc.
- */
-@SuppressWarnings("javadoc")
-public class EvenSizeVolumeSplitterCalculatorTest {
-
-    @Test
-    public void breakpoints() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49);
-        for (int j = 1; j < i; j++) {
-            if (
-                j == 48 ||
-                j == 96 ||
-                j == 144 ||
-                j == 192 ||
-                j == 240 ||
-                j == 288 ||
-                j == 336 ||
-                j == 384 ||
-                j == 432
-            ) {
-                assertTrue("Assert that sheet is a break point: " + j, ssd.isBreakpoint(j));
-            } else {
-                assertTrue("Assert that sheet is not a break point: " + j, !ssd.isBreakpoint(j));
-            }
-        }
-    }
-
-    @Test
-    public void breakpoints_variable() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, new SplitterLimit() {
-            @Override
-            public int getSplitterLimit(int volume) {
-                return (volume % 2 == 1 ? 50 : 48);
-            }
-        });
-        for (int j = 1; j < i; j++) {
-            if (
-                j == 49 ||
-                j == 96 ||
-                j == 145 ||
-                j == 192 ||
-                j == 241 ||
-                j == 288 ||
-                j == 337 ||
-                j == 384 ||
-                j == 433
-            ) {
-                assertTrue("Assert that sheet is a break point: " + j, ssd.isBreakpoint(j));
-            } else {
-                assertTrue("Assert that sheet is not a break point: " + j, !ssd.isBreakpoint(j));
-            }
-        }
-    }
-
-    @Test
-    public void breakpointsWithOffset() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49, 1);
-        for (int j = 1; j < i; j++) {
-            if (
-                j == 44 ||
-                j == 88 ||
-                j == 132 ||
-                j == 176 ||
-                j == 220 ||
-                j == 264 ||
-                j == 307 ||
-                j == 350 ||
-                j == 393 ||
-                j == 436
-            ) {
-                assertTrue("Assert that sheet is a break point: " + j, ssd.isBreakpoint(j));
-            } else {
-                assertTrue("Assert that sheet is not a break point: " + j, !ssd.isBreakpoint(j));
-            }
-        }
-    }
-
-    @Test
-    public void breakpointsWithOffset_2() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49, 2);
-        for (int j = 1; j < i; j++) {
-            if (
-                j == 40 ||
-                j == 80 ||
-                j == 120 ||
-                j == 160 ||
-                j == 200 ||
-                j == 240 ||
-                j == 280 ||
-                j == 320 ||
-                j == 360 ||
-                j == 400 ||
-                j == 440
-            ) {
-                assertTrue("Assert that sheet is a break point: " + j, ssd.isBreakpoint(j));
-            } else {
-                assertTrue("Assert that sheet is not a break point: " + j, !ssd.isBreakpoint(j));
-            }
-        }
-    }
-
-    @Test
-    public void volumeNumber() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49);
-        int vol = 1;
-        for (int j = 1; j < i; j++) {
-            if (
-                j == 48 ||
-                j == 96 ||
-                j == 144 ||
-                j == 192 ||
-                j == 240 ||
-                j == 288 ||
-                j == 336 ||
-                j == 384 ||
-                j == 432
-            ) {
-                vol++;
-            }
-            assertEquals(
-                "Assert that sheet " + j + " is in the right volume.",
-                vol,
-                ssd.getVolumeForSheet(j)
-            );
-        }
-    }
-
-    @Test
-    public void volumeCount() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49);
-        assertTrue(
-            "Assert that number of volumes is correct: " + ssd.getVolumeCount(),
-            ssd.getVolumeCount() == 10
-        );
-    }
-
-    @Test
-    public void volumeCountWithOffset() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49, 1);
-        assertTrue(
-            "Assert that number of volumes is correct: " + ssd.getVolumeCount(),
-            ssd.getVolumeCount() == 11
-        );
-    }
-
-    @Test
-    public void volumeCountWithOffset_2() {
-        int i = 479;
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(i, 49, 2);
-        assertTrue(
-            "Assert that number of volumes is correct: " + ssd.getVolumeCount(),
-            ssd.getVolumeCount() == 12
-        );
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void sheetZeroBreakpoint() {
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(479, 49);
-        ssd.isBreakpoint(0);
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void sheetLimitBreakpoint() {
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(479, 49);
-        ssd.isBreakpoint(480);
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void sheetZeroVolumeNumber() {
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(479, 49);
-        ssd.getVolumeForSheet(0);
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void sheetLimitVolumeNumber() {
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(479, 49);
-        ssd.getVolumeForSheet(480);
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void negativeSheet() {
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(479, 49);
-        ssd.isBreakpoint(-1);
-    }
-
-    @Test(expected = IndexOutOfBoundsException.class)
-    public void negativeSheetVolumeNumber() {
-        EvenSizeVolumeSplitterCalculator ssd = new EvenSizeVolumeSplitterCalculator(479, 49);
-        ssd.getVolumeForSheet(-1);
-    }
-
-}