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 2019-04-21 20:02:37 +03:00
parent f7ac9d4aac
commit 3dbbd23883
2 changed files with 49 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/writer2latex/xhtml/GreenstoneTags.java → src/main/java/writer2latex/xhtml/DocumentSeparator.java
View file

@ -14,12 +14,12 @@ import static writer2latex.util.Misc.*;
//LinkedList<String> stringList = new LinkedList<String>(); //LinkedList<String> stringList = new LinkedList<String>();
public class GreenstoneTags { public class DocumentSeparator {
private static final String NONE = "none"; private static final String NONE = "none";
private static final String SECTIONS = "sections"; private static final String SECTIONS = "sections";
private static final String DIV = "div"; private static final String DIV = "div";
private int splitLevel = 0;
private static LinkedList<Integer> headerStack = new LinkedList<Integer>(); private static LinkedList<Integer> headerStack = new LinkedList<Integer>();
private static boolean pageOpened = false; private static boolean pageOpened = false;
@ -27,8 +27,18 @@ public class GreenstoneTags {
private static String headingSeparation = "sections"; private static String headingSeparation = "sections";
//sections div none //sections div none
private static String pageSeparation = "sections"; private static String pageSeparation = "sections";
private Converter converter = null;
private XhtmlConfig config = null;
protected static Node processHeading(Node currentNode, Node hnode, int pageNum) { public DocumentSeparator(XhtmlConfig config,Converter converter) {
this.config = config;
this.converter = converter;
headingSeparation = config.getHeadingTags();
pageSeparation = config.getPageTags();
splitLevel = config.getXhtmlSplitLevel();
}
protected Node processHeading(Node currentNode, Node hnode, int pageNum) {
//Get outline level //Get outline level
String sLevel = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL); String sLevel = getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL);
@ -39,15 +49,21 @@ public class GreenstoneTags {
if (title == null || title.isEmpty()) { if (title == null || title.isEmpty()) {
return hnode; return hnode;
} }
int nLevel = Integer.parseInt(sLevel); int curLevel = Integer.parseInt(sLevel);
if (pageOpened) { if (pageOpened) {
hnode = closePage(hnode); hnode = closePage(hnode);
} }
if (headingSeparation.equals(SECTIONS)){ if (headingSeparation.equals(SECTIONS)){
closeCommentHeadings(hnode, nLevel); closeCommentHeadings(hnode, curLevel);
} }
//System.out.println("before split " + curLevel + " Has content? " + converter.getOutFileIndex());
//System.out.println(hnode.getNodeName());
/*if (splitLevel >= curLevel && (converter.outFileHasContent() || converter.getOutFileIndex() == 1)) {
System.out.println("Split happened");
hnode = converter.nextOutFile();
}*/
//Place to split headings //Place to split headings
if (headingSeparation.equals(SECTIONS)){ if (headingSeparation.equals(SECTIONS)){
@ -76,9 +92,7 @@ public class GreenstoneTags {
/** /**
* Opens main document section heading tag * Opens main document section heading tag
*/ */
protected static Node StartDocument(Node hnode, String title, String heading, String pages, int pageNum){ protected Node StartDocument(Node hnode, String title, int pageNum){
headingSeparation = heading;
pageSeparation = pages;
if (noHeadingSeparation() && noPageSeparation()){ if (noHeadingSeparation() && noPageSeparation()){
return hnode; return hnode;

51
src/main/java/writer2latex/xhtml/TextConverter.java
View file

@ -72,6 +72,8 @@ public class TextConverter extends ConverterHelper {
private String sCurrentListLabel = null; private String sCurrentListLabel = null;
private ListStyle currentListStyle = null; private ListStyle currentListStyle = null;
private int nCurrentListLevel = 0; private int nCurrentListLevel = 0;
DocumentSeparator docSep = null;
// Mode used to handle floats (depends on source doc type and config) // Mode used to handle floats (depends on source doc type and config)
private int nFloatMode; private int nFloatMode;
@ -104,8 +106,8 @@ public class TextConverter extends ConverterHelper {
//Current master page name //Current master page name
private String nextMasterPage = null; private String nextMasterPage = null;
private String headingTags = config.getHeadingTags(); private String headingSeparator = config.getHeadingTags();
private String pageTags = config.getPageTags(); private String pageSeparator = config.getPageTags();
private boolean breakBeforeNextNode = false; private boolean breakBeforeNextNode = false;
private boolean inTable = false; private boolean inTable = false;
private boolean inList = false; private boolean inList = false;
@ -130,6 +132,8 @@ public class TextConverter extends ConverterHelper {
DrawConverter.FLOATING : DrawConverter.ABSOLUTE; DrawConverter.FLOATING : DrawConverter.ABSOLUTE;
outlineNumbering = new ListCounter(ofr.getOutlineStyle()); outlineNumbering = new ListCounter(ofr.getOutlineStyle());
bDisplayHiddenText = config.displayHiddenText(); bDisplayHiddenText = config.displayHiddenText();
docSep = new DocumentSeparator(config, converter);
} }
/** Converts an office node as a complete text document /** Converts an office node as a complete text document
@ -155,7 +159,7 @@ public class TextConverter extends ConverterHelper {
extractRealTOC(onode); extractRealTOC(onode);
} }
//Split pages //Split pages
if (!pageTags.equals("none")) { if (!pageSeparator.equals("none")) {
onode = (Element) PageSplitter.splitSoftPageBreak(onode,ofr); onode = (Element) PageSplitter.splitSoftPageBreak(onode,ofr);
} }
@ -167,11 +171,11 @@ public class TextConverter extends ConverterHelper {
// Add footnotes and endnotes // Add footnotes and endnotes
footCv.insertFootnotes(hnode,true); footCv.insertFootnotes(hnode,true);
if (!pageTags.equals("none")) { if (!pageSeparator.equals("none")) {
addFooter(hnode); addFooter(hnode);
} }
endCv.insertEndnotes(hnode); endCv.insertEndnotes(hnode);
hnode = (Element) GreenstoneTags.endDocument(hnode); hnode = (Element) docSep.endDocument(hnode);
// Generate all indexes // Generate all indexes
bInToc = true; bInToc = true;
tocCv.generate(); tocCv.generate();
@ -318,9 +322,8 @@ public class TextConverter extends ConverterHelper {
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,XMLString.TEXT_STYLE_NAME)); StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,XMLString.TEXT_STYLE_NAME));
int nOutlineLevel = getOutlineLevel((Element)child); int nOutlineLevel = getOutlineLevel((Element)child);
Node rememberNode = hnode; Node rememberNode = hnode;
hnode = processPageBreaks(child, hnode, style); hnode = processPageBreaks(child, hnode, style);
//hnode = GreenstoneTags.processHeading(child, hnode, pageNum); //hnode = maybeSplit(hnode,style,nOutlineLevel);
hnode = maybeSplit(hnode,style,nOutlineLevel);
nCharacterCount+=OfficeReader.getCharacterCount(child); nCharacterCount+=OfficeReader.getCharacterCount(child);
handleHeading((Element)child,(Element)hnode,rememberNode!=hnode); handleHeading((Element)child,(Element)hnode,rememberNode!=hnode);
} }
@ -364,7 +367,7 @@ public class TextConverter extends ConverterHelper {
} }
hnode = processPageBreaks(child, hnode,style); hnode = processPageBreaks(child, hnode,style);
inList = true; inList = true;
hnode = maybeSplit(hnode,null); //hnode = maybeSplit(hnode,null);
if (listIsOnlyHeadings(child)) { if (listIsOnlyHeadings(child)) {
nDontSplitLevel--; nDontSplitLevel--;
hnode = handleFakeList(child,nLevel+1,styleName,hnode); hnode = handleFakeList(child,nLevel+1,styleName,hnode);
@ -378,7 +381,7 @@ public class TextConverter extends ConverterHelper {
else if (nodeName.equals(XMLString.TABLE_TABLE)) { else if (nodeName.equals(XMLString.TABLE_TABLE)) {
StyleWithProperties style = ofr.getTableStyle(Misc.getAttribute(child, XMLString.TABLE_STYLE_NAME)); StyleWithProperties style = ofr.getTableStyle(Misc.getAttribute(child, XMLString.TABLE_STYLE_NAME));
hnode = processPageBreaks(child, hnode,style); hnode = processPageBreaks(child, hnode,style);
hnode = maybeSplit(hnode,style); //hnode = maybeSplit(hnode,style);
inTable = true; inTable = true;
getTableCv().handleTable(child,hnode); getTableCv().handleTable(child,hnode);
inTable = false; inTable = false;
@ -388,14 +391,14 @@ public class TextConverter extends ConverterHelper {
} }
else if (nodeName.equals(XMLString.TEXT_SECTION)) { else if (nodeName.equals(XMLString.TEXT_SECTION)) {
hnode = processPageBreaks(child, hnode,null); hnode = processPageBreaks(child, hnode,null);
hnode = maybeSplit(hnode,null); // hnode = maybeSplit(hnode,null);
nDontSplitLevel--; nDontSplitLevel--;
hnode = handleSection(child,hnode); hnode = handleSection(child,hnode);
nDontSplitLevel++; nDontSplitLevel++;
} }
else if (nodeName.equals(XMLString.TEXT_TABLE_OF_CONTENT)) { else if (nodeName.equals(XMLString.TEXT_TABLE_OF_CONTENT)) {
if (!ofr.getTocReader((Element)child).isByChapter()) { if (!ofr.getTocReader((Element)child).isByChapter()) {
hnode = maybeSplit(hnode,null,1); // hnode = maybeSplit(hnode,null,1);
} }
tocCv.handleIndex((Element)child,(Element)hnode); tocCv.handleIndex((Element)child,(Element)hnode);
} }
@ -521,10 +524,10 @@ public class TextConverter extends ConverterHelper {
String sStyleName = Misc.getAttribute(onode,XMLString.TEXT_STYLE_NAME); String sStyleName = Misc.getAttribute(onode,XMLString.TEXT_STYLE_NAME);
////closePageSection ////closePageSection
Element div = (Element) hnode; Element div = (Element) hnode;
if (headingTags == null) { if (headingSeparator == null) {
div = converter.createElement("div"); div = converter.createElement("div");
// close page before enter // close page before enter
hnode = GreenstoneTags.closePage(hnode); hnode = docSep.closePage(hnode);
hnode.appendChild(div); hnode.appendChild(div);
converter.addTarget(div, sName + "|region"); converter.addTarget(div, sName + "|region");
@ -533,17 +536,17 @@ public class TextConverter extends ConverterHelper {
applyStyle(sectionInfo, div); applyStyle(sectionInfo, div);
sections.push(onode); sections.push(onode);
//open page after enter //open page after enter
div = (Element) GreenstoneTags.openPage(div, pageNum); div = (Element) docSep.openPage(div, pageNum);
} }
Node newhnode = traverseBlockText(onode, div); Node newhnode = traverseBlockText(onode, div);
Node result = null; Node result = null;
if (headingTags == null) { if (headingSeparator == null) {
//close page before exit //close page before exit
newhnode = GreenstoneTags.closePage(newhnode); newhnode = docSep.closePage(newhnode);
result = newhnode.getParentNode(); result = newhnode.getParentNode();
//Open page after exit //Open page after exit
result = (Element) GreenstoneTags.openPage(result, pageNum); result = (Element) docSep.openPage(result, pageNum);
sections.pop(); sections.pop();
} else { } else {
result = newhnode; result = newhnode;
@ -1692,7 +1695,7 @@ public class TextConverter extends ConverterHelper {
} }
if (currentMasterPage == null && style != null) { if (currentMasterPage == null && style != null) {
hnode = StartMasterPage(hnode, style, newPageNumber); hnode = StartMasterPage(hnode, style, newPageNumber);
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum); hnode = docSep.processHeading(currentNode, hnode, pageNum);
} else if (checkMasterPageBreak(style) || checkHardBreakBefore(style) || breakBeforeNextNode) { } else if (checkMasterPageBreak(style) || checkHardBreakBefore(style) || breakBeforeNextNode) {
// Insert footnotes // Insert footnotes
inFootnote = true; inFootnote = true;
@ -1710,9 +1713,9 @@ public class TextConverter extends ConverterHelper {
fitPageNumberToMasterPageStyle(); fitPageNumberToMasterPageStyle();
} }
if (hasOutlineLevel(currentNode)) { if (hasOutlineLevel(currentNode)) {
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum); hnode = docSep.processHeading(currentNode, hnode, pageNum);
} else { } else {
hnode = GreenstoneTags.processPageBreak(currentNode, hnode, pageNum); hnode = docSep.processPageBreak(currentNode, hnode, pageNum);
} }
@ -1722,7 +1725,7 @@ public class TextConverter extends ConverterHelper {
return hnode; return hnode;
} else { } else {
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum); hnode = docSep.processHeading(currentNode, hnode, pageNum);
} }
@ -1756,10 +1759,10 @@ public class TextConverter extends ConverterHelper {
//Start tagging //Start tagging
String sTitle = converter.getTitle(); String sTitle = converter.getTitle();
hnode = GreenstoneTags.StartDocument(hnode, sTitle,headingTags,pageTags, pageNum); hnode = docSep.StartDocument(hnode, sTitle,pageNum);
//Print header //Print header
if (!pageTags.equals("none")) { if (!pageSeparator.equals("none")) {
addHeader(hnode); addHeader(hnode);
} }
return hnode; return hnode;