From 35b027ff9aa93a5668076cdcda009548ecb3c230 Mon Sep 17 00:00:00 2001
From: Eliot Kimber <ekimber@contrext.com>
Date: Mon, 6 Jun 2016 18:07:41 -0500
Subject: [PATCH] Added new parameter, tableWidthsProportional, which produces
 proportional table widths

---
 xsl/docx2dita.xsl   | 11 +++++++++--
 xsl/simple2dita.xsl | 36 ++++++++++++++++++++++++++----------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/xsl/docx2dita.xsl b/xsl/docx2dita.xsl
index 93698e1..7075ce2 100644
--- a/xsl/docx2dita.xsl
+++ b/xsl/docx2dita.xsl
@@ -61,7 +61,13 @@ version="2.0">
   <xsl:param name="topicExtension" select="'.dita'" as="xs:string"/><!-- Extension for generated topic files -->
   <xsl:param name="fileNamePrefix" select="''" as="xs:string"/><!-- Prefix for genenerated file names -->
   <xsl:param name="chartsAsTables" select="'false'" as="xs:string"/><!-- When true, capture Word charts as tables with the chart data -->
-  <xsl:variable name="chartsAsTablesBoolean" as="xs:boolean" select="$chartsAsTables = 'true'"/>
+  <xsl:variable name="chartsAsTablesBoolean" as="xs:boolean" 
+    select="matches($chartsAsTables, 'true|yes|on|1', 'i')"/>
+
+  <xsl:param name="tableWidthsProportional" as="xs:string" select="'false'"/>
+  <xsl:variable name="tableWidthsProportionalBoolean" as="xs:boolean"
+    select="matches($tableWidthsProportional, 'true|yes|on|1', 'i')"
+  />  
   
   <xsl:param name="rawPlatformString" select="'unknown'" as="xs:string"/>
   
@@ -381,7 +387,8 @@ version="2.0">
       + debug           = "<xsl:sequence select="$debug"/>"
       + includeWordBackPointers= "<xsl:sequence select="$includeWordBackPointersBoolean"/>"  
       + chartsAsTables  = "<xsl:sequence select="$chartsAsTablesBoolean"/>"  
-      + saveIntermediateDocs  = "<xsl:sequence select="$saveIntermediateDocs"/>"  
+      + saveIntermediateDocs  = "<xsl:sequence select="$saveIntermediateDocs"/>"
+      + tableWidthsProportional = "<xsl:sequence select="$tableWidthsProportional"/>" (<xsl:value-of select="$tableWidthsProportionalBoolean"/>)
       
       Global Variables:
       
diff --git a/xsl/simple2dita.xsl b/xsl/simple2dita.xsl
index cf1a804..fba8374 100644
--- a/xsl/simple2dita.xsl
+++ b/xsl/simple2dita.xsl
@@ -746,10 +746,10 @@
       <xsl:sequence select="@outputclass"/>
       <xsl:choose>
         <xsl:when test="number($width) &lt; 100">
-          <xsl:attribute name="pgwide">0</xsl:attribute>
+          <xsl:attribute name="pgwide" select="'0'"/>
         </xsl:when>
         <xsl:when test="string-length($width)">
-          <xsl:attribute name="pgwide">1</xsl:attribute>
+          <xsl:attribute name="pgwide" select="'1'"/>
         </xsl:when>
       </xsl:choose>
       <xsl:if test="@langAttValue != ''">
@@ -902,14 +902,30 @@
   
   <xsl:template name="create-colspec">
     <xsl:param name="doDebug" as="xs:boolean" tunnel="yes" select="false()"/>
-      <xsl:for-each select="rsiwp:cols/rsiwp:col">
-            <colspec>
-              <xsl:attribute name="colname" select="local:constructColumnName(.)"/>
-              <xsl:sequence select="@align"/>
-              <xsl:sequence select="@colwidth"/>
-            </colspec>
-      </xsl:for-each>
-    </xsl:template>
+    <xsl:variable name="rawColwidths" as="xs:double*"
+      select="for $a in rsiwp:cols/rsiwp:col/@colwidth 
+                  return xs:double(substring-before($a, 'pt'))"
+    />
+    <xsl:variable name="smallest" as="xs:double"
+      select="min($rawColwidths)" 
+    
+    />
+    
+    <xsl:for-each select="rsiwp:cols/rsiwp:col">
+      <!-- The @colwidth value is always points -->
+      <xsl:variable name="pos" as="xs:integer" select="position()"/>
+      <xsl:variable name="colwidth" as="xs:string"
+        select="if ($tableWidthsProportionalBoolean) 
+                   then concat(format-number(($rawColwidths[$pos] div $smallest), '#####.#'), '*')
+                   else concat($rawColwidths[$pos], 'pt')"
+      />
+      <colspec>
+        <xsl:attribute name="colname" select="local:constructColumnName(.)"/>
+        <xsl:sequence select="@align"/>
+        <xsl:attribute name="colwidth" select="$colwidth"/>
+      </colspec>
+    </xsl:for-each>
+  </xsl:template>
     
     
     <!-- Determine which column the current entry sits in. Count the current entry,