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

Reopen page container after exit from section as page styles could have changed.

Browse source
This commit is contained in:
Georgy Litvinov 2021-02-13 00:01:53 +01:00
parent 3c10ed4b1c
commit 4c8548fc09
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/w2phtml/xhtml/content/TextParser.java
View file

@ -168,10 +168,10 @@ public class TextParser extends Parser {
if (pagination) { if (pagination) {
//ODFPageSplitter.splitOfficeText(onode, ofr); //ODFPageSplitter.splitOfficeText(onode, ofr);
//Debug.prettyPrintXml(onode); //Debug.prettyPrintXml(onode.getOwnerDocument());
SplitFactory splitters = new SplitFactory(ofr); SplitFactory splitters = new SplitFactory(ofr);
splitters.split(onode); splitters.split(onode);
//Debug.prettyPrintXml(onode); //Debug.prettyPrintXml(onode.getOwnerDocument());
} }
hnode = (Element)traverseBlockText(onode,hnode); hnode = (Element)traverseBlockText(onode,hnode);
@ -430,10 +430,14 @@ public class TextParser extends Parser {
if (!displayHiddenText && "none".equals(Misc.getAttribute(onode,TEXT_DISPLAY))) { return hnode; } if (!displayHiddenText && "none".equals(Misc.getAttribute(onode,TEXT_DISPLAY))) { return hnode; }
if (pageWasOpened && !inTable) {hnode = docSep.closePage(hnode);} if (pageWasOpened && !inTable) {
hnode = docSep.closePage(hnode);
}
boolean removeStyleAtExit = setSectionStyle(onode); boolean removeStyleAtExit = setSectionStyle(onode);
if (pageWasOpened && !inTable) {hnode = docSep.openPage(hnode, pageNum);} if (pageWasOpened && !inTable) {
hnode = docSep.openPage(hnode, pageNum);
}
hnode = traverseBlockText(onode, hnode); hnode = traverseBlockText(onode, hnode);
if (isLast) { if (isLast) {
insertEndnotes((Element) hnode, sectionName); insertEndnotes((Element) hnode, sectionName);
@ -445,6 +449,11 @@ public class TextParser extends Parser {
pageContainer.removeStyle(); pageContainer.removeStyle();
} }
if ( docSep.isPageOpened()) {
hnode = docSep.closePage(hnode);
hnode = docSep.openPage(hnode, pageNum);
}
return hnode; return hnode;
} }