From 450b76470cef82d521b852d02c3571a7d3c47718 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Sat, 13 Mar 2021 22:43:39 +0100 Subject: [PATCH] One more step --- .../java/w2phtml/xhtml/content/Separator.java | 158 +++++++++++------- .../w2phtml/xhtml/content/TextParser.java | 48 ++++-- 2 files changed, 126 insertions(+), 80 deletions(-) diff --git a/src/main/java/w2phtml/xhtml/content/Separator.java b/src/main/java/w2phtml/xhtml/content/Separator.java index 8f652bf..9da1b32 100644 --- a/src/main/java/w2phtml/xhtml/content/Separator.java +++ b/src/main/java/w2phtml/xhtml/content/Separator.java @@ -24,7 +24,7 @@ public class Separator { public Node currentComment = null; private static final String NONE = "none"; private static final String DIV = "div"; - private int splitLevel = 0; + private int splitFilesOutlineLevel = 0; private boolean alignSplitToPages; private int lastSplitPageNum = 1; private Integer pageNumber = null; @@ -32,9 +32,9 @@ public class Separator { private static LinkedList greenstoneStack = new LinkedList(); private int[] headingPath; - private static boolean pageOpened = false; + static boolean pageOpened = false; // headings none - private static boolean greenstoneSeparation; + private static boolean isGreenstoneCommentsNeeded; private static boolean rdfSeparation = false; // sections div none private static boolean pagination; @@ -45,9 +45,9 @@ public class Separator { public Separator(XhtmlConfig config, Converter converter) { this.converter = converter; - greenstoneSeparation = config.getGreenstoneSeparation(); + isGreenstoneCommentsNeeded = config.getGreenstoneSeparation(); pagination = config.pagination(); - splitLevel = config.getXhtmlSplitLevel(); + splitFilesOutlineLevel = config.getXhtmlSplitLevel(); alignSplitToPages = config.getAlignSplitsToPages(); breakStyle = config.getPageBreakStyle(); pageContainer = converter.pageContainer; @@ -55,44 +55,39 @@ public class Separator { headingPath = new int[10]; } - public Node breakOutline(Node currentNode, Node hnode, int pageNum) { - // Get outline level - if (isBadOutlineNode(currentNode)) { - return hnode; - } - Node outlineNode = getRealOntlineNode(currentNode); - Integer curLevel = getOutlineLevel(outlineNode); - String title = getOutlineTitle(outlineNode); + //page break found. break outline + public Node breakPageWithOutline(Node currentNode, Node hnode, int pageNum) { + - if (!greenstoneSeparation && + if (!isGreenstoneCommentsNeeded && !needPagination() && - !needCurrentLevelSplitOnThisPage(curLevel,pageNum)) { + !needOutlineSplitOnThisPage(currentNode,pageNum)) { return hnode; } - if (needCurrentLevelSplitOnThisPage(curLevel, pageNum)) { + if (needOutlineSplitOnThisPage(currentNode, pageNum)) { prevPageContainer = hnode; } if (pageOpened) { hnode = closePage(hnode); } - - if (greenstoneSeparation) { + Integer curLevel = getOutlineLevel(currentNode); + if (isGreenstoneCommentsNeeded) { closeCommentHeadings(hnode, curLevel); } - updateHeadingPath(curLevel); - - if (needCurrentLevelSplitOnThisPage(curLevel, pageNum)) { + if (needOutlineSplitOnThisPage(currentNode, pageNum)) { hnode = splitFiles(hnode); if (rdfSeparation) { setContentPath(hnode,curLevel); + String title = getOutlineTitle(currentNode); setContentName(hnode,title); } lastSplitPageNum = pageNum; } - if (greenstoneSeparation) { + if (isGreenstoneCommentsNeeded) { + String title = getOutlineTitle(currentNode); openCommentHeading(hnode, title); addToCommentStack(curLevel.toString()); } @@ -103,21 +98,58 @@ public class Separator { return hnode; } + //page break not found. break outline + public Node breakOutlineOnly(Node currentNode, Node hnode, int pageNum) { - private boolean isBadOutlineNode(Node currentNode) { - Node outlineNode = getRealOntlineNode(currentNode); - Integer curLevel = getOutlineLevel(outlineNode); + if (!isGreenstoneCommentsNeeded && + !needPagination() && + !needOutlineSplitOnThisPage(currentNode,pageNum)) { + return hnode; + } + if (needOutlineSplitOnThisPage(currentNode, pageNum)) { + prevPageContainer = hnode; + } + if (pageOpened) { + hnode = closePage(hnode); + } + Integer curLevel = getOutlineLevel(currentNode); + if (isGreenstoneCommentsNeeded) { + closeCommentHeadings(hnode, curLevel); + } + updateHeadingPath(curLevel); + if (needOutlineSplitOnThisPage(currentNode, pageNum)) { + hnode = splitFiles(hnode); + if (rdfSeparation) { + setContentPath(hnode,curLevel); + String title = getOutlineTitle(currentNode); + setContentName(hnode,title); + } + lastSplitPageNum = pageNum; + } + if (isGreenstoneCommentsNeeded) { + String title = getOutlineTitle(currentNode); + openCommentHeading(hnode, title); + addToCommentStack(curLevel.toString()); + } + if (needPagination()) { + hnode = openPage(hnode, pageNum); + } + return hnode; + } + + public static boolean isNotOutlineNode(Node currentNode) { + Integer curLevel = getOutlineLevel(currentNode); if (curLevel < 1) { return true; } - String title = getOutlineTitle(outlineNode); + String title = getOutlineTitle(currentNode); if (title == null || title.isEmpty()) { return true; } return false; } - private Node getRealOntlineNode(Node currentNode) { + private static Node getRealOntlineNode(Node currentNode) { Node outlineNode = null; if (currentNode.getNodeName().contentEquals(TABLE_TABLE)) { outlineNode = getOulineNodeFromTable(currentNode); @@ -127,8 +159,9 @@ public class Separator { return outlineNode; } - private int getOutlineLevel(Node currentNode) { - String levelAttr = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL); + private static int getOutlineLevel(Node currentNode) { + Node outlineNode = getRealOntlineNode(currentNode); + String levelAttr = getAttribute(outlineNode, XMLString.TEXT_OUTLINE_LEVEL); if (levelAttr == null || levelAttr.isEmpty()) { return 0; } else { @@ -136,7 +169,7 @@ public class Separator { } } - private Node getOulineNodeFromTable(Node currentNode) { + private static Node getOulineNodeFromTable(Node currentNode) { NodeList tableNodes = currentNode.getChildNodes(); int i = 0; while (i < tableNodes.getLength()) { @@ -172,11 +205,11 @@ public class Separator { } - private boolean needChapterSplits() { - if (splitLevel > 0 ) { + public boolean configuredOutlineSplits() { + if (isFilesSplitLevelSet() ) { return true; } - if (greenstoneSeparation) { + if (isGreenstoneCommentsNeeded) { return true; } if (rdfSeparation) { @@ -184,8 +217,12 @@ public class Separator { } return false; } + + private boolean isFilesSplitLevelSet() { + return splitFilesOutlineLevel > 0; + } - private boolean needPagination() { + boolean needPagination() { if (pagination) { return true; } @@ -224,11 +261,15 @@ public class Separator { ((Element) hnode).setAttribute("path", path.toString()); } - private boolean needCurrentLevelSplitOnThisPage(int curLevel, int curPage) { - if (!needChapterSplits()) { + boolean needOutlineSplitOnThisPage(Node currentNode, int curPage) { + if (!configuredOutlineSplits()) { return false; } - if ( splitLevel >= curLevel ) { + if (isNotOutlineNode(currentNode)) { + return false; + } + Integer curLevel = getOutlineLevel(currentNode); + if ( splitFilesOutlineLevel >= curLevel ) { if (alignSplitToPages) { if (lastSplitPageNum != curPage) { return true; @@ -239,19 +280,27 @@ public class Separator { } return false; } - + public boolean isPageOpened() { return pageOpened; } - + public Node turnPage(Node hnode, int pageNum){ + if (needPagination()) { + if (pageOpened) { + hnode = closePage(hnode); + } + hnode = openPage(hnode, pageNum); + } + return hnode; + } /** * Opens main document section heading tag */ public Node startDocumentSeparation(Node hnode, String title, int pageNum) { - if (!greenstoneSeparation && !needPagination()) { + if (!isGreenstoneCommentsNeeded && !needPagination()) { return hnode; } - if (greenstoneSeparation) { + if (isGreenstoneCommentsNeeded) { // Create global section openCommentHeading(hnode, title); } @@ -262,13 +311,13 @@ public class Separator { // Method to close open tags at the end of the document public Node endDocument(Node hnode) { - if (!greenstoneSeparation && !needPagination()) { + if (!isGreenstoneCommentsNeeded && !needPagination()) { return hnode; } if (pageOpened) { hnode = closePage(hnode); } - if (greenstoneSeparation) { + if (isGreenstoneCommentsNeeded) { closeCommentHeadings(hnode, 0); // Close global section addCloseComment(hnode); @@ -359,7 +408,8 @@ public class Separator { } public static String getOutlineTitle(Node currentNode) { - Node content = currentNode.cloneNode(true); + Node outlineNode = getRealOntlineNode(currentNode); + Node content = outlineNode.cloneNode(true); NodeList lineBreaks = ((Element) content).getElementsByTagName(XMLString.TEXT_LINE_BREAK); NodeList textTabs = ((Element) content).getElementsByTagName(XMLString.TEXT_TAB); @@ -487,7 +537,7 @@ public class Separator { } public void appendMetadata(String name, String value) { - if (!greenstoneSeparation) { + if (!isGreenstoneCommentsNeeded) { return; } if (currentComment == null) { @@ -506,22 +556,4 @@ public class Separator { } } - public Node breaksOrOutline(Node currentNode, Node hnode, int pageNum) { - - if (isBadOutlineNode(currentNode)) { - if (!needPagination()) { - return hnode; - } - if (pageOpened) { - hnode = closePage(hnode); - } - hnode = openPage(hnode, pageNum); - - return hnode; - } else { - hnode = breakOutline(currentNode, hnode, pageNum); - } - return hnode; - } - } diff --git a/src/main/java/w2phtml/xhtml/content/TextParser.java b/src/main/java/w2phtml/xhtml/content/TextParser.java index 3ec5072..e96940a 100644 --- a/src/main/java/w2phtml/xhtml/content/TextParser.java +++ b/src/main/java/w2phtml/xhtml/content/TextParser.java @@ -1222,15 +1222,15 @@ public class TextParser extends Parser { } } - boolean firstSeparation = (currentMasterPage == null) ; - if (firstSeparation && style != null) { + boolean isMasterPageNull = (currentMasterPage == null) ; + if (isMasterPageNull && style != null) { hnode = startDocument(hnode, style); } - if (isPageBreakFound(style) && !firstSeparation) { + if (isPageBreakFound(style) && !isMasterPageNull) { hnode = breakPage(currentNode, hnode, style); - } else { - hnode = docSep.breakOutline(currentNode, hnode, pageNum); + } else if (!Separator.isNotOutlineNode(currentNode)) { + hnode = docSep.breakOutlineOnly(currentNode, hnode, pageNum); } setBreakPageBeforeNextFromStyle(style); return hnode; @@ -1243,6 +1243,13 @@ public class TextParser extends Parser { breakPageBeforeNextNode = false; } } + + private boolean isOutlineBreakFound(Node currentNode) { + if (docSep.needOutlineSplitOnThisPage(currentNode, pageNum)) { + return true; + } + return false; + } private boolean isPageBreakFound(StyleWithProperties style) { return hasMasterPage(style) || hasBreakBefore(style) || breakPageBeforeNextNode; @@ -1266,15 +1273,27 @@ public class TextParser extends Parser { private Node breakPage(Node currentNode, Node hnode, StyleWithProperties style) { // Insert footnotes - insertFootnotes(hnode,false); - - // Add previous MP footer - //hnode = exitPageContainer((Element) hnode); - addFooter(hnode); - // Update MP + if (docSep.needPagination()) { + insertFootnotes(hnode,false); + addFooter(hnode); + } updateMasterPageWith(style); setPageContainerStyle(); - // Set new page number if defined or increment if not + setNewPageNumber(style); + + if (Separator.isNotOutlineNode(currentNode)) { + hnode = docSep.turnPage(hnode, pageNum); + } else { + hnode = docSep.breakPageWithOutline(currentNode, hnode, pageNum); + } + + if (docSep.needPagination()) { + addHeader(hnode); + } + return hnode; + } + + private void setNewPageNumber(StyleWithProperties style) { Integer newPageNumber = getPageNumberFromStyle(style); if (newPageNumber != null) { pageNum = newPageNumber; @@ -1282,11 +1301,6 @@ public class TextParser extends Parser { pageNum++; fitPageNumberToMasterPageStyle(); } - hnode = docSep.breaksOrOutline(currentNode, hnode, pageNum); - - // Print new header - addHeader(hnode); - return hnode; } private boolean inUnreakableElement() {