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

Fixed lost heading sections

Browse source
This commit is contained in:
Georgy Litvinov 2016-09-25 21:42:44 +03:00 • committed by Georgy Litvinov
parent faee542d26
commit acd74dee18
2 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/java/writer2latex/xhtml/GreenstoneTags.java
View file

@ -33,7 +33,6 @@ public class GreenstoneTags {
//Get outline level //Get outline level
String sLevel = Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL); String sLevel = Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL);
if (sLevel == null || sLevel.isEmpty()) { if (sLevel == null || sLevel.isEmpty()) {
System.out.println("Error occurred. Expected Outline level here!");
return hnode; return hnode;
} }
int nLevel = Integer.parseInt(sLevel); int nLevel = Integer.parseInt(sLevel);

67
source/java/writer2latex/xhtml/TextConverter.java
View file

@ -1581,44 +1581,39 @@ public class TextConverter extends ConverterHelper {
} }
if (currentMasterPage == null && style != null) { if (currentMasterPage == null && style != null) {
hnode = StartMasterPage(hnode, style, newPageNumber); hnode = StartMasterPage(hnode, style, newPageNumber);
} else { } else if (checkMasterPageBreak(style) || checkHardBreakBefore(style) || breakBeforeNextNode) {
//If old master page was defined // Insert footnotes
footCv.insertFootnotes(hnode, true);
//If new master page definition found // Add previous MP footer
//Or if fo:break-before found addFooter(hnode);
//Or if soft-page-break or fo:break-after appeared before this node // Update MP
if (checkMasterPageBreak(style) || checkHardBreakBefore(style) || breakBeforeNextNode) { updateMasterPage(style);
//Insert footnotes // Set new page number if defined or increment if not
footCv.insertFootnotes(hnode, true); if (newPageNumber != null) {
//Add previous MP footer pageNum = newPageNumber;
addFooter(hnode); } else {
//Update MP pageNum++;
updateMasterPage(style); fitPageNumberToMasterPageStyle();
//Set new page number if defined or increment if not
if (newPageNumber != null) {
pageNum = newPageNumber;
} else {
pageNum++;
fitPageNumberToMasterPageStyle();
}
if ( currentNode.getNodeType() == Node.ELEMENT_NODE
&& Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL) != null
&& !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()
){
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum);
} else {
hnode = GreenstoneTags.processPageBreak(currentNode, hnode, pageNum);
}
//Print new header
addHeader(hnode);
breakBeforeNextNode = false;
return hnode;
} }
if (currentNode.getNodeType() == Node.ELEMENT_NODE
&& Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL) != null
&& !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()) {
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum);
} else {
hnode = GreenstoneTags.processPageBreak(currentNode, hnode, pageNum);
}
// Print new header
addHeader(hnode);
breakBeforeNextNode = false;
return hnode;
} else {
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum);
} }
//Create method to process Section -> Something -> Foo-break-before //Create method to process Section -> Something -> Foo-break-before
/*currentNode.getNextSibling() /*currentNode.getNextSibling()