w2x table improvements (option to always export relative width)

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

source/distro/changelog.txt

@@ -2,6 +2,11 @@ Changelog for Writer2LaTeX version 1.2 -> 1.4
 
 ---------- version 1.3.1 alpha ----------
 
+[w2x] The option ignore_table_dimensions has been replace by a new option table_size with values none (do not export table
+  dimensions), relative (always use relative width) and auto (use the formatting of the source document):
+  If set to true, all tables are exported with relative width, even
+  if they have an absolute width in the source document
+
 [w2x] Display equations are now recognized by the same means as in the LaTeX export: A single equation in a paragraph with no
   text content except whitespace and an optional sequence number in brackets is considered a display equation. In that case
   it is exported with display="block"

source/java/writer2latex/api/ConverterFactory.java

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

source/java/writer2latex/office/TableReader.java

@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2010 by Henrik Just
+ *  Copyright: 2002-2012 by Henrik Just
  *  
- *  Version 1.2 (2010-03-15)
+ *  Version 1.4 (2012-04-12)
  *
  *  All Rights Reserved.
  */
@@ -135,7 +135,9 @@ public class TableReader {
                 sRelColWidth[nCol] = (100.0F*nRelColWidth[nCol]/nColSum)+"%";
             }
             else {
-                sRelColWidth[nCol] = (100.0F/nCols)+"%";
+            	// Calculate the relative column width from the absolute column widths
+            	// This may not add up to exactly 100%, but we will live with that
+                sRelColWidth[nCol] = Misc.divide(sColWidth[nCol], sTableWidth, true);
             }
         }
 

source/java/writer2latex/xhtml/TableConverter.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2012-03-28)
+ *  Version 1.4 (2012-04-12)
  *
  */
 
@@ -203,15 +203,15 @@ public class TableConverter extends ConverterHelper {
         // interpret column width the same way. IE excludes padding and border,
         // Mozilla (like OOo) includes them.
         // If the first row contains colspan we have to add <col> anyway
-        if (!config.xhtmlIgnoreTableDimensions()) {
+        if (config.tableSize()!=XhtmlConfig.NONE) {
-        	if (view.getRelTableWidth()!=null || bFirstRowColSpan) {
+        	if (view.getRelTableWidth()!=null || config.tableSize()==XhtmlConfig.RELATIVE || bFirstRowColSpan) {
         		Element colgroup = hnode;
         		if (converter.nType==XhtmlDocument.HTML5) {
         			// Polyglot HTML5 documents must use an explicit colgroup
         			colgroup = converter.createElement("colgroup");
         			hnode.appendChild(colgroup);
         		}
-        		if (view.getRelTableWidth()!=null) {
+        		if (view.getRelTableWidth()!=null || config.tableSize()==XhtmlConfig.RELATIVE) {
         			for (int nCol=0; nCol<nColCount; nCol++) {
         				Element col = converter.createElement("col");
         				colgroup.appendChild(col);
@@ -335,7 +335,7 @@ public class TableConverter extends ConverterHelper {
         StyleInfo info = new StyleInfo();
         getTableSc().applyStyle(sStyleName,info);
 
-        if (!config.xhtmlIgnoreTableDimensions()) {
+        if (config.tableSize()!=XhtmlConfig.NONE) {
             StyleWithProperties style = ofr.getTableStyle(sStyleName);
             if (style!=null) {
                 // Set table width
@@ -346,7 +346,14 @@ public class TableConverter extends ConverterHelper {
                 else {
                     sWidth = style.getProperty(XMLString.STYLE_WIDTH);
                     if (sWidth!=null) {
-                        info.props.addValue("width",getTableSc().colScale(sWidth));
+                        if (config.tableSize()==XhtmlConfig.RELATIVE){
+                        	// Force relative width
+                        	sWidth=Misc.divide(sWidth, converter.getContentWidth(), true);
+                        	info.props.addValue("width",sWidth);
+                        }
+                        else {
+                        	info.props.addValue("width",getTableSc().colScale(sWidth));
+                        }
                     }
                 }
             }
@@ -376,7 +383,7 @@ public class TableConverter extends ConverterHelper {
         StyleInfo info = new StyleInfo();
         getRowSc().applyStyle(sStyleName,info);
 
-        if (!config.xhtmlIgnoreTableDimensions()) {
+        if (config.tableSize()!=XhtmlConfig.NONE) {
             StyleWithProperties style = ofr.getRowStyle(sStyleName);
             if (style!=null) {
                 // Translates row style properties
@@ -399,7 +406,7 @@ public class TableConverter extends ConverterHelper {
 
         StyleWithProperties style = ofr.getCellStyle(sStyleName);
         if (style!=null) {
-            if (!config.xhtmlIgnoreTableDimensions() && !bIsRelative) {
+            if (config.tableSize()==XhtmlConfig.ABSOLUTE && !bIsRelative) {
                 String sEdge = "0";
     
                 // Set the cell width. This is calculated as

source/java/writer2latex/xhtml/XhtmlConfig.java

@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.4 (2012-04-07)
+ *  Version 1.4 (2012-04-12)
  *
  */
 
@@ -62,6 +62,12 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         	if (sValue.equals("true")) { sValue = "css1_hack"; }
         	else { sValue = "css1"; }
         }
+        // this option has been renamed and extended
+        if (sName.equals("ignore_table_dimensions")) {
+        	sName = "table_size";
+        	if (sValue.equals("true")) { sValue="none"; }
+        	else { sValue="absolute"; }
+        }
         super.setOption(sName, sValue);
     }
  
@@ -76,11 +82,11 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public static final int CSS1_HACK = 1;
     public static final int HARD_LABELS = 2;
     
-    // Image dimensions
+    // Image and table dimensions
     public static final int NONE = 0;
     public static final int ABSOLUTE = 1;
     public static final int RELATIVE = 2;
-
+    
     // Formulas (for XHTML 1.0 strict)
     public static final int STARMATH = 0;
     public static final int LATEX = 1;
@@ -112,7 +118,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     private static final int FRAME_FORMATTING = 15;
     private static final int SECTION_FORMATTING = 16;
     private static final int TABLE_FORMATTING = 17;
-    private static final int IGNORE_TABLE_DIMENSIONS = 18;
+    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 DEFAULT_FONT_NAME = 21;
@@ -189,7 +195,14 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
         options[FRAME_FORMATTING] = new XhtmlFormatOption("frame_formatting","convert_all");
         options[SECTION_FORMATTING] = new XhtmlFormatOption("section_formatting","convert_all");
         options[TABLE_FORMATTING] = new XhtmlFormatOption("table_formatting","convert_all");
-        options[IGNORE_TABLE_DIMENSIONS] = new BooleanOption("ignore_table_dimensions","false");
+        options[TABLE_SIZE] = new IntegerOption("table_size","auto") {
+        	@Override public void setString(String sValue) {
+        		super.setString(sValue);
+        		if ("relative".equals(sValue)) { nValue = RELATIVE; }
+        		else if ("none".equals(sValue)) { nValue = NONE; }
+        		else { nValue = ABSOLUTE; }
+        	}
+        };
         options[LIST_FORMATTING] = new IntegerOption("list_formatting","css1") {
         	@Override public void setString(String sValue) {
         		super.setString(sValue);
@@ -365,7 +378,7 @@ public class XhtmlConfig extends writer2latex.base.ConfigBase {
     public int xhtmlFrameFormatting() { return ((XhtmlFormatOption) options[FRAME_FORMATTING]).getValue(); }
     public int xhtmlSectionFormatting() { return ((XhtmlFormatOption) options[SECTION_FORMATTING]).getValue(); }
     public int xhtmlTableFormatting() { return ((XhtmlFormatOption) options[TABLE_FORMATTING]).getValue(); }
-    public boolean xhtmlIgnoreTableDimensions() { return ((BooleanOption) options[IGNORE_TABLE_DIMENSIONS]).getValue(); }
+    public int tableSize() { return ((IntegerOption) options[TABLE_SIZE]).getValue(); }
     public int listFormatting() { return ((IntegerOption) options[LIST_FORMATTING]).getValue(); }
     public boolean useDefaultFont() { return ((BooleanOption) options[USE_DEFAULT_FONT]).getValue(); }
     public String defaultFontName() { return options[DEFAULT_FONT_NAME].getString(); }