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

Fixed some mistakes from previous commits

Browse source
This commit is contained in:
George Litvinov 2018-11-07 16:25:08 +03:00 • committed by Georgy Litvinov
parent 61b94b2886
commit 4021dc3b99
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ public class GreenstoneTags {
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;
//headings none //headings none
private static String headingTags = "headings"; private static String headingTags = "sections";
//sections div none //sections div none
private static String pageTags = "sections"; private static String pageTags = "sections";
@ -51,7 +51,7 @@ public class GreenstoneTags {
openHeadingSection(hnode, title); openHeadingSection(hnode, title);
headerStack.offerFirst(Integer.parseInt(sLevel)); headerStack.offerFirst(Integer.parseInt(sLevel));
} }
if (!pageTags.equals(NONE)){ if (!pageTags.equals(NONE) && !headingTags.equals(NONE)){
hnode = openPage(hnode, pageNum); hnode = openPage(hnode, pageNum);
} }

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

@ -1675,9 +1675,9 @@ public class TextConverter extends ConverterHelper {
if (inFootnote){ if (inFootnote){
return hnode; return hnode;
} }
if (pageTags.equals("none")) { /* if (pageTags.equals("none")) {
return hnode; return hnode;
} }*/
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