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

Remove unused properties

Browse source
This commit is contained in:
Georgy Litvinov 2020-03-11 14:42:19 +01:00
parent 3581998f01
commit 3e4c0db703
3 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/w2phtml/project.properties
View file

@ -1,3 +1,3 @@
#Wed Mar 11 12:00:39 CET 2020 #Wed Mar 11 14:33:41 CET 2020
releaseVersion=0.5.5 releaseVersion=0.5.5
releaseDate=12\:00\:39 11-03-2020 releaseDate=14\:33\:41 11-03-2020

5
src/main/java/w2phtml/xhtml/content/ListParser.java
View file

@ -175,10 +175,7 @@ public class ListParser extends Parser {
traverseListItem(child,nLevel,styleName,hnode); traverseListItem(child,nLevel,styleName,hnode);
} }
else { else {
// add an li element
//if (counter!=null) {
sCurrentListLabel = counter.step(nLevel).getLabel(); sCurrentListLabel = counter.step(nLevel).getLabel();
//}
currentListStyle = ofr.getListStyle(styleName); currentListStyle = ofr.getListStyle(styleName);
nCurrentListLevel = nLevel; nCurrentListLevel = nLevel;
Element item = converter.createElement("li"); Element item = converter.createElement("li");
@ -193,9 +190,7 @@ public class ListParser extends Parser {
TEXT_START_VALUE),1); TEXT_START_VALUE),1);
if (bRestart) { if (bRestart) {
item.setAttribute("value",Integer.toString(nStartValue)); item.setAttribute("value",Integer.toString(nStartValue));
//if (counter!=null) {
sCurrentListLabel = counter.restart(nLevel,nStartValue).getLabel(); sCurrentListLabel = counter.restart(nLevel,nStartValue).getLabel();
//}
} }
} }
traverseListItem(child,nLevel,styleName,item); traverseListItem(child,nLevel,styleName,item);

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

@ -63,18 +63,12 @@ public class TextParser extends Parser {
// Some (Sony?) EPUB readers have a limit on the file size of individual files // 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 // In any case very large files could be a performance problem, hence we do automatic splitting
// after this number of characters. // after this number of characters.
private int nSplitAfter = 150000; //private int nSplitAfter = 150000;
// TODO: Collect soft page breaks between table rows private int splitHeadingLevel = 0; // The outline level at which to split files (0=no split)
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 nRepeatLevels = 5; // The number of levels to repeat when splitting (0=no repeat) 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) 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 // Counters for generated numbers
private ListCounter outlineNumbering;
private Hashtable<String, ListCounter> listCounters = new Hashtable<String, ListCounter>();
private String sCurrentListLabel = null; private String sCurrentListLabel = null;
private ListStyle currentListStyle = null; private ListStyle currentListStyle = null;
private int nCurrentListLevel = 0; private int nCurrentListLevel = 0;
@ -133,12 +127,11 @@ public class TextParser extends Parser {
indexCv = new AlphabeticalIndexParser(ofr, config, converter); indexCv = new AlphabeticalIndexParser(ofr, config, converter);
footCv = new FootnoteParser(ofr, config, converter); footCv = new FootnoteParser(ofr, config, converter);
endCv = new EndnoteParser(ofr, config, converter); endCv = new EndnoteParser(ofr, config, converter);
nSplitAfter = 1000*config.splitAfter(); // nSplitAfter = 1000*config.splitAfter();
splitHeadingLevel = config.getXhtmlSplitLevel(); splitHeadingLevel = config.getXhtmlSplitLevel();
nRepeatLevels = converter.isOPS() ? 0 : config.getXhtmlRepeatLevels(); // never repeat headings in EPUB nRepeatLevels = converter.isOPS() ? 0 : config.getXhtmlRepeatLevels(); // never repeat headings in EPUB
nFloatMode = ofr.isText() && config.xhtmlFloatObjects() ? nFloatMode = ofr.isText() && config.xhtmlFloatObjects() ?
DrawParser.FLOATING : DrawParser.ABSOLUTE; DrawParser.FLOATING : DrawParser.ABSOLUTE;
outlineNumbering = new ListCounter(ofr.getOutlineStyle());
displayHiddenText = config.displayHiddenText(); displayHiddenText = config.displayHiddenText();
pageContainer = converter.pageContainer; pageContainer = converter.pageContainer;
docSep = new Separator(config, converter); docSep = new Separator(config, converter);
@ -272,7 +265,6 @@ public class TextParser extends Parser {
else if (nodeName.equals(TEXT_P)) { else if (nodeName.equals(TEXT_P)) {
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME)); StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME));
hnode = processPageBreaks(child, hnode,style); hnode = processPageBreaks(child, hnode,style);
nCharacterCount+=OfficeReader.getCharacterCount(child);
// is there a block element, we should use? // is there a block element, we should use?
XhtmlStyleMap xpar = config.getXParStyleMap(); XhtmlStyleMap xpar = config.getXParStyleMap();
String sDisplayName = style!=null ? style.getDisplayName() : null; 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)); StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,TEXT_STYLE_NAME));
Node rememberNode = hnode; Node rememberNode = hnode;
hnode = processPageBreaks(child, hnode, style); hnode = processPageBreaks(child, hnode, style);
nCharacterCount+=OfficeReader.getCharacterCount(child);
handleHeading((Element)child,(Element)hnode,rememberNode!=hnode); handleHeading((Element)child,(Element)hnode,rememberNode!=hnode);
} }
else if (nodeName.equals(TEXT_LIST) || // oasis else if (nodeName.equals(TEXT_LIST) || // oasis
@ -632,8 +623,8 @@ public class TextParser extends Parser {
* Process a text:p tag * Process a text:p tag
*/ */
private void handleParagraph(Node onode, Node hnode) { private void handleParagraph(Node onode, Node hnode) {
boolean bIsEmpty = OfficeReader.isWhitespaceContent(onode); boolean isEmptyParagraph = OfficeReader.isWhitespaceContent(onode);
if (config.ignoreEmptyParagraphs() && bIsEmpty) { return; } if (config.ignoreEmptyParagraphs() && isEmptyParagraph) { return; }
String styleName = Misc.getAttribute(onode,TEXT_STYLE_NAME); String styleName = Misc.getAttribute(onode,TEXT_STYLE_NAME);
StyleWithProperties style = ofr.getParStyle(styleName); StyleWithProperties style = ofr.getParStyle(styleName);
if (!displayHiddenText && style!=null && "none".equals(style.getProperty(TEXT_DISPLAY))) { return; } if (!displayHiddenText && style!=null && "none".equals(style.getProperty(TEXT_DISPLAY))) { return; }
@ -650,7 +641,7 @@ public class TextParser extends Parser {
// Maybe add to toc // Maybe add to toc
tocParser.handleParagraph((Element)onode, par, sCurrentListLabel); tocParser.handleParagraph((Element)onode, par, sCurrentListLabel);
if (!bIsEmpty) { if (!isEmptyParagraph) {
par = createTextBackground(par, styleName); par = createTextBackground(par, styleName);
if (config.listFormatting()==XhtmlConfig.HARD_LABELS) { if (config.listFormatting()==XhtmlConfig.HARD_LABELS) {
getListParser().insertListLabel(currentListStyle, nCurrentListLevel, "ItemNumber", null, sCurrentListLabel, par); getListParser().insertListLabel(currentListStyle, nCurrentListLevel, "ItemNumber", null, sCurrentListLabel, par);