diff --git a/build.gradle b/build.gradle index c76ddd9..3981c14 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' repositories{ mavenCentral() } -def releaseVersion = "0.5.12" +def releaseVersion = "0.5.13" def propertyFile = file "src/main/java/w2phtml/project.properties" Properties properties = new Properties() propertyFile.withReader { properties.load(it) } diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties index 57183de..41cf32c 100644 --- a/src/main/java/w2phtml/project.properties +++ b/src/main/java/w2phtml/project.properties @@ -1,3 +1,3 @@ -#Wed Apr 22 20:17:51 CEST 2020 -releaseVersion=0.5.7 -releaseDate=20\:17\:51 22-04-2020 +#Thu Jun 25 12:35:29 CEST 2020 +releaseVersion=0.5.12 +releaseDate=12\:35\:29 25-06-2020 diff --git a/src/main/java/w2phtml/xhtml/content/Separator.java b/src/main/java/w2phtml/xhtml/content/Separator.java index 66e6586..9847daf 100644 --- a/src/main/java/w2phtml/xhtml/content/Separator.java +++ b/src/main/java/w2phtml/xhtml/content/Separator.java @@ -68,7 +68,8 @@ public class Separator { int curLevel = Integer.parseInt(sLevel); - if (noSplitNeeded(pageNum, curLevel)) { + if (noSplitNeeded(pageNum, curLevel)) { + System.out.println("No split needed"); return hnode; } @@ -112,7 +113,7 @@ public class Separator { } private boolean noSplitNeeded(int pageNum, int curLevel) { - return !greenstoneSeparation && !isSplitTime(curLevel,pageNum); + return !greenstoneSeparation && !pagination && !isSplitTime(curLevel,pageNum); } private void addToCommentStack(String sLevel) { diff --git a/src/main/oxt/description.xml b/src/main/oxt/description.xml index be2f68f..be47707 100644 --- a/src/main/oxt/description.xml +++ b/src/main/oxt/description.xml @@ -3,7 +3,7 @@ <identifier value="pro.litvinovg.writer2paginatedhtml"/> - <version value="0.5.10"/> + <version value="0.5.12"/> <dependencies> <OpenOffice.org-minimal-version d:name="OpenOffice.org 3.0" value="3.0"/>