litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

fix: correct splitting of nested lists with soft page breaks

Browse source
This commit is contained in:
Georgy Litvinov 2021-07-31 17:07:10 +02:00
parent 5f1b0bd3d8
commit 253007416e
5 changed files with 74 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1 +1 @@
version=0.9.17 version=0.9.19

7
src/main/java/w2phtml/pageSplitters/ListItemSplitter.java
View file

@ -38,8 +38,11 @@ public class ListItemSplitter extends BasicSplitter implements ISplitter {
listItem.removeChild(listItemChild); listItem.removeChild(listItemChild);
//System.out.println("LIST ITEM SPLITTER REMOVE SPB"); //System.out.println("LIST ITEM SPLITTER REMOVE SPB");
} else if (nodeName.equals(TEXT_LIST)) { } 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)) { } else if (nodeName.equals(TEXT_H) || nodeName.equals(TEXT_P)) {
if (factory.split(listItemChild).isDataMoved()){ if (factory.split(listItemChild).isDataMoved()){
listItemFirstPart.appendChild(listItemChild.getPreviousSibling()); listItemFirstPart.appendChild(listItemChild.getPreviousSibling());

31
src/r_tests/java/w2phtml/regressionTests/html5/SoftPageBreakInListTest.java Normal file
View file

@ -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<String> arguments = new ArrayList<String>();
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!");
}
}

BIN
testdocuments/input/spb_in_list.odt Normal file
View file

Binary file not shown.

37
testdocuments/model/spb_in_list.html Normal file
View file

@ -0,0 +1,37 @@
<!DOCTYPE html>
<html lang="ru-RU" xml:lang="ru-RU" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title></title>
<meta charset="UTF-8" />
<style media="all" type="text/css">
body {margin-left:auto;max-width:800px;font-size:1.0rem;font-family:'IPH Lib Serif';margin-right:auto;}
a:link {text-decoration:none;font-family:'IPH Astra Serif',serif;}
a:visited {text-decoration:none;font-family:'IPH Astra Serif',serif;}
</style>
</head>
<body dir="ltr">
<div class="pageNum" page="1">
<div class="pageContainer" style="column-count: 1;">
<ol class="listlevel1Numbering123" style="list-style-type:decimal;clear:left;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0;">
<ol class="listlevel2Numbering123" style="list-style-type:decimal;clear:left;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0;">
<li>
<p class="qwerty" style="margin-left:0;background-color:transparent;border:none;padding:0;text-indent:1.6535434rem;text-decoration:none;font-size:0.8333334rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0;margin-right:0;text-align:justify;"><span lang="en-US" xml:lang="en-US">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</span></p>
</li>
</ol>
</ol>
</div>
</div>
<div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div>
<div class="pageNum" page="2">
<div class="pageContainer" style="column-count: 1;">
<ol class="listlevel1Numbering123" start="2" style="list-style-type:decimal;clear:left;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0;">
<ol class="listlevel2Numbering123" start="2" style="list-style-type:decimal;clear:left;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0;">
<li>
<p class="qwerty" lang="en-US" style="margin-left:0;background-color:transparent;border:none;padding:0;text-indent:1.6535434rem;text-decoration:none;font-size:0.8333334rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0;margin-right:0;text-align:justify;" xml:lang="en-US">Page 2</p>
</li>
</ol>
</ol>
</div>
</div>
</body>
</html>