From 3e4c0db70348d88400daa7c3b36e9a3d02ed901b Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 11 Mar 2020 14:42:19 +0100 Subject: [PATCH] Remove unused properties --- src/main/java/w2phtml/project.properties | 4 ++-- .../w2phtml/xhtml/content/ListParser.java | 5 ---- .../w2phtml/xhtml/content/TextParser.java | 23 ++++++------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/main/java/w2phtml/project.properties b/src/main/java/w2phtml/project.properties index 76a0d05..c24a7d4 100644 --- a/src/main/java/w2phtml/project.properties +++ b/src/main/java/w2phtml/project.properties @@ -1,3 +1,3 @@ -#Wed Mar 11 12:00:39 CET 2020 +#Wed Mar 11 14:33:41 CET 2020 releaseVersion=0.5.5 -releaseDate=12\:00\:39 11-03-2020 +releaseDate=14\:33\:41 11-03-2020 diff --git a/src/main/java/w2phtml/xhtml/content/ListParser.java b/src/main/java/w2phtml/xhtml/content/ListParser.java index 834e593..b2c5d3b 100644 --- a/src/main/java/w2phtml/xhtml/content/ListParser.java +++ b/src/main/java/w2phtml/xhtml/content/ListParser.java @@ -175,10 +175,7 @@ public class ListParser extends Parser { traverseListItem(child,nLevel,styleName,hnode); } else { - // add an li element - //if (counter!=null) { sCurrentListLabel = counter.step(nLevel).getLabel(); - //} currentListStyle = ofr.getListStyle(styleName); nCurrentListLevel = nLevel; Element item = converter.createElement("li"); @@ -193,9 +190,7 @@ public class ListParser extends Parser { TEXT_START_VALUE),1); if (bRestart) { item.setAttribute("value",Integer.toString(nStartValue)); - //if (counter!=null) { sCurrentListLabel = counter.restart(nLevel,nStartValue).getLabel(); - //} } } traverseListItem(child,nLevel,styleName,item); diff --git a/src/main/java/w2phtml/xhtml/content/TextParser.java b/src/main/java/w2phtml/xhtml/content/TextParser.java index 52c8b02..2d2075b 100644 --- a/src/main/java/w2phtml/xhtml/content/TextParser.java +++ b/src/main/java/w2phtml/xhtml/content/TextParser.java @@ -63,18 +63,12 @@ public class TextParser extends Parser { // Some (Sony?) EPUB readers have a limit on the file size of individual files // In any case very large files could be a performance problem, hence we do automatic splitting // after this number of characters. - private int nSplitAfter = 150000; - // TODO: Collect soft page breaks between table rows - private boolean bPendingPageBreak = false; // We have encountered a page break which should be inserted asap - private int splitHeadingLevel = 0; // The outline level at which to split files (0=no split) + //private int nSplitAfter = 150000; + private int splitHeadingLevel = 0; // The outline level at which to split files (0=no split) private int nRepeatLevels = 5; // The number of levels to repeat when splitting (0=no repeat) - private int nLastSplitLevel = 1; // The outline level at which the last split occurred Element[] currentHeading = new Element[7]; // Last headings (repeated when splitting) - private int nCharacterCount = 0; // The number of text characters in the current document // Counters for generated numbers - private ListCounter outlineNumbering; - private Hashtable listCounters = new Hashtable(); private String sCurrentListLabel = null; private ListStyle currentListStyle = null; private int nCurrentListLevel = 0; @@ -133,12 +127,11 @@ public class TextParser extends Parser { indexCv = new AlphabeticalIndexParser(ofr, config, converter); footCv = new FootnoteParser(ofr, config, converter); endCv = new EndnoteParser(ofr, config, converter); - nSplitAfter = 1000*config.splitAfter(); + // nSplitAfter = 1000*config.splitAfter(); splitHeadingLevel = config.getXhtmlSplitLevel(); nRepeatLevels = converter.isOPS() ? 0 : config.getXhtmlRepeatLevels(); // never repeat headings in EPUB nFloatMode = ofr.isText() && config.xhtmlFloatObjects() ? - DrawParser.FLOATING : DrawParser.ABSOLUTE; - outlineNumbering = new ListCounter(ofr.getOutlineStyle()); + DrawParser.FLOATING : DrawParser.ABSOLUTE; displayHiddenText = config.displayHiddenText(); pageContainer = converter.pageContainer; docSep = new Separator(config, converter); @@ -272,7 +265,6 @@ public class TextParser extends Parser { else if (nodeName.equals(TEXT_P)) { StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME)); hnode = processPageBreaks(child, hnode,style); - nCharacterCount+=OfficeReader.getCharacterCount(child); // is there a block element, we should use? XhtmlStyleMap xpar = config.getXParStyleMap(); String sDisplayName = style!=null ? style.getDisplayName() : null; @@ -319,7 +311,6 @@ public class TextParser extends Parser { StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME)); Node rememberNode = hnode; hnode = processPageBreaks(child, hnode, style); - nCharacterCount+=OfficeReader.getCharacterCount(child); handleHeading((Element)child,(Element)hnode,rememberNode!=hnode); } else if (nodeName.equals(TEXT_LIST) || // oasis @@ -632,8 +623,8 @@ public class TextParser extends Parser { * Process a text:p tag */ private void handleParagraph(Node onode, Node hnode) { - boolean bIsEmpty = OfficeReader.isWhitespaceContent(onode); - if (config.ignoreEmptyParagraphs() && bIsEmpty) { return; } + boolean isEmptyParagraph = OfficeReader.isWhitespaceContent(onode); + if (config.ignoreEmptyParagraphs() && isEmptyParagraph) { return; } String styleName = Misc.getAttribute(onode,TEXT_STYLE_NAME); StyleWithProperties style = ofr.getParStyle(styleName); if (!displayHiddenText && style!=null && "none".equals(style.getProperty(TEXT_DISPLAY))) { return; } @@ -650,7 +641,7 @@ public class TextParser extends Parser { // Maybe add to toc tocParser.handleParagraph((Element)onode, par, sCurrentListLabel); - if (!bIsEmpty) { + if (!isEmptyParagraph) { par = createTextBackground(par, styleName); if (config.listFormatting()==XhtmlConfig.HARD_LABELS) { getListParser().insertListLabel(currentListStyle, nCurrentListLevel, "ItemNumber", null, sCurrentListLabel, par);