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

New test added

Browse source
This commit is contained in:
Georgy Litvinov 2021-03-12 20:54:42 +01:00
parent d7d4b4083e
commit 6aeeed4b54
4 changed files with 71 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/w2phtml/pageSplitters/ListSplitter.java
View file

@ -79,7 +79,9 @@ public class ListSplitter extends BasicSplitter implements ISplitter {
//Debug.prettyPrintXml(list.getOwnerDocument()); //Debug.prettyPrintXml(list.getOwnerDocument());
((Element) list).setAttribute(TEXT_CONTINUE_NUMBERING, "true"); ((Element) list).setAttribute(TEXT_CONTINUE_NUMBERING, "true");
parent.insertBefore(listFirstPart, list); parent.insertBefore(listFirstPart, list);
//parent.insertBefore(softPageBreak, list); if (isRootElement(list)) {
parent.insertBefore(softPageBreak, list);
}
results.setSPB(softPageBreak); results.setSPB(softPageBreak);
// System.out.println("LIST FIRST PART"); // System.out.println("LIST FIRST PART");
// Debug.printNode(listFirstPart); // Debug.printNode(listFirstPart);

31
src/r_tests/java/w2phtml/regressionTests/html5/BulletList.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 BulletList {
@Test
@DisplayName("List on multiple pages")
void testExample() throws Exception {
String name = "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/list.odt Normal file
View file

Binary file not shown.

37
testdocuments/model/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>Default</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;}
</style>
</head>
<body dir="ltr">
<div class="pageNum" page="1">
<div class="pageContainer" style="column-count: 1;">
<ul style="list-style-type:disc;clear:left;margin-top:0;font-family:OpenSymbol;margin-bottom:0;">
<li>
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:3.3333335rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">Text text</p>
</li>
</ul>
</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;">
<ul start="2" style="list-style-type:disc;clear:left;margin-top:0;font-family:OpenSymbol;margin-bottom:0;">
<li>
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:3.3333335rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">text adfa </p>
</li>
</ul>
</div>
</div>
<div class="pageBreak" style="height:3em;margin-top:1em;margin-bottom:1em;background-color:red;"> </div>
<div class="pageNum" page="3">
<div class="pageContainer" style="column-count: 1;">
<p class="Textbody" style="margin-left:0;border:none;padding:0;text-indent:2.1259842rem;font-size:3.3333335rem;margin-top:0;font-family:&apos;IPH Astra Serif&apos;,serif;margin-bottom:0.58346456rem;margin-right:0;">fadfasdf</p>
</div>
</div>
</body>
</html>