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

Fixed one more bug

Browse source
This commit is contained in:
Georgy Litvinov 2016-09-21 23:43:21 +03:00 • committed by Georgy Litvinov
parent 10bb3caf0c
commit 25cb9d03a9
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/java/writer2latex/xhtml/GreenstoneTags.java
View file

@ -63,28 +63,24 @@ public class GreenstoneTags {
} }
} }
} }
return hnode; return hnode;
} }
protected static Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){ protected static Node processPageBreak(Node currentNode, Node hnode, Integer pageNum){
if (pageTags.equals(NONE)){ if (pageTags.equals(NONE)){
return hnode; return hnode;
} }
if ( !( currentNode.getNodeType() == Node.ELEMENT_NODE if ( !( currentNode.getNodeType() == Node.ELEMENT_NODE
&& currentNode.getNodeName().equals(XMLString.TEXT_H)
&& Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL) != null && Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL) != null
&& !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty() && !Misc.getAttribute(currentNode, XMLString.TEXT_OUTLINE_LEVEL).isEmpty()
) )
&& !headerStack.isEmpty()
|| pageTags.equals("sections")
) { ) {
if (pageOpened) { if (pageOpened) {
hnode = closePage(hnode); hnode = closePage(hnode);
} }
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
} }
return hnode; return hnode;
} }
//Method to open main document tag //Method to open main document tag

15
source/java/writer2latex/xhtml/TextConverter.java
View file

@ -105,6 +105,7 @@ public class TextConverter extends ConverterHelper {
private String headingTags = config.getHeadingTags(); private String headingTags = config.getHeadingTags();
private String pageTags = config.getPageTags(); private String pageTags = config.getPageTags();
private boolean breakBeforeNextNode = false;
public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) { public TextConverter(OfficeReader ofr, XhtmlConfig config, Converter converter) {
super(ofr,config,converter); super(ofr,config,converter);
@ -200,7 +201,7 @@ public class TextConverter extends ConverterHelper {
int nLen = nList.getLength(); int nLen = nList.getLength();
int i = 0; int i = 0;
//hard Break after marker //hard Break after marker
boolean breakBeforeNextNode = false; breakBeforeNextNode = false;
while (i < nLen) { while (i < nLen) {
Node child = nList.item(i); Node child = nList.item(i);
@ -214,7 +215,7 @@ 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, breakBeforeNextNode); 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?
@ -263,7 +264,7 @@ 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, breakBeforeNextNode); hnode = processPageBreaks(child, hnode, style);
hnode = GreenstoneTags.processHeading(child, hnode, pageNum); hnode = GreenstoneTags.processHeading(child, hnode, pageNum);
hnode = maybeSplit(hnode,style,nOutlineLevel); hnode = maybeSplit(hnode,style,nOutlineLevel);
nCharacterCount+=OfficeReader.getCharacterCount(child); nCharacterCount+=OfficeReader.getCharacterCount(child);
@ -273,7 +274,7 @@ public class TextConverter extends ConverterHelper {
nodeName.equals(XMLString.TEXT_UNORDERED_LIST) || // old nodeName.equals(XMLString.TEXT_UNORDERED_LIST) || // old
nodeName.equals(XMLString.TEXT_ORDERED_LIST)) // old nodeName.equals(XMLString.TEXT_ORDERED_LIST)) // old
{ {
hnode = processPageBreaks(child, hnode,null, breakBeforeNextNode); hnode = processPageBreaks(child, hnode,null);
hnode = maybeSplit(hnode,null); hnode = maybeSplit(hnode,null);
if (listIsOnlyHeadings(child)) { if (listIsOnlyHeadings(child)) {
nDontSplitLevel--; nDontSplitLevel--;
@ -286,7 +287,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, breakBeforeNextNode); hnode = processPageBreaks(child, hnode,style);
hnode = maybeSplit(hnode,style); hnode = maybeSplit(hnode,style);
getTableCv().handleTable(child,hnode); getTableCv().handleTable(child,hnode);
} }
@ -294,7 +295,7 @@ public class TextConverter extends ConverterHelper {
getTableCv().handleTable(child,hnode); getTableCv().handleTable(child,hnode);
} }
else if (nodeName.equals(XMLString.TEXT_SECTION)) { else if (nodeName.equals(XMLString.TEXT_SECTION)) {
hnode = processPageBreaks(child, hnode,null, breakBeforeNextNode); hnode = processPageBreaks(child, hnode,null);
hnode = maybeSplit(hnode,null); hnode = maybeSplit(hnode,null);
nDontSplitLevel--; nDontSplitLevel--;
hnode = handleSection(child,hnode); hnode = handleSection(child,hnode);
@ -1549,7 +1550,7 @@ public class TextConverter extends ConverterHelper {
Misc.getPosInteger(node.getAttribute(XMLString.TEXT_OUTLINE_LEVEL),1): Misc.getPosInteger(node.getAttribute(XMLString.TEXT_OUTLINE_LEVEL),1):
Misc.getPosInteger(node.getAttribute(XMLString.TEXT_LEVEL),1); Misc.getPosInteger(node.getAttribute(XMLString.TEXT_LEVEL),1);
} }
private Node processPageBreaks(Node currentNode, Node hnode,StyleWithProperties style, boolean breakBeforeNextNode){ private Node processPageBreaks(Node currentNode, Node hnode,StyleWithProperties style){
Integer newPageNumber = null; Integer newPageNumber = null;
if (style != null) { if (style != null) {
// If style:paragraph-properties extists and contain // If style:paragraph-properties extists and contain

4
source/java/writer2latex/xhtml/XhtmlConfig.java
View file

@ -293,8 +293,8 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
options[UPLINK] = new Option("uplink",""); options[UPLINK] = new Option("uplink","");
options[DIRECTORY_ICON] = new Option("directory_icon",""); options[DIRECTORY_ICON] = new Option("directory_icon","");
options[DOCUMENT_ICON] = new Option("document_icon",""); options[DOCUMENT_ICON] = new Option("document_icon","");
options[HEADING_TAGS] = new Option("heading_tags","none"); options[HEADING_TAGS] = new Option("heading_tags","sections");
options[PAGE_TAGS] = new Option("page_tags","none"); options[PAGE_TAGS] = new Option("page_tags","div");
} }
protected void readInner(Element elm) { protected void readInner(Element elm) {