Changed option for greenstone markup

src/main/java/writer2latex/xhtml/XhtmlConfig.java

@@ -158,7 +158,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     private static final int UPLINK = 56;
     private static final int DIRECTORY_ICON = 57;
     private static final int DOCUMENT_ICON = 58;
-    private static final int HEADING_TAGS = 59;
+    private static final int GREENSTONE = 59;
     private static final int PAGINATION = 60;
     private static final int MIN_LETTER_SPACING = 61;
     private static final int PAGE_BREAK_STYLE = 62;
@@ -287,7 +287,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         options[UPLINK] = new Option("uplink","");
         options[DIRECTORY_ICON] = new Option("directory_icon","");
         options[DOCUMENT_ICON] = new Option("document_icon","");
-        options[HEADING_TAGS] = new Option("heading_tags","sections");
+        options[GREENSTONE] = new BooleanOption("greenstone","false");
         options[PAGINATION] = new BooleanOption("pagination","true");
         options[MIN_LETTER_SPACING] = new Option("min_letter_spacing","0.15");
         options[PAGE_BREAK_STYLE] = new Option("page_break_style","");
@@ -436,11 +436,11 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public String getXhtmlUplink() { return options[UPLINK].getString(); }
     public String getXhtmlDirectoryIcon() { return options[DIRECTORY_ICON].getString(); }
     public String getXhtmlDocumentIcon() { return options[DOCUMENT_ICON].getString(); }
-    public String getHeadingTags() { 
+    public boolean getGreenstoneSeparation() { 
     	if ( ((IntegerOption) options[SPLIT_LEVEL]).getValue() != 0) {
-    		return "none";
+    		return false;
     	}
-    	return options[HEADING_TAGS].getString(); }
+    	return ((BooleanOption) options[GREENSTONE]).getValue(); }
 		public boolean getAlignSplitsToPages() { return ((BooleanOption) options[ALIGN_SPLITS_TO_PAGES]).getValue(); }
 
     public boolean pagination() {  return ((BooleanOption) options[PAGINATION]).getValue(); }

src/main/java/writer2latex/xhtml/content/Separator.java

@@ -30,7 +30,7 @@ public class Separator {
 	private static LinkedList<Integer> headerStack = new LinkedList<Integer>();
 	private static boolean pageOpened = false; 
 	//headings none
-	private static String headingSeparation = "sections";
+	private static boolean greenstoneSeparation;
 	//sections div none
 	private static boolean pagination;
 	private static Converter converter = null;
@@ -39,7 +39,7 @@ public class Separator {
 
 	public Separator(XhtmlConfig config,Converter converter) {
 		this.converter = converter;
-		headingSeparation = config.getHeadingTags();
+		greenstoneSeparation = config.getGreenstoneSeparation();
 		pagination = config.pagination();
 		splitLevel = config.getXhtmlSplitLevel();
 		alignSplitToPages = config.getAlignSplitsToPages();
@@ -59,6 +59,10 @@ public class Separator {
 			return hnode;
 		}
 		int curLevel = Integer.parseInt(sLevel);
+
+		if (!greenstoneSeparation && ! needSplitFiles(curLevel,pageNum)) {
+			return hnode;
+		}
 		if (needSplitFiles(curLevel,pageNum)){
 			prevPageContainer = hnode;
 		}
@@ -67,7 +71,7 @@ public class Separator {
 			hnode = closePage(hnode);
 		}
 
-		if (headingSeparation.equals(SECTIONS)) {
+		if (greenstoneSeparation) {
 			closeCommentHeadings(hnode, curLevel);
 		}
 
@@ -76,7 +80,7 @@ public class Separator {
 			lastSplitPageNum = pageNum;
 		}
 
-		if (headingSeparation.equals(SECTIONS)) {
+		if (greenstoneSeparation) {
 			openCommentHeading(hnode, title);
 			headerStack.offerFirst(Integer.parseInt(sLevel));
 
@@ -96,7 +100,7 @@ public class Separator {
 	}
 
 	private boolean needSplitFiles(int curLevel,int pageNum) {
-		if (splitLevel >= curLevel && (converter.outFileHasContent() || converter.getOutFileIndex() == 1)) {
+		if (splitLevel >= curLevel && converter.outFileHasContent()) {
 			if (lastSplitPageNum != pageNum) {
 				return true;	
 			}
@@ -124,10 +128,10 @@ public class Separator {
 	 * Opens main document section heading tag
 	 */
 	public Node startDocument(Node hnode, String title, int pageNum){
-		if (noHeadingSeparation() && !pagination){
+		if (!greenstoneSeparation && !pagination){
 			return hnode;
 		}
-		if(headingSeparation.equals(SECTIONS)){
+		if(greenstoneSeparation){
 			//Create global section
 			openCommentHeading(hnode, title);
 		}
@@ -137,13 +141,13 @@ public class Separator {
 	}
 	//Method to close open tags at the end of the document
 	public Node endDocument(Node hnode){
-		if (noHeadingSeparation() && !pagination){
+		if (!greenstoneSeparation && !pagination){
 			return hnode;
 		}
 		if (pageOpened){
 			hnode = closePage(hnode);
 		}
-		if (headingSeparation.equals(SECTIONS)){
+		if (greenstoneSeparation){
 			closeCommentHeadings(hnode, 0);
 			//Close global section
 			addCloseComment(hnode);
@@ -334,9 +338,7 @@ public class Separator {
 		return container;
 	}
 	
-	private static boolean noHeadingSeparation() {
-		return headingSeparation.equals(NONE);
-	}
+	
 	private static String openHeadingCommentText(String title) {
 		String comment = "<Section>\n<Description>\n<Metadata name=\"Title\">" + title
 				+ "</Metadata>\n</Description>";

src/main/oxt/writer2xhtml/description.xml

@@ -5,7 +5,7 @@
 			 
   <identifier value="pro.litvinovg.writer2paginatedhtml" />
   
-  <version value="0.4.4" />
+  <version value="0.4.5" />
   
   <dependencies>
     <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0"/>