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 18:12:09 +03:00
parent 87560f97a4
commit f7ac9d4aac
2 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/writer2latex/xhtml/GreenstoneTags.java
View file

@ -46,13 +46,16 @@ public class GreenstoneTags {
} }
if (headingSeparation.equals(SECTIONS)){ if (headingSeparation.equals(SECTIONS)){
closeHeadingSections(hnode, nLevel); closeCommentHeadings(hnode, nLevel);
}
openHeadingComment(hnode, title); //Place to split headings
if (headingSeparation.equals(SECTIONS)){
openCommentHeading(hnode, title);
headerStack.offerFirst(Integer.parseInt(sLevel)); headerStack.offerFirst(Integer.parseInt(sLevel));
} }
if (!noPageSeparation() && !noHeadingSeparation()){ if (!noPageSeparation() && !noHeadingSeparation()){
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
} }
return hnode; return hnode;
@ -82,7 +85,7 @@ public class GreenstoneTags {
} }
if(headingSeparation.equals(SECTIONS)){ if(headingSeparation.equals(SECTIONS)){
//Create global section //Create global section
openHeadingComment(hnode, title); openCommentHeading(hnode, title);
} }
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
@ -97,7 +100,7 @@ public class GreenstoneTags {
hnode = closePage(hnode); hnode = closePage(hnode);
} }
if (headingSeparation.equals(SECTIONS)){ if (headingSeparation.equals(SECTIONS)){
closeHeadingSections(hnode, 0); closeCommentHeadings(hnode, 0);
//Close global section //Close global section
addCloseComment(hnode); addCloseComment(hnode);
} }
@ -107,10 +110,11 @@ public class GreenstoneTags {
private static Node openPageDiv(Node node,int pageNum){ private static Node openPageDiv(Node node,int pageNum){
if (node == null){ if (node == null){
System.out.println("Error: node is null on openPageDiv");
return node; return node;
} }
Document doc = node.getOwnerDocument(); Document doc = node.getOwnerDocument();
Element openBlock = (Element) doc.createElement("div"); Element openBlock = (Element) doc.createElement(DIV);
openBlock.setAttribute("class", "pageNum"); openBlock.setAttribute("class", "pageNum");
openBlock.setAttribute("page", Integer.toString(pageNum)); openBlock.setAttribute("page", Integer.toString(pageNum));
// insert open section comment before header node // insert open section comment before header node
@ -121,7 +125,7 @@ public class GreenstoneTags {
private static Node exitPageDiv(Node node){ private static Node exitPageDiv(Node node){
while ( !isRoot(node) && !isElement("div", node) ){ while ( !isRoot(node) && !isElement(DIV, node) ){
node = node.getParentNode(); node = node.getParentNode();
} }
Node result = node.getParentNode(); Node result = node.getParentNode();
@ -169,7 +173,7 @@ public class GreenstoneTags {
hnode.appendChild(openSection); hnode.appendChild(openSection);
} }
private static void openHeadingComment(Node hnode, String title){ private static void openCommentHeading(Node hnode, String title){
Document doc = hnode.getOwnerDocument(); Document doc = hnode.getOwnerDocument();
Node openSection = doc.createComment(openHeadingCommentText(title)); Node openSection = doc.createComment(openHeadingCommentText(title));
// insert open section comment before header node // insert open section comment before header node
@ -183,7 +187,7 @@ public class GreenstoneTags {
node.appendChild(closeSection); node.appendChild(closeSection);
} }
private static void closeHeadingSections(Node hnode, int nLevel){ private static void closeCommentHeadings(Node hnode, int nLevel){
if (headerStack.isEmpty()) { if (headerStack.isEmpty()) {
return; return;
} }

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

@ -269,8 +269,8 @@ public class TextConverter extends ConverterHelper {
} }
else if (nodeName.equals(XMLString.TEXT_P)) { else if (nodeName.equals(XMLString.TEXT_P)) {
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,XMLString.TEXT_STYLE_NAME)); StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child,XMLString.TEXT_STYLE_NAME));
hnode = processPageBreaks(child, hnode,style); hnode = processPageBreaks(child, hnode,style);
hnode = maybeSplit(hnode, style); //hnode = maybeSplit(hnode, style);
nCharacterCount+=OfficeReader.getCharacterCount(child); 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();
@ -412,11 +412,11 @@ public class TextConverter extends ConverterHelper {
// TODO // TODO
} }
else if (nodeName.equals(XMLString.TEXT_ALPHABETICAL_INDEX)) { else if (nodeName.equals(XMLString.TEXT_ALPHABETICAL_INDEX)) {
hnode = maybeSplit(hnode,null,1); //hnode = maybeSplit(hnode,null,1);
indexCv.handleIndex((Element)child,(Element)hnode); indexCv.handleIndex((Element)child,(Element)hnode);
} }
else if (nodeName.equals(XMLString.TEXT_BIBLIOGRAPHY)) { else if (nodeName.equals(XMLString.TEXT_BIBLIOGRAPHY)) {
hnode = maybeSplit(hnode,null,1); //hnode = maybeSplit(hnode,null,1);
bibCv.handleIndex((Element)child,(Element)hnode); bibCv.handleIndex((Element)child,(Element)hnode);
} }
else if (nodeName.equals(XMLString.TEXT_SOFT_PAGE_BREAK)) { else if (nodeName.equals(XMLString.TEXT_SOFT_PAGE_BREAK)) {
@ -1114,7 +1114,7 @@ public class TextConverter extends ConverterHelper {
int nOutlineLevel = getOutlineLevel((Element)onode); int nOutlineLevel = getOutlineLevel((Element)onode);
Node rememberNode = hnode; Node rememberNode = hnode;
StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child, XMLString.TEXT_STYLE_NAME)); StyleWithProperties style = ofr.getParStyle(Misc.getAttribute(child, XMLString.TEXT_STYLE_NAME));
hnode = maybeSplit(hnode,style,nOutlineLevel); //hnode = maybeSplit(hnode,style,nOutlineLevel);
handleHeading((Element)child, (Element)hnode, rememberNode!=hnode, handleHeading((Element)child, (Element)hnode, rememberNode!=hnode,
ofr.getListStyle(sStyleName), nLevel, ofr.getListStyle(sStyleName), nLevel,
bUnNumbered, bRestart, nStartValue); bUnNumbered, bRestart, nStartValue);
@ -1668,21 +1668,10 @@ public class TextConverter extends ConverterHelper {
//check for first para inside //check for first para inside
// Check it's master page, pageNumber, Page break before - if we already set MP - throw it away // Check it's master page, pageNumber, Page break before - if we already set MP - throw it away
// And make a note to pass this paragraph next time you'll meet it. // And make a note to pass this paragraph next time you'll meet it.
if (inHeader) { if (inHeader || inFooter || inTable || inList || inFootnote ) {
return hnode;
}
if (inFooter) {
return hnode;
}
if (inTable){
return hnode;
}
if (inList){
return hnode;
}
if (inFootnote){
return hnode; return hnode;
} }
/* if (pageTags.equals("none")) { /* if (pageTags.equals("none")) {
return hnode; return hnode;
}*/ }*/
@ -1720,9 +1709,7 @@ public class TextConverter extends ConverterHelper {
pageNum++; pageNum++;
fitPageNumberToMasterPageStyle(); fitPageNumberToMasterPageStyle();
} }
if (currentNode.getNodeType() == Node.ELEMENT_NODE if (hasOutlineLevel(currentNode)) {
&& Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL) != null
&& !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()) {
hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum); hnode = GreenstoneTags.processHeading(currentNode, hnode, pageNum);
} else { } else {
hnode = GreenstoneTags.processPageBreak(currentNode, hnode, pageNum); hnode = GreenstoneTags.processPageBreak(currentNode, hnode, pageNum);
@ -1900,7 +1887,14 @@ public class TextConverter extends ConverterHelper {
inFooter = false; inFooter = false;
return node; return node;
} }
private static boolean hasOutlineLevel(Node node) {
if (Misc.isElement(node)
&& Misc.getAttribute(node, XMLString.TEXT_OUTLINE_LEVEL) != null
&& !Misc.getAttribute(node, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()) {
return true;
}
return false;
}
} }