Support toc entries without headings in EPUB export

git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@107 f0f2a975-2e09-46c8-9428-3b39399b9f3c

build.xml

@@ -35,7 +35,7 @@
     <!-- configure the directories -->
     <property name="jarfile" value="writer2latex"/>
     <property name="basename" value="writer2latex11"/>
-    <property name="distrofile" value="${basename}7alpha.zip" />
+    <property name="distrofile" value="${basename}8alpha.zip" />
     <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
     <property name="src" location="source/java"/>
     <property name="source.distro" location="source/distro" />

source/distro/changelog.txt

@@ -2,6 +2,8 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.8 ----------
 
+[w2x] Crossed out headings are ignored in EPUB export, but retained in the external toc
+
 [all] Added Farsi translation from Mostafa Barmshory
 
 [w2l] Added support for xepersian.sty (fa_IR locale, requires XeTeX backend and multilingual=true)

source/java/writer2latex/api/ConverterFactory.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-05-09)
+ *  Version 1.2 (2011-06-05)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.1.8";
-    private static final String DATE = "2011-05-09";
+    private static final String DATE = "2011-06-05";
 	
     /** Return the Writer2LaTeX version in the form
      *  (major version).(minor version).(patch level)<br/>

source/java/writer2latex/xhtml/TextConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2011-03-09)
+ *  Version 1.2 (2011-06-05)
  *
  */
 
@@ -610,18 +610,6 @@ public class TextConverter extends ConverterHelper {
     private void handleHeading(Element onode, Node hnode, boolean bAfterSplit,
         ListStyle listStyle, int nListLevel, boolean bUnNumbered,
         boolean bRestart, int nStartValue) {
-    	String sStyleName = onode.getAttribute(XMLString.TEXT_STYLE_NAME);
-		StyleWithProperties style = ofr.getParStyle(sStyleName);
-        if (!bDisplayHiddenText && style!=null && "none".equals(style.getProperty(XMLString.TEXT_DISPLAY))) { return; }
-    	if (!bUnNumbered) {
-    		// If the heading uses a paragraph style which sets an explicit empty list style name, it's unnumbered
-    		if (style!=null) {
-    			String sListStyleName = style.getListStyleName();
-    			if (sListStyleName!=null && sListStyleName.length()==0) {
-    				bUnNumbered = true;
-    			}
-    		}
-    	}
 
         // Note: nListLevel may in theory be different from the outline level,
         // though the ui in OOo does not allow this
@@ -632,7 +620,42 @@ public class TextConverter extends ConverterHelper {
 
         // Note: Conditional styles are not supported
         int nLevel = getOutlineLevel(onode);
-        if (nLevel<=6) {
+        if (nLevel<=6) { // Export as heading
+        	String sStyleName = onode.getAttribute(XMLString.TEXT_STYLE_NAME);
+    		StyleWithProperties style = ofr.getParStyle(sStyleName);
+    		
+    		// Check for hidden text
+            if (!bDisplayHiddenText && style!=null && "none".equals(style.getProperty(XMLString.TEXT_DISPLAY))) { return; }
+            
+            // Numbering
+        	if (!bUnNumbered) {
+        		// If the heading uses a paragraph style which sets an explicit empty list style name, it's unnumbered
+        		if (style!=null) {
+        			String sListStyleName = style.getListStyleName();
+        			if (sListStyleName!=null && sListStyleName.length()==0) {
+        				bUnNumbered = true;
+        			}
+        		}
+        	}
+        	ListCounter counter = null;
+        	String sLabel="";
+            if (!bUnNumbered) {
+            	counter = getListCounter(listStyle); 
+            	if (bRestart) { counter.restart(nListLevel,nStartValue); }
+            	sLabel = counter.step(nListLevel).getLabel();
+            }        	
+        	
+    		// In EPUB export, a striked out heading will only appear in the external toc            
+        	boolean bTocOnly = false;
+        	if (converter.isOPS() && style!=null) {
+        		String sStrikeOut = style.getProperty(XMLString.STYLE_TEXT_LINE_THROUGH_STYLE, true);
+        		if (sStrikeOut!=null && !"none".equals(sStrikeOut)) {
+        			bTocOnly = true;
+        		}
+        	}
+
+        	// Export the heading
+        	if (!bTocOnly) {
         		if (nLevel==1) { currentChapter = onode; }
         		// If split output, add headings of higher levels
         		if (bAfterSplit && nSplit>0) {
@@ -668,11 +691,7 @@ public class TextConverter extends ConverterHelper {
         		prependAsapNode(heading);
 
         		// Prepend numbering
-            String sLabel="";
         		if (!bUnNumbered) {
-            	ListCounter counter = getListCounter(listStyle); 
-            	if (bRestart) { counter.restart(nListLevel,nStartValue); }
-            	sLabel = counter.step(nListLevel).getLabel();
         			if (config.zenHack() && nLevel==2) {
         				// Hack for ePub Zen Garden: Special style for the prefix at level 2
         				// TODO: Replace by some proper style map construct...
@@ -715,13 +734,36 @@ public class TextConverter extends ConverterHelper {
         			applyStyle(innerInfo, content);
         		}
         		traverseInlineText(onode,content);
-			
                 // Keep track of current headings for split output
                 currentHeading[nLevel] = heading;
                 for (int i=nLevel+1; i<=6; i++) {
                     currentHeading[i] = null;
                 }
         	}
+        	else {
+        		if (!bInToc) {
+        			// Add in external content. For single file output we include all level 1 headings + their target
+        			// Targets are added only when the toc level is deeper than the split level 
+        			if (nLevel<=nExternalTocDepth) {
+                		// Add an empty div to use as target, if required
+        				String sTarget = null;
+        				if (nLevel>nSplit) {
+        					Element div = converter.createElement("div");        			
+        					hnode.appendChild(div);
+        					sTarget = "toc"+(++nTocIndex);
+        					converter.addTarget(div,sTarget);
+        				}
+        				converter.addContentEntry(sLabel+converter.getPlainInlineText(onode), nLevel, sTarget);
+        			}
+        		}
+                // Keep track of current headings for split output
+                currentHeading[nLevel] = null;
+                for (int i=nLevel+1; i<=6; i++) {
+                    currentHeading[i] = null;
+                }
+        		
+        	}
+        }
         else { // beyond h6 - export as ordinary paragraph
             handleParagraph(onode,hnode);
         }