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

Refactoring

Browse source
This commit is contained in:
Georgy Litvinov 2020-02-10 18:57:44 +01:00
parent 52875e6d5d
commit fa2bc287c0
2 changed files with 155 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/writer2latex/xhtml/content/Separator.java
View file

@ -81,7 +81,7 @@ public class Separator {
headerStack.offerFirst(Integer.parseInt(sLevel)); headerStack.offerFirst(Integer.parseInt(sLevel));
} }
if (!noPageSeparation()) { if (pagination) {
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
} }
@ -106,7 +106,7 @@ public class Separator {
} }
public Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){ public Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){
if (noPageSeparation()){ if (!pagination){
return hnode; return hnode;
} }
if (pageOpened) { if (pageOpened) {
@ -124,7 +124,7 @@ public class Separator {
* Opens main document section heading tag * Opens main document section heading tag
*/ */
public Node startDocument(Node hnode, String title, int pageNum){ public Node startDocument(Node hnode, String title, int pageNum){
if (noHeadingSeparation() && noPageSeparation()){ if (noHeadingSeparation() && !pagination){
return hnode; return hnode;
} }
if(headingSeparation.equals(SECTIONS)){ if(headingSeparation.equals(SECTIONS)){
@ -137,7 +137,7 @@ public class Separator {
} }
//Method to close open tags at the end of the document //Method to close open tags at the end of the document
public Node endDocument(Node hnode){ public Node endDocument(Node hnode){
if (noHeadingSeparation() && noPageSeparation()){ if (noHeadingSeparation() && !pagination){
return hnode; return hnode;
} }
if (pageOpened){ if (pageOpened){
@ -299,15 +299,12 @@ public class Separator {
return hnode; return hnode;
} }
public Node openPage(Node hnode, Integer pageNum){ public Node openPage(Node hnode, Integer pageNum){
if (pageOpened == true) { if (pageOpened == true || !pagination) {
return hnode; return hnode;
} }
if (pagination){
hnode = openPageDiv(hnode, pageNum); hnode = openPageDiv(hnode, pageNum);
pageOpened = true; pageOpened = true;
}
hnode = enterPageContainer(hnode); hnode = enterPageContainer(hnode);
return hnode; return hnode;
} }
@ -340,9 +337,6 @@ public class Separator {
private static boolean noHeadingSeparation() { private static boolean noHeadingSeparation() {
return headingSeparation.equals(NONE); return headingSeparation.equals(NONE);
} }
private static boolean noPageSeparation() {
return !pagination;
}
private static String openHeadingCommentText(String title) { private static String openHeadingCommentText(String title) {
String comment = "<Section>\n<Description>\n<Metadata name=\"Title\">" + title String comment = "<Section>\n<Description>\n<Metadata name=\"Title\">" + title
+ "</Metadata>\n</Description>"; + "</Metadata>\n</Description>";

228
src/main/java/writer2latex/xhtml/content/TextParser.java
View file

@ -66,7 +66,7 @@ public class TextParser extends Parser {
private int nSplitAfter = 150000; private int nSplitAfter = 150000;
// TODO: Collect soft page breaks between table rows // TODO: Collect soft page breaks between table rows
private boolean bPendingPageBreak = false; // We have encountered a page break which should be inserted asap private boolean bPendingPageBreak = false; // We have encountered a page break which should be inserted asap
private int splitResultsLevel = 0; // The outline level at which to split files (0=no split) 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 private int nLastSplitLevel = 1; // The outline level at which the last split occurred
private int nDontSplitLevel = 0; // if > 0 splitting is forbidden private int nDontSplitLevel = 0; // if > 0 splitting is forbidden
@ -115,7 +115,6 @@ public class TextParser extends Parser {
//Current master page name //Current master page name
private String nextMasterPage = null; private String nextMasterPage = null;
private String headingTags = config.getHeadingTags();
private boolean pagination = config.pagination(); private boolean pagination = config.pagination();
private boolean breakBeforeNextNode = false; private boolean breakBeforeNextNode = false;
private boolean inTable = false; private boolean inTable = false;
@ -126,7 +125,6 @@ public class TextParser extends Parser {
private boolean inFooter = false; private boolean inFooter = false;
private String endnotesContext = null; private String endnotesContext = null;
private String footnotesContext = null; private String footnotesContext = null;
private boolean inlineCSS;
PageContainer pageContainer = null; PageContainer pageContainer = null;
public TextParser(OfficeReader ofr, XhtmlConfig config, Converter converter) { public TextParser(OfficeReader ofr, XhtmlConfig config, Converter converter) {
@ -139,7 +137,7 @@ public class TextParser extends Parser {
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();
splitResultsLevel = 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;
@ -147,7 +145,6 @@ public class TextParser extends Parser {
displayHiddenText = config.displayHiddenText(); displayHiddenText = config.displayHiddenText();
pageContainer = converter.pageContainer; pageContainer = converter.pageContainer;
docSep = new Separator(config, converter); docSep = new Separator(config, converter);
inlineCSS = config.inlineCSS();
} }
/** Converts an office node as a complete text document /** Converts an office node as a complete text document
@ -157,7 +154,7 @@ public class TextParser extends Parser {
public void convertDocumentContent(Element onode) { public void convertDocumentContent(Element onode) {
Element hnode = converter.nextOutFile(); Element hnode = converter.nextOutFile();
// Create form // Create form
if (splitResultsLevel==0) { if (splitHeadingLevel==0) {
Element form = getDrawCv().createForm(); Element form = getDrawCv().createForm();
if (form!=null) { if (form!=null) {
hnode.appendChild(form); hnode.appendChild(form);
@ -181,7 +178,6 @@ public class TextParser extends Parser {
// Add footnotes and endnotes // Add footnotes and endnotes
insertFootnotes(hnode,true); insertFootnotes(hnode,true);
//hnode = exitPageContainer(hnode);
addFooter(hnode); addFooter(hnode);
insertEndnotes(hnode, null); insertEndnotes(hnode, null);
@ -191,11 +187,8 @@ public class TextParser extends Parser {
tocParser.generate(); tocParser.generate();
bInToc = false; bInToc = false;
// Generate navigation links
generateHeaders();
generateFooters();
bInToc = true; bInToc = true;
tocParser.generatePanels(splitResultsLevel); tocParser.generatePanels(splitHeadingLevel);
bInToc = false; bInToc = false;
} }
@ -254,12 +247,6 @@ public class TextParser extends Parser {
// NAVIGATION (fill header, footer and panel with navigation links) // NAVIGATION (fill header, footer and panel with navigation links)
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// The header is populated with prev/next navigation
private void generateHeaders() { }
// The footer is populated with prev/next navigation
private void generateFooters() { }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// BLOCK TEXT (returns current html node at end of block) // BLOCK TEXT (returns current html node at end of block)
@ -575,7 +562,7 @@ public class TextParser extends Parser {
// Export the heading // Export the heading
if (!bTocOnly) { if (!bTocOnly) {
// If split output, add headings of higher levels // If split output, add headings of higher levels
if (bAfterSplit && splitResultsLevel > 0) { if (bAfterSplit && splitHeadingLevel > 0) {
int nFirst = nLevel - nRepeatLevels; int nFirst = nLevel - nRepeatLevels;
if (nFirst < 0) { if (nFirst < 0) {
nFirst = 0; nFirst = 0;
@ -1066,36 +1053,28 @@ public class TextParser extends Parser {
// Process the contents of a fake list item // Process the contents of a fake list item
private Node traverseFakeListItem (Node onode, Node hnode, int nLevel, private Node traverseFakeListItem(Node onode, Node hnode, int nLevel, String sStyleName, boolean bUnNumbered, boolean bRestart, int nStartValue) {
String sStyleName, boolean bUnNumbered, boolean bRestart, int nStartValue) {
Node child = onode.getFirstChild(); Node child = onode.getFirstChild();
while (child!=null) { while (child != null) {
if (child.getNodeType() == Node.ELEMENT_NODE) { if (child.getNodeType() == Node.ELEMENT_NODE) {
String sNodeName = child.getNodeName(); String sNodeName = child.getNodeName();
if (sNodeName.equals(TEXT_H)) { if (sNodeName.equals(TEXT_H)) {
nDontSplitLevel++; nDontSplitLevel++;
int nOutlineLevel = getOutlineLevel((Element)onode);
Node rememberNode = hnode; Node rememberNode = hnode;
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child, TEXT_STYLE_NAME)); handleHeading((Element) child, (Element) hnode, rememberNode != hnode, ofr.getListStyle(sStyleName), nLevel, bUnNumbered, bRestart, nStartValue);
//hnode = maybeSplit(hnode,style,nOutlineLevel);
handleHeading((Element)child, (Element)hnode, rememberNode!=hnode,
ofr.getListStyle(sStyleName), nLevel,
bUnNumbered, bRestart, nStartValue);
nDontSplitLevel--; nDontSplitLevel--;
if (nDontSplitLevel==0) { bAfterHeading=true; } if (nDontSplitLevel == 0) {
bAfterHeading = true;
} }
else if (sNodeName.equals(TEXT_P)) { } else if (sNodeName.equals(TEXT_P)) {
// Currently we only handle fakes lists containing headings // Currently we only handle fakes lists containing headings
} } else if (sNodeName.equals(TEXT_LIST)) { // oasis
else if (sNodeName.equals(TEXT_LIST)) { // oasis return traverseFakeList(child, hnode, nLevel + 1, sStyleName);
return traverseFakeList(child, hnode, nLevel+1, sStyleName); } else if (sNodeName.equals(TEXT_ORDERED_LIST)) { // old
} return traverseFakeList(child, hnode, nLevel + 1, sStyleName);
else if (sNodeName.equals(TEXT_ORDERED_LIST)) { // old } else if (sNodeName.equals(TEXT_UNORDERED_LIST)) { // old
return traverseFakeList(child, hnode, nLevel+1, sStyleName); return traverseFakeList(child, hnode, nLevel + 1, sStyleName);
}
else if (sNodeName.equals(TEXT_UNORDERED_LIST)) { // old
return traverseFakeList(child, hnode, nLevel+1, sStyleName);
} }
} }
child = child.getNextSibling(); child = child.getNextSibling();
@ -1146,8 +1125,8 @@ public class TextParser extends Parser {
/* /*
* Process inline text * Process inline text
*/ */
protected void traverseInlineText (Node onode,Node hnode) { protected void traverseInlineText(Node onode, Node hnode) {
//String styleName = Misc.getAttribute(onode, TEXT_STYLE_NAME); // String styleName = Misc.getAttribute(onode, TEXT_STYLE_NAME);
if (onode.hasChildNodes()) { if (onode.hasChildNodes()) {
NodeList nList = onode.getChildNodes(); NodeList nList = onode.getChildNodes();
@ -1162,122 +1141,95 @@ public class TextParser extends Parser {
case Node.TEXT_NODE: case Node.TEXT_NODE:
String s = child.getNodeValue(); String s = child.getNodeValue();
if (s.length() > 0) { if (s.length() > 0) {
hnode.appendChild( converter.createTextNode(s) ); hnode.appendChild(converter.createTextNode(s));
} }
break; break;
case Node.ELEMENT_NODE: case Node.ELEMENT_NODE:
String sName = child.getNodeName(); String sName = child.getNodeName();
if (OfficeReader.isDrawElement(child)) { if (OfficeReader.isDrawElement(child)) {
Element elm = getDrawCv().getRealDrawElement((Element)child); Element elm = getDrawCv().getRealDrawElement((Element) child);
if (elm!=null) { if (elm != null) {
String sAnchor = (elm.getAttribute(TEXT_ANCHOR_TYPE)); String sAnchor = (elm.getAttribute(TEXT_ANCHOR_TYPE));
if ("as-char".equals(sAnchor)) { if ("as-char".equals(sAnchor)) {
getDrawCv().handleDrawElement(elm,null,(Element)hnode,DrawParser.INLINE); getDrawCv().handleDrawElement(elm, null, (Element) hnode, DrawParser.INLINE);
} }
} }
} } else if (child.getNodeName().equals(TEXT_S)) {
else if (child.getNodeName().equals(TEXT_S)) {
if (config.ignoreDoubleSpaces()) { if (config.ignoreDoubleSpaces()) {
hnode.appendChild( converter.createTextNode(" ") ); hnode.appendChild(converter.createTextNode(" "));
} } else {
else { int count = Misc.getPosInteger(Misc.getAttribute(child, TEXT_C), 1);
int count= Misc.getPosInteger(Misc.getAttribute(child,TEXT_C),1); for (; count > 0; count--) {
for ( ; count > 0; count--) { hnode.appendChild(converter.createTextNode("\u00A0"));
hnode.appendChild( converter.createTextNode("\u00A0") );
} }
} }
} } else if (sName.equals(TEXT_TAB_STOP)) {
else if (sName.equals(TEXT_TAB_STOP)) { handleTabStop(child, hnode);
handleTabStop(child,hnode); } else if (sName.equals(TEXT_TAB)) { // oasis
} handleTabStop(child, hnode);
else if (sName.equals(TEXT_TAB)) { // oasis } else if (sName.equals(TEXT_LINE_BREAK)) {
handleTabStop(child,hnode);
}
else if (sName.equals(TEXT_LINE_BREAK)) {
if (!config.ignoreHardLineBreaks()) { if (!config.ignoreHardLineBreaks()) {
hnode.appendChild( converter.createElement("br") ); hnode.appendChild(converter.createElement("br"));
} }
} else if (sName.equals(TEXT_SPAN)) {
handleSpan(child, hnode);
} else if (sName.equals(TEXT_A)) {
handleAnchor(child, hnode);
} else if (sName.equals(TEXT_FOOTNOTE)) {
footCv.handleNote(child, hnode, footnotesContext);
} else if (sName.equals(TEXT_ENDNOTE)) {
endCv.handleNote(child, hnode, endnotesContext);
} else if (sName.equals(TEXT_NOTE)) { // oasis
if ("endnote".equals(Misc.getAttribute(child, TEXT_NOTE_CLASS))) {
endCv.handleNote(child, hnode, endnotesContext);
} else {
footCv.handleNote(child, hnode, footnotesContext);
} }
else if (sName.equals(TEXT_SPAN)) { } else if (sName.equals(TEXT_SEQUENCE)) {
handleSpan(child,hnode); handleSequence(child, hnode);
} else if (sName.equals(TEXT_PAGE_NUMBER)) {
handlePageNumber(child, hnode);
} else if (sName.equals(TEXT_PAGE_COUNT)) {
handlePageCount(child, hnode);
} else if (sName.equals(TEXT_SEQUENCE_REF)) {
handleSequenceRef(child, hnode);
} else if (sName.equals(TEXT_FOOTNOTE_REF)) {
handleNoteRef(child, hnode);
} else if (sName.equals(TEXT_ENDNOTE_REF)) {
handleNoteRef(child, hnode);
} else if (sName.equals(TEXT_NOTE_REF)) { // oasis
handleNoteRef(child, hnode);
} else if (sName.equals(TEXT_REFERENCE_MARK)) {
handleReferenceMark(child, hnode);
} else if (sName.equals(TEXT_REFERENCE_MARK_START)) {
handleReferenceMark(child, hnode);
} else if (sName.equals(TEXT_REFERENCE_REF)) {
handleReferenceRef(child, hnode);
} else if (sName.equals(TEXT_BOOKMARK)) {
handleBookmark(child, hnode);
} else if (sName.equals(TEXT_BOOKMARK_START)) {
handleBookmark(child, hnode);
} else if (sName.equals(TEXT_BOOKMARK_REF)) {
handleBookmarkRef(child, hnode);
} else if (sName.equals(TEXT_ALPHABETICAL_INDEX_MARK)) {
if (!bInToc) {
indexCv.handleIndexMark(child, hnode);
} }
else if (sName.equals(TEXT_A)) { } else if (sName.equals(TEXT_ALPHABETICAL_INDEX_MARK_START)) {
handleAnchor(child,hnode); if (!bInToc) {
indexCv.handleIndexMarkStart(child, hnode);
} }
else if (sName.equals(TEXT_FOOTNOTE)) { } else if (sName.equals(TEXT_TOC_MARK)) {
footCv.handleNote(child,hnode,footnotesContext); tocParser.handleTocMark(child, hnode);
} } else if (sName.equals(TEXT_TOC_MARK_START)) {
else if (sName.equals(TEXT_ENDNOTE)) { tocParser.handleTocMark(child, hnode);
endCv.handleNote(child,hnode,endnotesContext); } else if (sName.equals(TEXT_BIBLIOGRAPHY_MARK)) {
} handleBibliographyMark(child, hnode);
else if (sName.equals(TEXT_NOTE)) { // oasis } else if (sName.equals(OFFICE_ANNOTATION)) {
if ("endnote".equals(Misc.getAttribute(child,TEXT_NOTE_CLASS))) { converter.handleOfficeAnnotation(child, hnode);
endCv.handleNote(child,hnode,endnotesContext); } else if (sName.startsWith("text:")) {
} traverseInlineText(child, hnode);
else {
footCv.handleNote(child,hnode,footnotesContext);
}
}
else if (sName.equals(TEXT_SEQUENCE)) {
handleSequence(child,hnode);
}
else if (sName.equals(TEXT_PAGE_NUMBER)) {
handlePageNumber(child,hnode);
}
else if (sName.equals(TEXT_PAGE_COUNT)) {
handlePageCount(child,hnode);
}
else if (sName.equals(TEXT_SEQUENCE_REF)) {
handleSequenceRef(child,hnode);
}
else if (sName.equals(TEXT_FOOTNOTE_REF)) {
handleNoteRef(child,hnode);
}
else if (sName.equals(TEXT_ENDNOTE_REF)) {
handleNoteRef(child,hnode);
}
else if (sName.equals(TEXT_NOTE_REF)) { // oasis
handleNoteRef(child,hnode);
}
else if (sName.equals(TEXT_REFERENCE_MARK)) {
handleReferenceMark(child,hnode);
}
else if (sName.equals(TEXT_REFERENCE_MARK_START)) {
handleReferenceMark(child,hnode);
}
else if (sName.equals(TEXT_REFERENCE_REF)) {
handleReferenceRef(child,hnode);
}
else if (sName.equals(TEXT_BOOKMARK)) {
handleBookmark(child,hnode);
}
else if (sName.equals(TEXT_BOOKMARK_START)) {
handleBookmark(child,hnode);
}
else if (sName.equals(TEXT_BOOKMARK_REF)) {
handleBookmarkRef(child,hnode);
}
else if (sName.equals(TEXT_ALPHABETICAL_INDEX_MARK)) {
if (!bInToc) { indexCv.handleIndexMark(child,hnode); }
}
else if (sName.equals(TEXT_ALPHABETICAL_INDEX_MARK_START)) {
if (!bInToc) { indexCv.handleIndexMarkStart(child,hnode); }
}
else if (sName.equals(TEXT_TOC_MARK)) {
tocParser.handleTocMark(child,hnode);
}
else if (sName.equals(TEXT_TOC_MARK_START)) {
tocParser.handleTocMark(child,hnode);
}
else if (sName.equals(TEXT_BIBLIOGRAPHY_MARK)) {
handleBibliographyMark(child,hnode);
}
else if (sName.equals(OFFICE_ANNOTATION)) {
converter.handleOfficeAnnotation(child,hnode);
}
else if (sName.startsWith("text:")) {
traverseInlineText(child,hnode);
} }
// other tags are ignored; // other tags are ignored;
break; break;