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

Move first part of list in section splitting to section first part and remove SPB inserted in list splitter. Previous behaviour led to wrong pagination.

Browse source
This commit is contained in:
Georgy Litvinov 2021-02-12 23:10:24 +01:00
parent 893e09c916
commit 001fbd2acc
3 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ public class ListSplitter extends BasicSplitter implements ISplitter {
Element softPageBreak = document.createElement(TEXT_SOFT_PAGE_BREAK); Element softPageBreak = document.createElement(TEXT_SOFT_PAGE_BREAK);
Node nextPageItemPart = null; Node nextPageItemPart = null;
int i = 0; int i = 0;
SplitResults results = new SplitResults(false); SplitResults results = new SplitResults(false,listFirstPart);
while (listNodes.getLength() > i) { while (listNodes.getLength() > i) {
Node child = listNodes.item(i); Node child = listNodes.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE) { if (child.getNodeType() == Node.ELEMENT_NODE) {
@ -79,6 +79,7 @@ public class ListSplitter extends BasicSplitter implements ISplitter {
((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); parent.insertBefore(softPageBreak, list);
results.setSPB(softPageBreak);
// System.out.println("LIST FIRST PART"); // System.out.println("LIST FIRST PART");
// Debug.printNode(listFirstPart); // Debug.printNode(listFirstPart);
// TODO: Create dummy list style to override list item to not teleport // TODO: Create dummy list style to override list item to not teleport

8
src/main/java/w2phtml/pageSplitters/SectionSplitter.java
View file

@ -62,8 +62,14 @@ public class SectionSplitter extends BasicSplitter implements ISplitter {
results.setDataMoved(true); results.setDataMoved(true);
} }
} else if (nodeName.equals(TEXT_LIST)) { } else if (nodeName.equals(TEXT_LIST)) {
if (factory.split(child).isDataMoved()){ SplitResults listSplitResults = factory.split(child);
if (listSplitResults.isDataMoved()){
results.setDataMoved(true); results.setDataMoved(true);
sectionFirstPart.appendChild(listSplitResults.getFirstPart());
Node textListSpb = listSplitResults.getSPB();
if (textListSpb != null) {
textListSpb.getParentNode().removeChild(textListSpb);
}
} }
} else { } else {
System.out.println("Error. SPB in Section child node " + nodeName); System.out.println("Error. SPB in Section child node " + nodeName);

25
src/main/java/w2phtml/pageSplitters/SplitResults.java
View file

@ -1,13 +1,23 @@
package w2phtml.pageSplitters; package w2phtml.pageSplitters;
import org.w3c.dom.Node;
public class SplitResults { public class SplitResults {
private boolean dataMoved; private boolean dataMoved;
private Node firstPart;
private Node SPB;
public SplitResults(boolean dataMoved) { public SplitResults(boolean dataMoved) {
this.setDataMoved(dataMoved); this.setDataMoved(dataMoved);
this.firstPart = null;
} }
public SplitResults(boolean dataMoved, Node firstPart) {
this.setDataMoved(dataMoved);
this.firstPart = firstPart;
}
public boolean isDataMoved() { public boolean isDataMoved() {
return dataMoved; return dataMoved;
@ -16,4 +26,19 @@ public class SplitResults {
public void setDataMoved(boolean dataMoved) { public void setDataMoved(boolean dataMoved) {
this.dataMoved = dataMoved; this.dataMoved = dataMoved;
} }
public Node getFirstPart() {
return firstPart;
}
public void setFirstPart(Node firstPart) {
this.firstPart = firstPart;
}
public Node getSPB() {
return SPB;
}
public void setSPB(Node sPB) {
SPB = sPB;
}
} }