w2x: New option max_width + UI for the option separate_stylesheet

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

source/distro/changelog.txt

@@ -2,6 +2,11 @@ Changelog for Writer2LaTeX version 1.4 -> 1.6
 
 ---------- version 1.5.3 ----------
 
+[w2x] The option separate_stylesheet can now be set in the configuration UI, on the Formatting page.
+
+[w2x] New option max_width (default value 800px) used to define the max-width on the body element (XHTML and text
+  documents only). In the custom configuration UI, this setting is found on the Formatting page.
+
 [w2x] Added support for semantic inflection in EPUB 3 export for the types footnote(s), endnote(s), toc, index
   and bibliography
   (http://www.idpf.org/epub/30/spec/epub30-contentdocs.html#sec-xhtml-semantic-inflection).

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

@@ -20,7 +20,7 @@
 *
 *  All Rights Reserved.
 * 
-*  Version 1.6 (2015-04-09)
+*  Version 1.6 (2015-06-16)
 *
 */ 
 
@@ -522,9 +522,10 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     		checkBoxFromConfig(dlg, "IgnoreTableDimensions", "ignore_table_dimensions");
     		
     		listBoxFromConfig(dlg, "ListFormatting", "list_formatting", sListExportValues, (short) 0);
-    		//TODO: These have been postponed
+
-    		//checkBoxFromConfig(dlg, "ConvertToPx", "convert_to_px");
+    		textFieldFromConfig(dlg, "MaxWidth", "max_width");
-    		//checkBoxFromConfig(dlg, "SeparateStylesheet", "separate_stylesheet");
+
+    		checkBoxFromConfig(dlg, "SeparateStylesheet", "separate_stylesheet");
     	}
     	
     	@Override protected void getControls(DialogAccess dlg) {
@@ -537,9 +538,10 @@ public class ConfigurationDialog extends ConfigurationDialogBase implements XSer
     		checkBoxToConfig(dlg, "IgnoreTableDimensions", "ignore_table_dimensions");
 
     		listBoxToConfig(dlg, "ListFormatting", "list_formatting", sListExportValues);
-    		//TODO: These have been postponed
+
-    		//checkBoxToConfig(dlg, "ConvertToPx", "convert_to_px");
+    		textFieldToConfig(dlg, "MaxWidth", "max_width");
-    		//checkBoxToConfig(dlg, "SeparateStylesheet", "separate_stylesheet");
+
+    		checkBoxToConfig(dlg, "SeparateStylesheet", "separate_stylesheet");
     	}
     	
     	@Override protected boolean handleEvent(DialogAccess dlg, String sMethod) {

source/java/writer2latex/api/ConverterFactory.java

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

source/java/writer2latex/xhtml/ConverterHelper.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2014 by Henrik Just
+ *  Copyright: 2002-2015 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-08-13)
+ *  Version 1.6 (2015-06-15)
  *
  */
 
@@ -30,45 +30,67 @@ import org.w3c.dom.Element;
 
 import writer2latex.office.OfficeReader;
 
-public class ConverterHelper {
+/** A <code>ConverterHelper</code> is responsible for conversion of some specific content into XHTML. 
-    protected OfficeReader ofr;
+ */
-    protected XhtmlConfig config;
+class ConverterHelper {
-    protected Converter converter;
 	
-    protected StyleConverter getStyleCv() { return converter.getStyleCv(); }
+	// Member variables providing our content (set in constructor)
-
+	OfficeReader ofr;
-    protected TextStyleConverter getTextSc() { return converter.getStyleCv().getTextSc(); }
+    XhtmlConfig config;
+    Converter converter;
 	
-    protected ParStyleConverter getParSc() { return converter.getStyleCv().getParSc(); }
+    /** Construct a new converter helper based on a 
-	
+     * 
-    protected HeadingStyleConverter getHeadingSc() { return converter.getStyleCv().getHeadingSc(); }
+     * @param ofr the office reader used to access the source document
-	
+     * @param config the configuration to use
-    protected ListStyleConverter getListSc() { return converter.getStyleCv().getListSc(); }
+     * @param converter the main converter to which the helper belongs
-	
+     */
-    protected SectionStyleConverter getSectionSc() { return converter.getStyleCv().getSectionSc(); }
+    ConverterHelper(OfficeReader ofr, XhtmlConfig config, Converter converter) {
-	
+        this.ofr = ofr;
-    protected TableStyleConverter getTableSc() { return converter.getStyleCv().getTableSc(); }
+        this.config = config;
-	
+        this.converter = converter;
-    protected RowStyleConverter getRowSc() { return converter.getStyleCv().getRowSc(); }
+    }
-	
-    protected CellStyleConverter getCellSc() { return converter.getStyleCv().getCellSc(); }
-	
-    protected FrameStyleConverter getFrameSc() { return converter.getStyleCv().getFrameSc(); }
-	
-    protected PresentationStyleConverter getPresentationSc() { return converter.getStyleCv().getPresentationSc(); }
-	
-    protected PageStyleConverter getPageSc() { return converter.getStyleCv().getPageSc(); }
     
-    protected TextConverter getTextCv() { return converter.getTextCv(); }
+    // Convenience accessor methods to other converter helpers (only needed to save some typing)
-	
-    protected TableConverter getTableCv() { return converter.getTableCv(); }
 
-    protected DrawConverter getDrawCv() { return converter.getDrawCv(); }
+    StyleConverter getStyleCv() { return converter.getStyleCv(); }
 
-    protected MathConverter getMathCv() { return converter.getMathCv(); }
+    TextStyleConverter getTextSc() { return converter.getStyleCv().getTextSc(); }
 	
-    // TODO: Move to StyleInfo!
+    ParStyleConverter getParSc() { return converter.getStyleCv().getParSc(); }
-    protected void applyStyle(StyleInfo info, Element hnode) {
+	
+    HeadingStyleConverter getHeadingSc() { return converter.getStyleCv().getHeadingSc(); }
+	
+    ListStyleConverter getListSc() { return converter.getStyleCv().getListSc(); }
+	
+    SectionStyleConverter getSectionSc() { return converter.getStyleCv().getSectionSc(); }
+	
+    TableStyleConverter getTableSc() { return converter.getStyleCv().getTableSc(); }
+	
+    RowStyleConverter getRowSc() { return converter.getStyleCv().getRowSc(); }
+	
+    CellStyleConverter getCellSc() { return converter.getStyleCv().getCellSc(); }
+	
+    FrameStyleConverter getFrameSc() { return converter.getStyleCv().getFrameSc(); }
+	
+    PresentationStyleConverter getPresentationSc() { return converter.getStyleCv().getPresentationSc(); }
+	
+    PageStyleConverter getPageSc() { return converter.getStyleCv().getPageSc(); }
+    
+    TextConverter getTextCv() { return converter.getTextCv(); }
+	
+    TableConverter getTableCv() { return converter.getTableCv(); }
+
+    DrawConverter getDrawCv() { return converter.getDrawCv(); }
+
+    MathConverter getMathCv() { return converter.getMathCv(); }
+	
+    /** Apply style information to an XHTML node
+     * 
+     * @param info the style to apply
+     * @param hnode the XHTML node
+     */
+    void applyStyle(StyleInfo info, Element hnode) {
         if (info.sClass!=null) {
             hnode.setAttribute("class",info.sClass);
         }
@@ -86,9 +108,4 @@ public class ConverterHelper {
         }
     }
 
-    public ConverterHelper(OfficeReader ofr, XhtmlConfig config, Converter converter) {
-        this.ofr = ofr;
-        this.config = config;
-        this.converter = converter;
-    }
 }

source/java/writer2latex/xhtml/StyleConverter.java

@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2014 by Henrik Just
+ *  Copyright: 2002-2015 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2014-09-16)
+ *  Version 1.6 (2015-06-15)
  *
  */
 
@@ -33,14 +33,11 @@ import org.w3c.dom.Node;
 import writer2latex.office.*;
 import writer2latex.util.*;
 
-/**
+/** This class converts OpenDocument styles to CSS2 styles.
- * <p>This class converts OpenDocument styles to CSS2 styles.</p>
+ * Note that some elements in OpenDocument has attributes that also maps to CSS2 properties.
- * <p>Note that some elements in OpenDocument has attributes that also maps
+ * Example: the width of a text box.
- * to CSS2 properties. Example: the width of a text box.</p>
+ * Also note, that some OpenDocument style properties cannot be mapped to CSS2 without creating an additional inline element.
- * <p>Also note, that some OpenDocument style properties cannot be mapped to
+ * The class uses one helper class per OpenDocument style family (paragraph, frame etc.)
- * CSS2 without creating an additional inline element.</p>
- * <p>The class uses one helper class per OpenDocument style family
- * (paragraph, frame etc.)</p>
  */
 class StyleConverter extends ConverterHelper {
 
@@ -63,9 +60,14 @@ class StyleConverter extends ConverterHelper {
     // Helper for page styles
     private PageStyleConverter pageSc;
     
-    /** <p>Create a new <code>StyleConverter</code></p>
+    /** Create a new <code>StyleConverter</code>
+     * 
+     * @param ofr the office reader used to access the source document
+     * @param config the configuration to use
+     * @param converter the main converter
+     * @param nType the XHTML type
      */
-    public StyleConverter(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
+    StyleConverter(OfficeReader ofr, XhtmlConfig config, Converter converter, int nType) {
         super(ofr,config,converter);
         // Create the helpers
         textSc = new TextStyleConverter(ofr,config,converter,nType);
@@ -81,37 +83,35 @@ class StyleConverter extends ConverterHelper {
         pageSc = new PageStyleConverter(ofr,config,converter,nType);
     }
 	
-    // Accessor methods for helpers
+    // Accessor methods for helpers: We need to override the style helper accessors
-    protected TextStyleConverter getTextSc() { return textSc; }
+    
+    TextStyleConverter getTextSc() { return textSc; }
 
-    protected ParStyleConverter getParSc() { return parSc; }
+    ParStyleConverter getParSc() { return parSc; }
 
-    protected HeadingStyleConverter getHeadingSc() { return headingSc; }
+    HeadingStyleConverter getHeadingSc() { return headingSc; }
 
-    protected ListStyleConverter getListSc() { return listSc; }
+    ListStyleConverter getListSc() { return listSc; }
 
-    protected SectionStyleConverter getSectionSc() { return sectionSc; }
+    SectionStyleConverter getSectionSc() { return sectionSc; }
 
-    protected TableStyleConverter getTableSc() { return tableSc; }
+    TableStyleConverter getTableSc() { return tableSc; }
 
-    protected RowStyleConverter getRowSc() { return rowSc; }
+    RowStyleConverter getRowSc() { return rowSc; }
 
-    protected CellStyleConverter getCellSc() { return cellSc; }
+    CellStyleConverter getCellSc() { return cellSc; }
 
-    protected FrameStyleConverter getFrameSc() { return frameSc; }
+    FrameStyleConverter getFrameSc() { return frameSc; }
 
-    protected PresentationStyleConverter getPresentationSc() { return presentationSc; }
+    PresentationStyleConverter getPresentationSc() { return presentationSc; }
 
-    protected PageStyleConverter getPageSc() { return pageSc; }
+    PageStyleConverter getPageSc() { return pageSc; }
 	
-    private StyleWithProperties getDefaultStyle() {
+    /** Apply the default language of the source document on an XHTML element
-        if (ofr.isSpreadsheet()) return ofr.getDefaultCellStyle();
+     * 
-        else if (ofr.isPresentation()) return ofr.getDefaultFrameStyle();
+     * @param node the XHTML element
-        else return ofr.getDefaultParStyle();
+     */
-    }
+    void applyDefaultLanguage(Element node) {
-	
-    // Apply the default language
-    public void applyDefaultLanguage(Element node) {
         StyleWithProperties style = getDefaultStyle();
         if (style!=null) {
             StyleInfo info = new StyleInfo();
@@ -120,29 +120,16 @@ class StyleConverter extends ConverterHelper {
         }
     }
     
-    public String exportStyles(boolean bIndent) {
+    /** Export style information as a string of plain CSS code
+     * 
+     * @param bIndent true if the CSS code should be indented
+     * @return the CSS code
+     */
+    String exportStyles(boolean bIndent) {
     	String sIndent = bIndent ? "      " : "";
-    	
         StringBuilder buf = new StringBuilder();
         
-        // Export default style
+        exportDefaultStyle(buf,sIndent);
-        if (config.xhtmlCustomStylesheet().length()==0 &&
-            (config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL ||
-            config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD)) {
-            // Default paragraph/cell/frame style is applied to the body element
-            StyleWithProperties defaultStyle = getDefaultStyle();
-            if (defaultStyle!=null) {
-                CSVList props = new CSVList(";");
-                // text properties only!
-                getTextSc().cssTextCommon(defaultStyle,props,true);
-                if (config.useDefaultFont() && config.defaultFontName().length()>0) {
-                	props.addValue("font-family", "'"+config.defaultFontName()+"'");
-                }
-                buf.append(sIndent)
-                   .append("body {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
-            }
-
-        }
 		
         // Export declarations from helpers
         // For OpenDocument documents created with OOo only some will generate content:
@@ -162,9 +149,13 @@ class StyleConverter extends ConverterHelper {
         buf.append(getPageSc().getStyleDeclarations(sIndent));
         return buf.toString();
     }
-	
+    
-    // Export used styles to CSS
+    /** Export style information as an XHTML style element
-    public Node exportStyles(Document htmlDOM) {
+     * 
+     * @param htmlDOM the XHTML DOM to which the generated element belongs
+     * @return the style element
+     */
+    Node exportStyles(Document htmlDOM) {
         String sStyles = exportStyles(config.prettyPrint());
 		
         // Create node
@@ -181,5 +172,48 @@ class StyleConverter extends ConverterHelper {
             return null;
         }
     }
-		
+    
+    // Private helper methods
+    
+    private void exportDefaultStyle(StringBuilder buf, String sIndent) {
+        // Export default style
+        if (config.xhtmlCustomStylesheet().length()==0 &&
+            (config.xhtmlFormatting()==XhtmlConfig.CONVERT_ALL ||
+            config.xhtmlFormatting()==XhtmlConfig.IGNORE_HARD)) {
+            CSVList props = new CSVList(";");
+        
+            // Default paragraph/cell/frame style is applied to the body element
+            StyleWithProperties defaultStyle = getDefaultStyle();
+            if (defaultStyle!=null) {
+                // text properties only!
+                getTextSc().cssTextCommon(defaultStyle,props,true);
+                if (config.useDefaultFont() && config.defaultFontName().length()>0) {
+                	props.addValue("font-family", "'"+config.defaultFontName()+"'");
+                }
+            }
+            
+            // For text documents (XHTML only), also set maximum width
+            if (ofr.isText() && !converter.isOPS()) {
+            	String sMaxWidth = config.getMaxWidth().trim();
+            	if (sMaxWidth.length()>0) {
+		            props.addValue("max-width", sMaxWidth);
+		            props.addValue("margin-left","auto");
+		            props.addValue("margin-right","auto");
+            	}
+            }
+            
+            // Apply properties to body
+            if (!props.isEmpty()) {
+	            buf.append(sIndent)
+	               .append("body {").append(props.toString()).append("}").append(config.prettyPrint() ? "\n" : " ");
+            }
+        }
+    }
+	
+    private StyleWithProperties getDefaultStyle() {
+        if (ofr.isSpreadsheet()) return ofr.getDefaultCellStyle();
+        else if (ofr.isPresentation()) return ofr.getDefaultFrameStyle();
+        else return ofr.getDefaultParStyle();
+    }
+
 }

source/java/writer2latex/xhtml/XhtmlConfig.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.6 (2015-04-28)
+ *  Version 1.6 (2015-06-15)
  *
  */
 
@@ -41,7 +41,7 @@ import writer2latex.util.Misc;
 
 public class XhtmlConfig extends writer2latex.base.ConfigBase {
     // Implement configuration methods
-    protected int getOptionCount() { return 58; }
+    protected int getOptionCount() { return 59; }
     protected String getDefaultConfigPath() { return "/writer2latex/xhtml/config/"; }
 	
     // Override setOption: To be backwards compatible, we must accept options
@@ -120,44 +120,45 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     private static final int TABLE_FORMATTING = 17;
     private static final int TABLE_SIZE = 18;
     private static final int LIST_FORMATTING = 19;
-    private static final int USE_DEFAULT_FONT = 20;
+    private static final int MAX_WIDTH = 20;
-    private static final int DEFAULT_FONT_NAME = 21;
+    private static final int USE_DEFAULT_FONT = 21;
-    private static final int USE_DUBLIN_CORE = 22;
+    private static final int DEFAULT_FONT_NAME = 22;
-    private static final int NOTES = 23;
+    private static final int USE_DUBLIN_CORE = 23;
-    private static final int DISPLAY_HIDDEN_TEXT = 24;
+    private static final int NOTES = 24;
-    private static final int CONVERT_TO_PX = 25;
+    private static final int DISPLAY_HIDDEN_TEXT = 25;
-    private static final int SCALING = 26;
+    private static final int CONVERT_TO_PX = 26;
-    private static final int COLUMN_SCALING = 27;
+    private static final int SCALING = 27;
-    private static final int RELATIVE_FONT_SIZE = 28;
+    private static final int COLUMN_SCALING = 28;
-    private static final int FONT_SCALING = 29;
+    private static final int RELATIVE_FONT_SIZE = 29;
-    private static final int FLOAT_OBJECTS = 30;
+    private static final int FONT_SCALING = 30;
-    private static final int TABSTOP_STYLE = 31;
+    private static final int FLOAT_OBJECTS = 31;
-    private static final int FORMULAS = 32;
+    private static final int TABSTOP_STYLE = 32;
-    private static final int ENDNOTES_HEADING = 33;
+    private static final int FORMULAS = 33;
-    private static final int FOOTNOTES_HEADING = 34;
+    private static final int ENDNOTES_HEADING = 34;
-    private static final int EXTERNAL_TOC_DEPTH = 35;
+    private static final int FOOTNOTES_HEADING = 35;
-    private static final int INCLUDE_TOC = 36;
+    private static final int EXTERNAL_TOC_DEPTH = 36;
-    private static final int INCLUDE_NCX = 37;
+    private static final int INCLUDE_TOC = 37;
-    private static final int SPLIT_LEVEL = 38;
+    private static final int INCLUDE_NCX = 38;
-    private static final int REPEAT_LEVELS = 39;
+    private static final int SPLIT_LEVEL = 39;
-    private static final int PAGE_BREAK_SPLIT = 40;
+    private static final int REPEAT_LEVELS = 40;
-    private static final int SPLIT_AFTER = 41;
+    private static final int PAGE_BREAK_SPLIT = 41;
-    private static final int IMAGE_SPLIT = 42;
+    private static final int SPLIT_AFTER = 42;
-    private static final int COVER_IMAGE = 43;
+    private static final int IMAGE_SPLIT = 43;
-    private static final int EMBED_SVG = 44;
+    private static final int COVER_IMAGE = 44;
-    private static final int EMBED_IMG = 45;
+    private static final int EMBED_SVG = 45;
-    private static final int USE_MATHJAX = 46;
+    private static final int EMBED_IMG = 46;
-    private static final int CALC_SPLIT = 47;
+    private static final int USE_MATHJAX = 47;
-    private static final int DISPLAY_HIDDEN_SHEETS = 48;
+    private static final int CALC_SPLIT = 48;
-    private static final int DISPLAY_HIDDEN_ROWS_COLS = 49;
+    private static final int DISPLAY_HIDDEN_SHEETS = 49;
-    private static final int DISPLAY_FILTERED_ROWS_COLS = 50;
+    private static final int DISPLAY_HIDDEN_ROWS_COLS = 50;
-    private static final int APPLY_PRINT_RANGES = 51;
+    private static final int DISPLAY_FILTERED_ROWS_COLS = 51;
-    private static final int USE_TITLE_AS_HEADING = 52;
+    private static final int APPLY_PRINT_RANGES = 52;
-    private static final int USE_SHEET_NAMES_AS_HEADINGS = 53;
+    private static final int USE_TITLE_AS_HEADING = 53;
-    private static final int SAVE_IMAGES_IN_SUBDIR = 54;
+    private static final int USE_SHEET_NAMES_AS_HEADINGS = 54;
-    private static final int UPLINK = 55;
+    private static final int SAVE_IMAGES_IN_SUBDIR = 55;
-    private static final int DIRECTORY_ICON = 56;
+    private static final int UPLINK = 56;
-    private static final int DOCUMENT_ICON = 57;
+    private static final int DIRECTORY_ICON = 57;
+    private static final int DOCUMENT_ICON = 58;
 
     protected ComplexOption xheading = addComplexOption("heading-map");
     protected ComplexOption xpar = addComplexOption("paragraph-map");
@@ -211,6 +212,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         		else { nValue = CSS1; }
         	}
         };
+        options[MAX_WIDTH] = new Option("max_width","800px");
         options[USE_DEFAULT_FONT] = new BooleanOption("use_default_font","false");
         options[DEFAULT_FONT_NAME] = new BooleanOption("default_font_name","");
         options[USE_DUBLIN_CORE] = new BooleanOption("use_dublin_core","true");
@@ -393,6 +395,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public int xhtmlTableFormatting() { return ((XhtmlFormatOption) options[TABLE_FORMATTING]).getValue(); }
     public int tableSize() { return ((IntegerOption) options[TABLE_SIZE]).getValue(); }
     public int listFormatting() { return ((IntegerOption) options[LIST_FORMATTING]).getValue(); }
+    public String getMaxWidth() { return options[MAX_WIDTH].getString(); }
     public boolean useDefaultFont() { return ((BooleanOption) options[USE_DEFAULT_FONT]).getValue(); }
     public String defaultFontName() { return options[DEFAULT_FONT_NAME].getString(); }
     public boolean xhtmlUseDublinCore() { return ((BooleanOption) options[USE_DUBLIN_CORE]).getValue(); }

source/oxt/writer2xhtml/W2XDialogs2/Formatting.xdl

@@ -3,7 +3,7 @@
 <dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Formatting" dlg:left="139" dlg:top="84" dlg:width="258" dlg:height="172" dlg:closeable="true" dlg:moveable="true" dlg:title="Formatting" dlg:withtitlebar="false">
  <dlg:bulletinboard>
   <dlg:text dlg:id="FormattingLabel" dlg:tab-index="0" dlg:left="10" dlg:top="8" dlg:width="110" dlg:height="12" dlg:value="Formatting"/>
-  <dlg:menulist dlg:id="Formatting" dlg:tab-index="1" dlg:left="130" dlg:top="6" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="4" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:Formatting">
+  <dlg:menulist dlg:id="Formatting" dlg:tab-index="1" dlg:left="130" dlg:top="6" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:Formatting" dlg:spin="true" dlg:linecount="4">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="Convert all"/>
     <dlg:menuitem dlg:value="Ignore styles"/>
@@ -12,7 +12,7 @@
    </dlg:menupopup>
   </dlg:menulist>
   <dlg:text dlg:id="FrameFormattingLabel" dlg:tab-index="2" dlg:left="10" dlg:top="22" dlg:width="110" dlg:height="12" dlg:value="Frame formatting"/>
-  <dlg:menulist dlg:id="FrameFormatting" dlg:tab-index="3" 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:FrameFormatting">
+  <dlg:menulist dlg:id="FrameFormatting" dlg:tab-index="3" dlg:left="130" dlg:top="20" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:FrameFormatting" dlg:spin="true" dlg:linecount="4">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="Convert all"/>
     <dlg:menuitem dlg:value="Ignore styles"/>
@@ -20,18 +20,19 @@
     <dlg:menuitem dlg:value="Ignore all"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:checkbox dlg:id="SectionFormatting" dlg:tab-index="4" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:value="Convert section formatting" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:SectionFormatting"/>
+  <dlg:checkbox dlg:id="SectionFormatting" dlg:tab-index="4" dlg:left="10" dlg:top="36" dlg:width="240" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:SectionFormatting" dlg:value="Convert section formatting" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="TableFormatting" dlg:tab-index="5" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:value="Convert table formatting" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:TableFormatting"/>
+  <dlg:checkbox dlg:id="TableFormatting" dlg:tab-index="5" dlg:left="10" dlg:top="50" dlg:width="240" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:TableFormatting" dlg:value="Convert table formatting" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="IgnoreTableDimensions" dlg:tab-index="6" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:value="Ignore table dimensions" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:IgnoreTableDimensions"/>
+  <dlg:checkbox dlg:id="IgnoreTableDimensions" dlg:tab-index="6" dlg:left="10" dlg:top="64" dlg:width="240" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:IgnoreTableDimensions" dlg:value="Ignore table dimensions" dlg:checked="false"/>
   <dlg:text dlg:id="ListFormattingLabel" dlg:tab-index="7" dlg:left="10" dlg:top="78" dlg:width="110" dlg:height="12" dlg:value="List formatting"/>
-  <dlg:menulist dlg:id="ListFormatting" dlg:tab-index="8" dlg:left="130" dlg:top="76" dlg:width="120" dlg:height="12" dlg:spin="true" dlg:linecount="3" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:ListFormatting">
+  <dlg:menulist dlg:id="ListFormatting" dlg:tab-index="8" dlg:left="130" dlg:top="76" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:ListFormatting" dlg:spin="true" dlg:linecount="3">
    <dlg:menupopup>
     <dlg:menuitem dlg:value="Use CSS1"/>
     <dlg:menuitem dlg:value="Use CSS1 and non-standard lists"/>
     <dlg:menuitem dlg:value="Use hard labels"/>
    </dlg:menupopup>
   </dlg:menulist>
-  <dlg:checkbox dlg:id="ConvertToPx" dlg:tab-index="9" dlg:visible="false" dlg:left="10" dlg:top="92" dlg:width="240" dlg:height="12" dlg:value="Convert units to px (pixels)" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:ConvertToPx"/>
+  <dlg:checkbox dlg:id="SeparateStylesheet" dlg:tab-index="10" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:SeparateStylesheet" dlg:value="Create separate style sheet" dlg:checked="false"/>
-  <dlg:checkbox dlg:id="SeparateStylesheet" dlg:tab-index="10" dlg:visible="false" dlg:left="10" dlg:top="106" dlg:width="240" dlg:height="12" dlg:value="Create separate styles sheet on file split" dlg:checked="false" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:SeparateStyleSheet"/>
+  <dlg:text dlg:id="MaxWidthLabel" dlg:tab-index="12" dlg:left="10" dlg:top="92" dlg:width="110" dlg:height="12" dlg:value="Maximum text width"/>
+  <dlg:textfield dlg:id="MaxWidth" dlg:tab-index="9" dlg:left="130" dlg:top="90" dlg:width="120" dlg:height="12" dlg:help-url="org.openoffice.da.writer2xhtml.oxt:MaxWidth"/>
  </dlg:bulletinboard>
 </dlg:window>

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

@@ -81,5 +81,17 @@
 		        values indentations of the list are exported as well.</paragraph>
         	</listitem>
         </list>
+
+        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:MaxWidth" id="bm_configmaxwidth"/>
+        <paragraph role="heading" level="3" xml-lang="en-US">Maximum text width</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">In this field you can give a maximum width (like e.g. 800px)
+        for the exported text, which may enhance the readability. You can use any unit defined in CSS.
+        If the browser window is wider than this, the text will be centered with suitable margins. 
+        Leave the field blank if you want the text to occupy the full width of the browser window.</paragraph>
+
+        <bookmark xml-lang="en-US" branch="hid/org.openoffice.da.writer2xhtml.oxt:SeparateStylesheet" id="bm_configseparatestylesheet"/>
+        <paragraph role="heading" level="3" xml-lang="en-US">Create separate style sheet</paragraph>
+        <paragraph role="paragraph" xml-lang="en-US">Check this if you want to create a separate CSS file in the export.
+        Otherwise the CSS code will be exported embedded in the XHTML document(s).</paragraph>
     </body>
 </helpdocument>