A few w2x fixes

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

build.xml

@@ -2,7 +2,7 @@
   ############################################################################
   # This is the Ant build file for writer2latex
   # Original: Sep 2004 (mgn)
-  # version 1.2 (2010-04-17)
+  # version 1.2 (2010-06-19)
   ############################################################################
 -->
 <project name="w2l" default="help" basedir=".">
@@ -35,7 +35,7 @@
     <!-- configure the directories -->
     <property name="jarfile" value="writer2latex"/>
     <property name="basename" value="writer2latex11"/>
-    <property name="distrofile" value="${basename}3alpha.zip" />
+    <property name="distrofile" value="${basename}4alpha.zip" />
     <!--<property name="sourcedistrofile" value="${basename}source.zip" />-->
     <property name="src" location="source/java"/>
     <property name="source.distro" location="source/distro" />
@@ -169,7 +169,16 @@
                 	<include name="writer2latex/xmerge/**/*.class"/>
                 	<!-- include the portions of w2l necessary to convert formulas -->
                 	<include name="writer2latex/latex/StarMathConverter.class"/>
+                	<include name="writer2latex/latex/CharClasses.class"/>
+                	<include name="writer2latex/latex/Token.class"/>
+                   	<include name="writer2latex/latex/TGroup.class"/>
+                   	<include name="writer2latex/latex/SmTokenTableEntry.class"/>
+                   	<include name="writer2latex/latex/SmTokenTable.class"/>
+                   	<include name="writer2latex/latex/SmToken.class"/>
                 	<include name="writer2latex/latex/LaTeXDocumentPortion.class"/>
+                	<include name="writer2latex/latex/LaTeXConfig.class"/>
+                	<include name="writer2latex/latex/util/HeadingMap.class"/>
+                    <include name="writer2latex/latex/util/StyleMap.class"/>
                 	<include name="writer2latex/latex/i18n/*.class"/>
                 </patternset>
             </fileset>

source/distro/changelog.txt

@@ -2,6 +2,16 @@ Changelog for Writer2LaTeX version 1.0 -> 1.2
 
 ---------- version 1.1.4 ----------
 
+[w2x] New option endnotes_heading: The value of this (if non-empty) is used as heading for the endnotes
+
+[w2x] The option add_bom now only has effect if the encoding is UTF-8
+
+[w2x] Filter bugfix: Added missing classes to produce LaTeX formulas
+
+[w2x] Bugfix: Pretty printing no longer results in unwanted spaces in the text
+
+[w2x] Added support for unnumbered headings
+
 [w2x] Added Finnish translation from Samuli Selin (merged from 1.0.2)
 
 [w2x] Added help content for custom format

source/java/org/openoffice/da/comp/writer2xhtml/ConfigurationDialog.java

@@ -20,7 +20,7 @@
 *
 *  All Rights Reserved.
 * 
-*  Version 1.2 (2010-05-06)
+*  Version 1.2 (2010-06-20)
 *
 */ 
 
@@ -99,8 +99,8 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     	
     	@Override protected void setControls(DialogAccess dlg) {
     		checkBoxFromConfig(dlg, "NoDoctype", "no_doctype");
-    		checkBoxFromConfig(dlg, "AddBOM", "add_bom");
     		listBoxFromConfig(dlg, "Encoding", "encoding", sEncodingValues, (short) 0);
+    		checkBoxFromConfig(dlg, "AddBOM", "add_bom");
     		
     		if ("true".equals(config.getOption("hexadecimal_entities"))) {
     			dlg.setListBoxSelectedItem("HexadecimalEntities", (short) 0);
@@ -109,6 +109,7 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     			dlg.setListBoxSelectedItem("HexadecimalEntities", (short) 1);	
     		}
     		
+
     		checkBoxFromConfig(dlg, "UseNamedEntities", "use_named_entities");
     		checkBoxFromConfig(dlg, "Multilingual", "multilingual");
     		checkBoxFromConfig(dlg, "PrettyPrint", "pretty_print");
@@ -118,8 +119,8 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     	
     	@Override protected void getControls(DialogAccess dlg) {
     		checkBoxToConfig(dlg, "NoDoctype", "no_doctype");
-    		checkBoxToConfig(dlg, "AddBOM", "add_bom");
     		listBoxToConfig(dlg, "Encoding", "encoding", sEncodingValues);
+    		checkBoxToConfig(dlg, "AddBOM", "add_bom");
     		
     		config.setOption("hexadecimal_entities", Boolean.toString(dlg.getListBoxSelectedItem("HexadecimalEntities")==(short)0));
     		
@@ -137,9 +138,10 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     	}
 
     	private void updateControls(DialogAccess dlg) {
-    		boolean bUnicode = dlg.getListBoxSelectedItem("Encoding")<2;
+    		int nEncoding = dlg.getListBoxSelectedItem("Encoding");
-    		dlg.setControlEnabled("HexadecimalEntitiesLabel", !bUnicode);
+    		dlg.setControlEnabled("AddBOM", nEncoding==0); // Only for UTF-8
-    		dlg.setControlEnabled("HexadecimalEntities", !bUnicode);
+    		dlg.setControlEnabled("HexadecimalEntitiesLabel", nEncoding>1); // Not for UNICODE
+    		dlg.setControlEnabled("HexadecimalEntities", nEncoding>1); // Not for UNICODE
     	}
     	
     }
@@ -399,10 +401,12 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     	
     	@Override protected void setControls(DialogAccess dlg) {
     		listBoxFromConfig(dlg, "Formulas", "formulas", sFormulaValues, (short) 0);
+    		textFieldFromConfig(dlg, "EndnotesHeading", "endnotes_heading");
     	}
     	
     	@Override protected void getControls(DialogAccess dlg) {
     		listBoxToConfig(dlg, "Formulas", "formulas", sFormulaValues);
+    		textFieldToConfig(dlg, "EndnotesHeading", "endnotes_heading");
     	}
     	
     	@Override protected boolean handleEvent(DialogAccess dlg, String sMethod) {

source/java/writer2latex/api/ConverterFactory.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-05-27)
+ *  Version 1.2 (2010-06-20)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.1.4";
-    private static final String DATE = "2010-05-27";
+    private static final String DATE = "2010-06-20";
 	
     /** 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 (2010-05-17)
+ *  Version 1.2 (2010-06-20)
  *
  */
 
@@ -501,11 +501,11 @@ public class TextConverter extends ConverterHelper {
 	
     private void handleHeading(Element onode, Node hnode, boolean bAfterSplit) {
         int nListLevel = getOutlineLevel((Element)onode);
-        boolean bUnNumbered = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_IS_LIST_HEADER));
+        //boolean bUnNumbered = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_IS_LIST_HEADER));
         boolean bRestart = "true".equals(Misc.getAttribute(onode,XMLString.TEXT_RESTART_NUMBERING));
         int nStartValue = Misc.getPosInteger(Misc.getAttribute(onode,XMLString.TEXT_START_VALUE),1)-1;
         handleHeading(onode, hnode, bAfterSplit, ofr.getOutlineStyle(),
-            nListLevel, bUnNumbered, bRestart, nStartValue);        
+            nListLevel, false, bRestart, nStartValue);        
     }
 
     /*
@@ -515,11 +515,21 @@ public class TextConverter extends ConverterHelper {
         ListStyle listStyle, int nListLevel, boolean bUnNumbered,
         boolean bRestart, int nStartValue) {
     	String sStyleName = onode.getAttribute(XMLString.TEXT_STYLE_NAME);
+    	if (!bUnNumbered) {
+    		// If the heading uses a paragraph style which sets an explicit empty list style name, it's unnumbered
+    		StyleWithProperties style = ofr.getParStyle(sStyleName);
+    		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
 
         // Numbering: It is possible to define outline numbering in CSS2
-        // using counters; but this is not supported by Mozilla 1.0.
+        // using counters; but this is not supported in all browsers
         // TODO: Offer CSS2 solution as an alternative later.
 
         // Note: Conditional styles are not supported
@@ -560,16 +570,19 @@ public class TextConverter extends ConverterHelper {
             prependAsapNode(heading);
 			
             // Prepend numbering
-            ListCounter counter = getListCounter(listStyle); 
+            String sLabel="";
-            if (bRestart) { counter.restart(nListLevel,nStartValue); }
+            if (!bUnNumbered) {
-            String sLabel = counter.step(nListLevel).getLabel();
+            	ListCounter counter = getListCounter(listStyle); 
-            if (config.zenHack() && nLevel==2) {
+            	if (bRestart) { counter.restart(nListLevel,nStartValue); }
-            	// Hack for ePub Zen Garden: Special style for the prefix at level 2
+            	sLabel = counter.step(nListLevel).getLabel();
-            	// TODO: Replace by some proper style map construct...
+            	if (config.zenHack() && nLevel==2) {
-            	insertListLabel(listStyle,nListLevel,"SectionNumber",counter.getPrefix(),counter.getLabelAndSuffix(),heading);
+            		// Hack for ePub Zen Garden: Special style for the prefix at level 2
-            }
+            		// TODO: Replace by some proper style map construct...
-            else {
+            		insertListLabel(listStyle,nListLevel,"SectionNumber",counter.getPrefix(),counter.getLabelAndSuffix(),heading);
-            	insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading);            	
+            	}
+            	else {
+            		insertListLabel(listStyle,nListLevel,"SectionNumber",null,sLabel,heading);            	
+            	}
             }
 
             // Add to toc
@@ -1606,19 +1619,27 @@ public class TextConverter extends ConverterHelper {
 
     public void insertEndnotes(Node hnode) {
         int n = endnotes.size();
-        if (nSplit>0 && n>0) { hnode = converter.nextOutFile(); }
+        if (n>0) {
-        for (int i=0; i<n; i++) {
+        	if (nSplit>0) { hnode = converter.nextOutFile(); }
-            Node endnote = endnotes.get(i);
+        	String sHeading = config.getEndnotesHeading();
-            String sId = Misc.getAttribute(endnote,XMLString.TEXT_ID); 
+        	if (sHeading.length()>0) {
-            Node citation = Misc.getChildByTagName(endnote,XMLString.TEXT_ENDNOTE_CITATION);
+        		Element heading = converter.createElement("h1");
-            if (citation==null) { // try oasis
+        		hnode.appendChild(heading);
-                citation = Misc.getChildByTagName(endnote,XMLString.TEXT_NOTE_CITATION);
+        		heading.appendChild(converter.createTextNode(sHeading));
-            }
+        	}
-            Node body = Misc.getChildByTagName(endnote,XMLString.TEXT_ENDNOTE_BODY);
+        	for (int i=0; i<n; i++) {
-            if (body==null) { // try oasis
+        		Node endnote = endnotes.get(i);
-                body = Misc.getChildByTagName(endnote,XMLString.TEXT_NOTE_BODY);
+        		String sId = Misc.getAttribute(endnote,XMLString.TEXT_ID); 
-            }
+        		Node citation = Misc.getChildByTagName(endnote,XMLString.TEXT_ENDNOTE_CITATION);
-            traverseNoteBody(sId,sEntCitStyle,citation,body,hnode);
+        		if (citation==null) { // try oasis
+        			citation = Misc.getChildByTagName(endnote,XMLString.TEXT_NOTE_CITATION);
+        		}
+        		Node body = Misc.getChildByTagName(endnote,XMLString.TEXT_ENDNOTE_BODY);
+        		if (body==null) { // try oasis
+        			body = Misc.getChildByTagName(endnote,XMLString.TEXT_NOTE_BODY);
+        		}
+        		traverseNoteBody(sId,sEntCitStyle,citation,body,hnode);
+        	}
         }
     }
 

source/java/writer2latex/xhtml/XhtmlConfig.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-05-13)
+ *  Version 1.2 (2010-06-20)
  *
  */
 
@@ -41,7 +41,7 @@ import writer2latex.util.Misc;
 
 public class XhtmlConfig extends writer2latex.base.ConfigBase {
     // Implement configuration methods
-    protected int getOptionCount() { return 43; }
+    protected int getOptionCount() { return 44; }
     protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; }
 	
     // Override setOption: To be backwards compatible, we must accept options
@@ -105,21 +105,22 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     private static final int FLOAT_OBJECTS = 25;
     private static final int TABSTOP_STYLE = 26;
     private static final int FORMULAS = 27;
-    private static final int SPLIT_LEVEL = 28;
+    private static final int ENDNOTES_HEADING = 28;
-    private static final int REPEAT_LEVELS = 29;
+    private static final int SPLIT_LEVEL = 29;
-    private static final int CALC_SPLIT = 30;
+    private static final int REPEAT_LEVELS = 30;
-    private static final int DISPLAY_HIDDEN_SHEETS = 31;
+    private static final int CALC_SPLIT = 31;
-    private static final int DISPLAY_HIDDEN_ROWS_COLS = 32;
+    private static final int DISPLAY_HIDDEN_SHEETS = 32;
-    private static final int DISPLAY_FILTERED_ROWS_COLS = 33;
+    private static final int DISPLAY_HIDDEN_ROWS_COLS = 33;
-    private static final int APPLY_PRINT_RANGES = 34;
+    private static final int DISPLAY_FILTERED_ROWS_COLS = 34;
-    private static final int USE_TITLE_AS_HEADING = 35;
+    private static final int APPLY_PRINT_RANGES = 35;
-    private static final int USE_SHEET_NAMES_AS_HEADINGS = 36;
+    private static final int USE_TITLE_AS_HEADING = 36;
-    private static final int XSLT_PATH = 37;
+    private static final int USE_SHEET_NAMES_AS_HEADINGS = 37;
-    private static final int SAVE_IMAGES_IN_SUBDIR = 38;
+    private static final int XSLT_PATH = 38;
-    private static final int UPLINK = 39;
+    private static final int SAVE_IMAGES_IN_SUBDIR = 39;
-    private static final int DIRECTORY_ICON = 40;
+    private static final int UPLINK = 40;
-    private static final int DOCUMENT_ICON = 41;
+    private static final int DIRECTORY_ICON = 41;
-    private static final int ZEN_HACK = 42; // temporary hack for ePub Zen Garden styles
+    private static final int DOCUMENT_ICON = 42;
+    private static final int ZEN_HACK = 43; // temporary hack for ePub Zen Garden styles
 
     protected ComplexOption xheading = addComplexOption("heading-map");
     protected ComplexOption xpar = addComplexOption("paragraph-map");
@@ -165,6 +166,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         options[COLUMN_SCALING] = new Option("column_scaling","100%");
         options[FLOAT_OBJECTS] = new BooleanOption("float_objects","true");
         options[TABSTOP_STYLE] = new Option("tabstop_style","");
+        options[ENDNOTES_HEADING] = new Option("endnotes_heading","");
         options[FORMULAS] = new IntegerOption("formulas","starmath") {
         	@Override public void setString(String sValue) {
         		super.setString(sValue);
@@ -296,6 +298,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public String getXhtmlColumnScaling() { return options[COLUMN_SCALING].getString(); }
     public boolean xhtmlFloatObjects() { return ((BooleanOption) options[FLOAT_OBJECTS]).getValue(); }
     public String getXhtmlTabstopStyle() { return options[TABSTOP_STYLE].getString(); }
+    public String getEndnotesHeading() { return options[ENDNOTES_HEADING].getString(); }
     public int formulas() { return ((IntegerOption) options[FORMULAS]).getValue(); }
     public int getXhtmlSplitLevel() { return ((IntegerOption) options[SPLIT_LEVEL]).getValue(); }
     public int getXhtmlRepeatLevels() { return ((IntegerOption) options[REPEAT_LEVELS]).getValue(); }

source/java/writer2latex/xhtml/XhtmlDocument.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.2 (2010-04-23)
+ *  Version 1.2 (2010-06-19)
  *
  */
  
@@ -49,6 +49,8 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  *  An implementation of <code>Document</code> for
@@ -65,15 +67,17 @@ public class XhtmlDocument extends DOMDocument {
     /** Constant to identify XHTML + MathML documents */
     public static final int XHTML_MATHML = 2;
 
-    /** Constant to identify XHTML + MathML documents using the xsl transformations
+    /** Constant to identify XHTML + MathML documents using the XSL transformations
      *  from w3c's math working group (http://www.w3.org/Math/XSL/)
      */
     public static final int XHTML_MATHML_XSL = 3;
-	
+    
+    // Some static data
     private static final String[] sExtension = { ".html", ".xhtml", ".xhtml", ".xml" };
 
-    private static final String[] sEmpty = { "base", "meta", "link", "hr", "br", "param", "img", "area", "input", "col" };
+    private static Set<String> blockPrettyPrint;
-	
+    private static Set<String> conditionalBlockPrettyPrint;
+    private static Set<String> emptyElements;
     private static String[] entities; // Not convenient to define directly due to a lot of null values
 
     // Type of document
@@ -102,6 +106,139 @@ public class XhtmlDocument extends DOMDocument {
     private Element headerNode = null;
     private Element footerNode = null;
     
+    // Initialize static data
+    static {
+    	// Paragraphs and headings always block pretty printing
+    	blockPrettyPrint = new HashSet<String>();
+    	blockPrettyPrint.add("p");
+    	blockPrettyPrint.add("h1");
+    	blockPrettyPrint.add("h2");
+    	blockPrettyPrint.add("h3");
+    	blockPrettyPrint.add("h4");
+    	blockPrettyPrint.add("h5");
+    	blockPrettyPrint.add("h6");
+    	
+    	// List items and table cells may block pretty printing, depending on the context
+    	conditionalBlockPrettyPrint = new HashSet<String>();
+    	conditionalBlockPrettyPrint.add("li");
+    	conditionalBlockPrettyPrint.add("th");
+    	conditionalBlockPrettyPrint.add("td");
+
+    	// These elements are empty
+    	emptyElements = new HashSet<String>();
+    	emptyElements.add("base");
+    	emptyElements.add("meta");
+    	emptyElements.add("link");
+    	emptyElements.add("hr");
+    	emptyElements.add("br");
+    	emptyElements.add("param");
+    	emptyElements.add("img");
+    	emptyElements.add("area");
+    	emptyElements.add("input");
+    	emptyElements.add("col");    
+    	
+    	// Named character entities (currently only those within the ISO latin 1 range)
+    	entities = new String[256];
+    	// Latin 1 symbols
+    	entities[160]="&nbsp;";
+    	entities[161]="&iexcl;";
+    	entities[162]="&cent;";
+    	entities[163]="&pound;";
+    	entities[164]="&curren;";
+    	entities[165]="&yen;";
+    	entities[166]="&brvbar;";
+    	entities[167]="&sect;";
+    	entities[168]="&uml;";
+    	entities[169]="&copy;";
+    	entities[170]="&ordf;";
+    	entities[171]="&laquo;";
+    	entities[172]="&not;";
+    	entities[173]="&shy;";
+    	entities[174]="&reg;";
+    	entities[175]="&macr;";
+    	entities[176]="&deg;";
+    	entities[177]="&plusmn;";
+    	entities[178]="&sup2;";
+    	entities[179]="&sup3;";
+    	entities[180]="&acute;";
+    	entities[181]="&micro;";
+    	entities[182]="&para;";
+    	entities[183]="&middot;";
+    	entities[184]="&cedil;";
+    	entities[185]="&sup1;";
+    	entities[186]="&ordm;";
+    	entities[187]="&raquo;";
+    	entities[188]="&frac14;";
+    	entities[189]="&frac12;";
+    	entities[190]="&frac34;";
+    	entities[191]="&iquest;";
+    	entities[215]="&times;";
+    	entities[247]="&divide;";
+    	// Latin 1 characters
+    	entities[192]="&Agrave;";
+    	entities[193]="&Aacute;";
+    	entities[194]="&Acirc;";
+    	entities[195]="&Atilde;";
+    	entities[196]="&Auml;";
+    	entities[197]="&Aring;";
+    	entities[198]="&AElig;";
+    	entities[199]="&Ccedil;";
+    	entities[200]="&Egrave;";
+    	entities[201]="&Eacute;";
+    	entities[202]="&Ecirc;";
+    	entities[203]="&Euml;";
+    	entities[204]="&Igrave;";
+    	entities[205]="&Iacute;";
+    	entities[206]="&Icirc;";
+    	entities[207]="&Iuml;";
+    	entities[208]="&ETH;";
+    	entities[209]="&Ntilde;";
+    	entities[210]="&Ograve;";
+    	entities[211]="&Oacute;";
+    	entities[212]="&Ocirc;";
+    	entities[213]="&Otilde;";
+    	entities[214]="&Ouml;";
+    	entities[216]="&Oslash;";
+    	entities[217]="&Ugrave;";
+    	entities[218]="&Uacute;";
+    	entities[219]="&Ucirc;";
+    	entities[220]="&Uuml;";
+    	entities[221]="&Yacute;";
+    	entities[222]="&THORN;";
+    	entities[223]="&szlig;";
+    	entities[224]="&agrave;";
+    	entities[225]="&aacute;";
+    	entities[226]="&acirc;";
+    	entities[227]="&atilde;";
+    	entities[228]="&auml;";
+    	entities[229]="&aring;";
+    	entities[230]="&aelig;";
+    	entities[231]="&ccedil;";
+    	entities[232]="&egrave;";
+    	entities[233]="&eacute;";
+    	entities[234]="&ecirc;";
+    	entities[235]="&euml;";
+    	entities[236]="&igrave;";
+    	entities[237]="&iacute;";
+    	entities[238]="&icirc;";
+    	entities[239]="&iuml;";
+    	entities[240]="&eth;";
+    	entities[241]="&ntilde;";
+    	entities[242]="&ograve;";
+    	entities[243]="&oacute;";
+    	entities[244]="&ocirc;";
+    	entities[245]="&otilde;";
+    	entities[246]="&ouml;";
+    	entities[248]="&oslash;";
+    	entities[249]="&ugrave;";
+    	entities[250]="&uacute;";
+    	entities[251]="&ucirc;";
+    	entities[252]="&uuml;";
+    	entities[253]="&yacute;";
+    	entities[254]="&thorn;";
+    	entities[255]="&yuml;";
+    }
+    
     public static final String getExtension(int nType) {
         return sExtension[nType];
     } 
@@ -322,7 +459,7 @@ public class XhtmlDocument extends DOMDocument {
             cLimit = 65535;
         }
         
-        bAddBOM = config.xhtmlAddBOM();
+        bAddBOM = config.xhtmlAddBOM() && sEncoding.equals("UTF-8");
         bNoDoctype = config.xhtmlNoDoctype();
         bPrettyPrint = config.prettyPrint();
         bUseNamedEntities = config.useNamedEntities();
@@ -341,6 +478,7 @@ public class XhtmlDocument extends DOMDocument {
 	
     public String getFileExtension() { return super.getFileExtension(); }
     
+    // Optimize the usage of xml:dir and xml:lang attributes
     private void optimize(Element node, String sLang, String sDir) {
     	if (node.hasAttribute("xml:lang")) {
     		if (node.getAttribute("xml:lang").equals(sLang)) {
@@ -378,9 +516,6 @@ public class XhtmlDocument extends DOMDocument {
      *  @throws  IOException  If any I/O error occurs.
      */
     public void write(OutputStream os) throws IOException {
-        // Prepare named entities
-        prepareEntities();
-
         OutputStreamWriter osw = new OutputStreamWriter(os,sEncoding);
         // Add a BOM if the user desires so
         if (bAddBOM) { osw.write("\uFEFF"); }
@@ -409,16 +544,42 @@ public class XhtmlDocument extends DOMDocument {
         }
         Element doc = getContentDOM().getDocumentElement(); 
         optimize(doc,null,null);
-        write(doc,0,osw);
+        write(doc,bPrettyPrint ? 0 : -1,osw);
         osw.flush();
         osw.close();
     }
+    
+    private static boolean blockThis(Element node) {
+    	String sTagName = node.getTagName();
+    	if (blockPrettyPrint.contains(sTagName)) {
+    		return true;
+    	}
+    	else if (conditionalBlockPrettyPrint.contains(sTagName)) {
+    		// Block pretty printing if the content is anything but elements that block pretty print
+    		Node child = node.getFirstChild();
+    		while (child!=null) {
+    			if (child.getNodeType()==Node.ELEMENT_NODE && !blockPrettyPrint.contains(child.getNodeName())) {
+    				return true;
+    			}
+    			child = child.getNextSibling();
+    		}
+    		return false;
+    	}
+    	else {
+    		// Other elements block pretty printing if they contain text nodes
+    		Node child = node.getFirstChild();
+    		while (child!=null) {
+    			if (child.getNodeType()==Node.TEXT_NODE) {
+    				return true;
+    			}
+    			child = child.getNextSibling();
+    		}
+    		return false;
+    	}
+    }
 
-    private boolean isEmpty(String sTagName) {
+    private static boolean isEmpty(String sTagName) {
-        for (int i=0; i<sEmpty.length; i++) {
+        return emptyElements.contains(sTagName);
-            if (sEmpty[i].equals(sTagName)) { return true; }
-        }
-        return false;
     }
 	
     // Write nodes; we only need element, text and comment nodes
@@ -427,40 +588,31 @@ public class XhtmlDocument extends DOMDocument {
         switch (nType) {
             case Node.ELEMENT_NODE:
                 if (isEmpty(node.getNodeName())) {
-                    // This node must be empty, we ignore childnodes
+                    // This node must be empty, we ignore child nodes
                     if (nLevel>=0) { writeSpaces(nLevel,osw); }
                     osw.write("<"+node.getNodeName());
                     writeAttributes(node,osw);
                     osw.write(" />");
-                    if (bPrettyPrint && nLevel>=0) { osw.write("\n"); }
+                    if (nLevel>=0) { osw.write("\n"); }
                 }
                 else if (node.hasChildNodes()) {
-                    // Block pretty print from this node?
+                    int nNextLevel = (nLevel<0 || blockThis((Element)node)) ? -1 : nLevel+1;
-                    NodeList list = node.getChildNodes();
-                    int nLen = list.getLength();
-                    boolean bBlockPrettyPrint = false;
-                    if (nLevel>=0) {
-                        for (int i = 0; i < nLen; i++) {
-                            bBlockPrettyPrint |= list.item(i).getNodeType()==Node.TEXT_NODE;
-                        }
-                    }
                     // Print start tag
                     if (nLevel>=0) { writeSpaces(nLevel,osw); }
                     osw.write("<"+node.getNodeName());
                     writeAttributes(node,osw);
                     osw.write(">");
-                    if (bPrettyPrint && nLevel>=0 && !bBlockPrettyPrint) { osw.write("\n"); }
+                    if (nNextLevel>=0) { osw.write("\n"); }
                     // Print children
-                    for (int i = 0; i < nLen; i++) {
+                    Node child = node.getFirstChild();
-                        int nNextLevel;
+                    while (child!=null) {
-                        if (bBlockPrettyPrint || nLevel<0) { nNextLevel=-1; }
+                        write(child,nNextLevel,osw);
-                        else { nNextLevel=nLevel+1; }
+                        child = child.getNextSibling();
-                        write(list.item(i),nNextLevel,osw);
                     }
                     // Print end tag
-                    if (nLevel>=0 && !bBlockPrettyPrint) { writeSpaces(nLevel,osw); }
+                    if (nNextLevel>=0) { writeSpaces(nLevel,osw); }
                     osw.write("</"+node.getNodeName()+">");
-                    if (bPrettyPrint && nLevel>=0) { osw.write("\n"); }
+                    if (nLevel>=0) { osw.write("\n"); }
                 }
                 else { // empty element
                     if (nLevel>=0) { writeSpaces(nLevel,osw); }
@@ -473,7 +625,7 @@ public class XhtmlDocument extends DOMDocument {
                     else {
                         osw.write(" />");
                     }
-                    if (bPrettyPrint && nLevel>=0) { osw.write("\n"); }
+                    if (nLevel>=0) { osw.write("\n"); }
                 }
                 break;
             case Node.TEXT_NODE:
@@ -484,7 +636,7 @@ public class XhtmlDocument extends DOMDocument {
                 osw.write("<!-- ");
                 write(node.getNodeValue(),osw);
                 osw.write(" -->");
-                if (bPrettyPrint && nLevel>=0) { osw.write("\n"); }
+                if (nLevel>=0) { osw.write("\n"); }
         }
     }
 	
@@ -502,9 +654,7 @@ public class XhtmlDocument extends DOMDocument {
     }
 
     private void writeSpaces(int nCount, OutputStreamWriter osw) throws IOException {
-    	if (bPrettyPrint) {
+    	for (int i=0; i<nCount; i++) { osw.write("  "); }
-    		for (int i=0; i<nCount; i++) { osw.write("  "); }
-    	}
     }
 	
     private void write(String s, OutputStreamWriter osw) throws IOException {
@@ -568,109 +718,6 @@ public class XhtmlDocument extends DOMDocument {
         }
     }
     
-    private static void prepareEntities() {
-        if (entities==null) {
-            entities = new String[256];
-            // Latin 1 symbols
-            entities[160]="&nbsp;";
-            entities[161]="&iexcl;";
-            entities[162]="&cent;";
-            entities[163]="&pound;";
-            entities[164]="&curren;";
-            entities[165]="&yen;";
-            entities[166]="&brvbar;";
-            entities[167]="&sect;";
-            entities[168]="&uml;";
-            entities[169]="&copy;";
-            entities[170]="&ordf;";
-            entities[171]="&laquo;";
-            entities[172]="&not;";
-            entities[173]="&shy;";
-            entities[174]="&reg;";
-            entities[175]="&macr;";
-            entities[176]="&deg;";
-            entities[177]="&plusmn;";
-            entities[178]="&sup2;";
-            entities[179]="&sup3;";
-            entities[180]="&acute;";
-            entities[181]="&micro;";
-            entities[182]="&para;";
-            entities[183]="&middot;";
-            entities[184]="&cedil;";
-            entities[185]="&sup1;";
-            entities[186]="&ordm;";
-            entities[187]="&raquo;";
-            entities[188]="&frac14;";
-            entities[189]="&frac12;";
-            entities[190]="&frac34;";
-            entities[191]="&iquest;";
-            entities[215]="&times;";
-            entities[247]="&divide;";
-            // Latin 1 characters
-            entities[192]="&Agrave;";
-            entities[193]="&Aacute;";
-            entities[194]="&Acirc;";
-            entities[195]="&Atilde;";
-            entities[196]="&Auml;";
-            entities[197]="&Aring;";
-            entities[198]="&AElig;";
-            entities[199]="&Ccedil;";
-            entities[200]="&Egrave;";
-            entities[201]="&Eacute;";
-            entities[202]="&Ecirc;";
-            entities[203]="&Euml;";
-            entities[204]="&Igrave;";
-            entities[205]="&Iacute;";
-            entities[206]="&Icirc;";
-            entities[207]="&Iuml;";
-            entities[208]="&ETH;";
-            entities[209]="&Ntilde;";
-            entities[210]="&Ograve;";
-            entities[211]="&Oacute;";
-            entities[212]="&Ocirc;";
-            entities[213]="&Otilde;";
-            entities[214]="&Ouml;";
-            entities[216]="&Oslash;";
-            entities[217]="&Ugrave;";
-            entities[218]="&Uacute;";
-            entities[219]="&Ucirc;";
-            entities[220]="&Uuml;";
-            entities[221]="&Yacute;";
-            entities[222]="&THORN;";
-            entities[223]="&szlig;";
-            entities[224]="&agrave;";
-            entities[225]="&aacute;";
-            entities[226]="&acirc;";
-            entities[227]="&atilde;";
-            entities[228]="&auml;";
-            entities[229]="&aring;";
-            entities[230]="&aelig;";
-            entities[231]="&ccedil;";
-            entities[232]="&egrave;";
-            entities[233]="&eacute;";
-            entities[234]="&ecirc;";
-            entities[235]="&euml;";
-            entities[236]="&igrave;";
-            entities[237]="&iacute;";
-            entities[238]="&icirc;";
-            entities[239]="&iuml;";
-            entities[240]="&eth;";
-            entities[241]="&ntilde;";
-            entities[242]="&ograve;";
-            entities[243]="&oacute;";
-            entities[244]="&ocirc;";
-            entities[245]="&otilde;";
-            entities[246]="&ouml;";
-            entities[248]="&oslash;";
-            entities[249]="&ugrave;";
-            entities[250]="&uacute;";
-            entities[251]="&ucirc;";
-            entities[252]="&uuml;";
-            entities[253]="&yacute;";
-            entities[254]="&thorn;";
-            entities[255]="&yuml;";
-        }
-    }
     
     // Translate character to MathML entity (contributed by Bruno Mascret)
     private String getMathMLEntity(char c) {

source/oxt/writer2xhtml/W2XDialogs2/Content.xdl

@@ -12,5 +12,8 @@
     <dlg:menuitem dlg:value="LaTeX code"/>
    </dlg:menupopup>
   </dlg:menulist>
+  <dlg:text dlg:id="EndnotesCategoryHeadingLabel" dlg:tab-index="3" dlg:left="5" dlg:top="36" dlg:width="245" dlg:height="12" dlg:value="Endnotes"/>
+  <dlg:text dlg:id="EndnotesHeadingLabel" dlg:tab-index="4" dlg:left="10" dlg:top="50" dlg:width="110" dlg:height="12" dlg:value="Heading"/>
+  <dlg:textfield dlg:id="EndnotesHeading" dlg:tab-index="5" dlg:left="130" dlg:top="48" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:EndnotesHeading"/>
  </dlg:bulletinboard>
 </dlg:window>

source/oxt/writer2xhtml/W2XDialogs2/General.xdl

@@ -3,9 +3,8 @@
 <dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="General" dlg:left="139" dlg:top="84" dlg:width="260" dlg:height="185" dlg:closeable="true" dlg:moveable="true" dlg:title="General" dlg:withtitlebar="false">
  <dlg:bulletinboard>
   <dlg:checkbox dlg:id="NoDoctype" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="240" dlg:height="12" dlg:value="Do not include DOCTYPE" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:NoDoctype"/>
-  <dlg:checkbox dlg:id="AddBOM" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="240" dlg:height="12" dlg:value="Add Byte Order Mark (BOM)" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:AddBOM"/>
+  <dlg:text dlg:id="EncodingLabel" dlg:tab-index="1" dlg:left="10" dlg:top="22" dlg:width="110" dlg:height="12" dlg:value="Encoding"/>
-  <dlg:text dlg:id="EncodingLabel" dlg:tab-index="2" dlg:left="10" dlg:top="36" dlg:width="110" dlg:height="12" dlg:value="Encoding"/>
+  <dlg:menulist dlg:id="Encoding" dlg:tab-index="2" dlg:left="130" dlg:top="20" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="4" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:Encoding">
-  <dlg:menulist dlg:id="Encoding" dlg:tab-index="3" dlg:left="130" dlg:top="34" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="4" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:Encoding">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="UTF-8"/>
     <dlg:menuitem dlg:value="UTF-16"/>
@@ -14,6 +13,7 @@
    </dlg:menupopup>
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.UNO:EncodingChange" script:language="UNO"/>
   </dlg:menulist>
+  <dlg:checkbox dlg:id="AddBOM" dlg:tab-index="3" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:value="Add Byte Order Mark (BOM)" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:AddBOM"/>
   <dlg:text dlg:id="HexadecimalEntitiesLabel" dlg:tab-index="4" dlg:left="10" dlg:top="50" dlg:width="110" dlg:height="12" dlg:value="Numeric character entities"/>
   <dlg:menulist dlg:id="HexadecimalEntities" dlg:tab-index="5" dlg:left="130" dlg:top="48" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="2" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:HexadecimalEntities">
    <dlg:menupopup>

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/Content.xhp

@@ -36,5 +36,12 @@
 		        <paragraph role="paragraph" xml-lang="en-US"><emph>LaTeX code</emph>: Export LaTeX code directly in the text.</paragraph>
 			</listitem>
 		</list>
+
+        <paragraph role="heading" level="2" xml-lang="en-US">Endnotes</paragraph>
+
+        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:EndnotesHeading" id="bm_configendnotesheading"/>
+        <paragraph role="heading" level="3" xml-lang="en-US">Heading</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">In %PRODUCTNAME Writer, endnotes cannot have a heading. If you want to add
+        a heading for the endnotes in the exported document, enter the desired heading here.</paragraph>
     </body>
 </helpdocument>

source/oxt/writer2xhtml/help/en/org.openoffice.da.writer2xhtml.oxt/Configuration/General.xhp

@@ -22,17 +22,18 @@
         <paragraph role="warning" xml-lang="en-US">The !DOCTYPE is required for a valid XHTML document: This option should only be
         used if you need to process the document further.</paragraph>
 
-        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:AddBOM" id="bm_configaddbom"/>
-        <paragraph role="heading" level="3" xml-lang="en-US">Add Byte Order Mark (BOM)</paragraph>
-        <paragraph role="paragraph" xml-lang="en-US">Check this to include a BOM (Byte Order Mark) to the XHTML document.
-        Most applications will not need this, but it may be required in rare cases.</paragraph>
-
         <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:Encoding" id="bm_configencoding"/>
         <paragraph role="heading" level="3" xml-lang="en-US">Encoding</paragraph>
         <paragraph role="paragraph" xml-lang="en-US">Select the character encoding to use for the XHTML document. Currently supported
         encodings are <emph>UTF-8</emph> (recommended), <emph>UTF-16</emph>, <emph>ISO-8859-1</emph> and <emph>US-ASCII</emph>.
         Characters not supported by the encoding are exported as numeric character entities.</paragraph>
 
+        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:AddBOM" id="bm_configaddbom"/>
+        <paragraph role="heading" level="3" xml-lang="en-US">Add Byte Order Mark (BOM)</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">Check this to include a BOM (Byte Order Mark) to the XHTML document (UTF-8 only).
+        Normally this is not needed if you use UTF-8 encoding, but it may be required in rare cases.
+        </paragraph>
+
         <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:HexadecimalEntities" id="bm_confighexadecimalentities"/>
         <paragraph role="heading" level="3" xml-lang="en-US">Numeric character entities</paragraph>
         <paragraph role="paragraph" xml-lang="en-US">Select how to export numeric character entities. You can use either