diff --git a/gradle.properties b/gradle.properties index 02c95bb..9f2c3a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.9.17 +version=0.9.19 diff --git a/src/main/java/w2phtml/pageSplitters/ListItemSplitter.java b/src/main/java/w2phtml/pageSplitters/ListItemSplitter.java index e0bd630..0adadf5 100644 --- a/src/main/java/w2phtml/pageSplitters/ListItemSplitter.java +++ b/src/main/java/w2phtml/pageSplitters/ListItemSplitter.java @@ -38,8 +38,11 @@ public class ListItemSplitter extends BasicSplitter implements ISplitter { listItem.removeChild(listItemChild); //System.out.println("LIST ITEM SPLITTER REMOVE SPB"); } else if (nodeName.equals(TEXT_LIST)) { - factory.split(listItemChild); - + SplitResults listSplitResults = factory.split(listItemChild); + if (listSplitResults.isDataMoved()) { + listItemFirstPart.appendChild(listSplitResults.getFirstPart()); + results.setDataMoved(true); + } } else if (nodeName.equals(TEXT_H) || nodeName.equals(TEXT_P)) { if (factory.split(listItemChild).isDataMoved()){ listItemFirstPart.appendChild(listItemChild.getPreviousSibling()); diff --git a/src/r_tests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java b/src/r_tests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java new file mode 100644 index 0000000..2c363e0 --- /dev/null +++ b/src/r_tests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java @@ -0,0 +1,31 @@ +package w2phtml.regressionTests.html5; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class SoftPageBreakInListTest { + @Test + @DisplayName("Soft page break in list") + void testExample() throws Exception { + String name = "spb_in_list"; + File input = new File("./testdocuments/input/" + name + ".odt"); + assertTrue(input.exists()); + List arguments = new ArrayList(); + arguments.add("-page_break_style"); + arguments.add("height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"); + arguments.add("-html5"); + arguments.add("./testdocuments/input/" + name + ".odt"); + arguments.add("./testdocuments/output/" + name + ".html"); + w2phtml.Application.main(arguments.toArray(new String[0])); + File result = new File("./testdocuments/output/" + name + ".html"); + File model = new File("./testdocuments/model/" + name + ".html"); + assertTrue(FileUtils.contentEquals(result, model), "The files differ!"); + } +} diff --git a/testdocuments/input/spb_in_list.odt b/testdocuments/input/spb_in_list.odt new file mode 100644 index 0000000..e7efb9e Binary files /dev/null and b/testdocuments/input/spb_in_list.odt differ diff --git a/testdocuments/model/spb_in_list.html b/testdocuments/model/spb_in_list.html new file mode 100644 index 0000000..6369cc2 --- /dev/null +++ b/testdocuments/model/spb_in_list.html @@ -0,0 +1,37 @@ + + + + + + + + +
+
+
    +
      +
    1. +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum Page 1

      +
      2. +
    +
+
+
+
+
+
+
    +
      +
    1. +

      Page 2

      +
      2. +
    +
+
+
+ +