Skip page breaking on inner elements and inner sections if BREAK_BEFORE already processed on outer section

src/main/java/w2phtml/xhtml/content/TextParser.java

@@ -45,7 +45,6 @@ import w2phtml.office.XMLString;
 import w2phtml.pageSplitters.SplitFactory;
 import w2phtml.util.Misc;
 import w2phtml.xhtml.Converter;
-import w2phtml.xhtml.ODFPageSplitter;
 import w2phtml.xhtml.Parser;
 import w2phtml.xhtml.StyleInfo;
 import w2phtml.xhtml.XhtmlConfig;
@@ -122,6 +121,7 @@ public class TextParser extends Parser {
 	private String footnotesContext = null;
 	PageContainer pageContainer = null;
 	private boolean applyAnnotationMetadata;
+	private boolean breakBeforeSectionHappened = false;
 
     public TextParser(OfficeReader ofr, XhtmlConfig config, Converter converter) {
         super(ofr,config,converter);
@@ -168,9 +168,10 @@ public class TextParser extends Parser {
        
         if (pagination) {
         	//ODFPageSplitter.splitOfficeText(onode, ofr);
+        	//Debug.prettyPrintXml(onode);
         	SplitFactory splitters = new SplitFactory(ofr);
         	splitters.split(onode);
-        	//Debug.printNode(onode);
+        	//Debug.prettyPrintXml(onode);
         }
 	      hnode = (Element)traverseBlockText(onode,hnode);
         
@@ -266,8 +267,6 @@ public class TextParser extends Parser {
             Node child = nList.item(i);
             if (child.getNodeType() == Node.ELEMENT_NODE) {
                 String nodeName = child.getNodeName();
-                // Block splitting
-            //    System.out.println("CURNODE " + nodeName);                             
                 if (OfficeReader.isDrawElement(child)) {
                     getDrawParser().handleDrawElement((Element)child,(Element)hnode,null,nFloatMode);
                 }
@@ -1190,6 +1189,41 @@ public class TextParser extends Parser {
 			hnode = startDocument(hnode, style, newPageNumber);
 			hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum);
 		} else if (hasMasterPage(style) || hasBreakBefore(style) || breakBeforeNextNode) {
+			 if (hasBreakBefore(style)) {
+				 
+				 if (currentNode.getNodeName() == TEXT_SECTION) {
+					 if (breakBeforeSectionHappened) {
+						 //skip one more section;
+						 return hnode;
+					 } else {
+						 breakBeforeSectionHappened = true; 
+					 }
+				 } else {
+					 //assume in inner element, break happened, skip break.
+					 if (breakBeforeSectionHappened) {
+						 breakBeforeSectionHappened = false;
+						 return hnode;	 
+					 }
+				 }
+			 }
+			hnode = breakPage(currentNode, hnode, style, newPageNumber);
+			
+			return hnode;
+
+		} else {
+			hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum);
+		}
+
+		if (checkHardBreakAfter(style)) {
+			breakBeforeNextNode = true;
+		} else {
+			breakBeforeNextNode = false;
+		}
+		
+		return hnode;
+	}
+
+	private Node breakPage(Node currentNode, Node hnode, StyleWithProperties style, Integer newPageNumber) {
 		// Insert footnotes
 		insertFootnotes(hnode,false);	
 		
@@ -1214,18 +1248,6 @@ public class TextParser extends Parser {
 		//hnode = enterPageContainer(hnode);
 		breakBeforeNextNode = false;
 		return hnode;
-
-		} else {
-			hnode = docSep.processOutlineLevel(currentNode, hnode, pageNum);
-		}
-
-		if (checkHardBreakAfter(style)) {
-			breakBeforeNextNode = true;
-		} else {
-			breakBeforeNextNode = false;
-		}
-		
-		return hnode;
 	}
 
 	private boolean inUnreakableElement() {