Better looking simple tables. Resolves Issue #180.

* Markdown reader: simple tables are now given column widths of 0.

* Column width of 0 is interpreted as meaning: use default column width.

* Writers now include explicit column width information only
  for multiline tables.  (Exception:  RTF writer, which requires
  column widths.  In this case, columns are given equal widths,
  adding up to the text width.)

* Simple tables should now look better in most output formats.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1631 788f1e2b-df1e-0410-8736-df70ead52e1b

12 files changed, 130 insertions, 154 deletions

diff --git a/tests/tables.context b/tests/tables.context
index 87ed08e25..ad9868559 100644
--- a/tests/tables.context
+++ b/tests/tables.context
@@ -1,7 +1,7 @@
 Simple table with caption:
 
 \placetable[here]{Demonstration of simple table syntax.}
-\starttable[|rp(0.15\textwidth)|lp(0.09\textwidth)|cp(0.16\textwidth)|lp(0.13\textwidth)|]
+\starttable[|r|l|c|l|]
 \HL
 \NC Right
 \NC Left
@@ -30,7 +30,7 @@ Simple table with caption:
 Simple table without caption:
 
 \placetable[here]{none}
-\starttable[|rp(0.15\textwidth)|lp(0.09\textwidth)|cp(0.16\textwidth)|lp(0.13\textwidth)|]
+\starttable[|r|l|c|l|]
 \HL
 \NC Right
 \NC Left
@@ -59,7 +59,7 @@ Simple table without caption:
 Simple table indented two spaces:
 
 \placetable[here]{Demonstration of simple table syntax.}
-\starttable[|rp(0.15\textwidth)|lp(0.09\textwidth)|cp(0.16\textwidth)|lp(0.13\textwidth)|]
+\starttable[|r|l|c|l|]
 \HL
 \NC Right
 \NC Left
diff --git a/tests/tables.docbook b/tests/tables.docbook
index ffeebdc57..6f5eac970 100644
--- a/tests/tables.docbook
+++ b/tests/tables.docbook
@@ -6,16 +6,16 @@
     Demonstration of simple table syntax.
   </caption>
   <tr>
-    <th align="right" style="{width: 15%;}">
+    <th align="right">
       Right
     </th>
-    <th align="left" style="{width: 8%;}">
+    <th align="left">
       Left
     </th>
-    <th align="center" style="{width: 16%;}">
+    <th align="center">
       Center
     </th>
-    <th align="left" style="{width: 12%;}">
+    <th align="left">
       Default
     </th>
   </tr>
@@ -67,16 +67,16 @@
 </para>
 <informaltable>
   <tr>
-    <th align="right" style="{width: 15%;}">
+    <th align="right">
       Right
     </th>
-    <th align="left" style="{width: 8%;}">
+    <th align="left">
       Left
     </th>
-    <th align="center" style="{width: 16%;}">
+    <th align="center">
       Center
     </th>
-    <th align="left" style="{width: 12%;}">
+    <th align="left">
       Default
     </th>
   </tr>
@@ -131,16 +131,16 @@
     Demonstration of simple table syntax.
   </caption>
   <tr>
-    <th align="right" style="{width: 15%;}">
+    <th align="right">
       Right
     </th>
-    <th align="left" style="{width: 8%;}">
+    <th align="left">
       Left
     </th>
-    <th align="center" style="{width: 16%;}">
+    <th align="center">
       Center
     </th>
-    <th align="left" style="{width: 12%;}">
+    <th align="left">
       Default
     </th>
   </tr>
diff --git a/tests/tables.html b/tests/tables.html
index 7626b326d..49b44661c 100644
--- a/tests/tables.html
+++ b/tests/tables.html
@@ -4,13 +4,13 @@
 ><caption
   >Demonstration of simple table syntax.</caption
   ><tr class="header"
-  ><th align="right" style="width: 15%;"
+  ><th align="right"
     >Right</th
-    ><th align="left" style="width: 8%;"
+    ><th align="left"
     >Left</th
-    ><th align="center" style="width: 16%;"
+    ><th align="center"
     >Center</th
-    ><th align="left" style="width: 12%;"
+    ><th align="left"
     >Default</th
     ></tr
   ><tr class="odd"
@@ -48,13 +48,13 @@
 >Simple table without caption:</p
 ><table
 ><tr class="header"
-  ><th align="right" style="width: 15%;"
+  ><th align="right"
     >Right</th
-    ><th align="left" style="width: 8%;"
+    ><th align="left"
     >Left</th
-    ><th align="center" style="width: 16%;"
+    ><th align="center"
     >Center</th
-    ><th align="left" style="width: 12%;"
+    ><th align="left"
     >Default</th
     ></tr
   ><tr class="odd"
@@ -94,13 +94,13 @@
 ><caption
   >Demonstration of simple table syntax.</caption
   ><tr class="header"
-  ><th align="right" style="width: 15%;"
+  ><th align="right"
     >Right</th
-    ><th align="left" style="width: 8%;"
+    ><th align="left"
     >Left</th
-    ><th align="center" style="width: 16%;"
+    ><th align="center"
     >Center</th
-    ><th align="left" style="width: 12%;"
+    ><th align="left"
     >Default</th
     ></tr
   ><tr class="odd"
diff --git a/tests/tables.latex b/tests/tables.latex
index d4466b9c0..0dec7e4b0 100644
--- a/tests/tables.latex
+++ b/tests/tables.latex
@@ -2,7 +2,7 @@ Simple table with caption:
 
 \begin{table}[h]
 \begin{center}
-\begin{tabular}{>{\PBS\raggedleft\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.09\columnwidth}>{\PBS\centering\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.13\columnwidth}}
+\begin{tabular}{rlcl}
 Right
  & Left
  & Center
@@ -32,7 +32,7 @@ Right
 Simple table without caption:
 
 \begin{center}
-\begin{tabular}{>{\PBS\raggedleft\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.09\columnwidth}>{\PBS\centering\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.13\columnwidth}}
+\begin{tabular}{rlcl}
 Right
  & Left
  & Center
@@ -61,7 +61,7 @@ Simple table indented two spaces:
 
 \begin{table}[h]
 \begin{center}
-\begin{tabular}{>{\PBS\raggedleft\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.09\columnwidth}>{\PBS\centering\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.13\columnwidth}}
+\begin{tabular}{rlcl}
 Right
  & Left
  & Center
diff --git a/tests/tables.man b/tests/tables.man
index 019fa3d83..f49d07b0b 100644
--- a/tests/tables.man
+++ b/tests/tables.man
@@ -4,7 +4,7 @@ Simple table with caption:
 Demonstration of simple table syntax.
 .TS
 tab(@);
-rw(10.50n) lw(6.13n) cw(11.38n) lw(8.75n).
+r l c l.
 T{
 Right
 T}@T{
@@ -48,7 +48,7 @@ Simple table without caption:
 .PP
 .TS
 tab(@);
-rw(10.50n) lw(6.13n) cw(11.38n) lw(8.75n).
+r l c l.
 T{
 Right
 T}@T{
@@ -93,7 +93,7 @@ Simple table indented two spaces:
 Demonstration of simple table syntax.
 .TS
 tab(@);
-rw(10.50n) lw(6.13n) cw(11.38n) lw(8.75n).
+r l c l.
 T{
 Right
 T}@T{
diff --git a/tests/tables.markdown b/tests/tables.markdown
index 21fb015bc..4e05cdc35 100644
--- a/tests/tables.markdown
+++ b/tests/tables.markdown
@@ -1,28 +1,28 @@
 Simple table with caption:
 
-        Right Left      Center    Default
-  ----------- ------ ------------ ---------
-           12 12          12      12
-          123 123        123      123
-            1 1           1       1
+    Right Left    Center  Default
+  ------- ------ -------- ---------
+       12 12        12    12
+      123 123      123    123
+        1 1         1     1
   
   Table: Demonstration of simple table syntax.
 
 Simple table without caption:
 
-        Right Left      Center    Default
-  ----------- ------ ------------ ---------
-           12 12          12      12
-          123 123        123      123
-            1 1           1       1
+    Right Left    Center  Default
+  ------- ------ -------- ---------
+       12 12        12    12
+      123 123      123    123
+        1 1         1     1
 
 Simple table indented two spaces:
 
-        Right Left      Center    Default
-  ----------- ------ ------------ ---------
-           12 12          12      12
-          123 123        123      123
-            1 1           1       1
+    Right Left    Center  Default
+  ------- ------ -------- ---------
+       12 12        12    12
+      123 123      123    123
+        1 1         1     1
   
   Table: Demonstration of simple table syntax.
 
diff --git a/tests/tables.mediawiki b/tests/tables.mediawiki
index 989159846..2f505e6aa 100644
--- a/tests/tables.mediawiki
+++ b/tests/tables.mediawiki
@@ -2,10 +2,10 @@ Simple table with caption:
 
 <table>
 <caption>Demonstration of simple table syntax.</caption><tr>
-<th align="right" style="width: 15%;">Right</th>
-<th align="left" style="width: 8%;">Left</th>
-<th align="center" style="width: 16%;">Center</th>
-<th align="left" style="width: 12%;">Default</th>
+<th align="right">Right</th>
+<th align="left">Left</th>
+<th align="center">Center</th>
+<th align="left">Default</th>
 </tr><tr>
 <td align="right">12</td>
 <td align="left">12</td>
@@ -29,10 +29,10 @@ Simple table without caption:
 
 <table>
 <tr>
-<th align="right" style="width: 15%;">Right</th>
-<th align="left" style="width: 8%;">Left</th>
-<th align="center" style="width: 16%;">Center</th>
-<th align="left" style="width: 12%;">Default</th>
+<th align="right">Right</th>
+<th align="left">Left</th>
+<th align="center">Center</th>
+<th align="left">Default</th>
 </tr><tr>
 <td align="right">12</td>
 <td align="left">12</td>
@@ -56,10 +56,10 @@ Simple table indented two spaces:
 
 <table>
 <caption>Demonstration of simple table syntax.</caption><tr>
-<th align="right" style="width: 15%;">Right</th>
-<th align="left" style="width: 8%;">Left</th>
-<th align="center" style="width: 16%;">Center</th>
-<th align="left" style="width: 12%;">Default</th>
+<th align="right">Right</th>
+<th align="left">Left</th>
+<th align="center">Center</th>
+<th align="left">Default</th>
 </tr><tr>
 <td align="right">12</td>
 <td align="left">12</td>
diff --git a/tests/tables.native b/tests/tables.native
index af3f11f94..13610fad9 100644
--- a/tests/tables.native
+++ b/tests/tables.native
@@ -1,6 +1,6 @@
 Pandoc (Meta [] [] "")
 [ Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
-, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.15,8.75e-2,0.1625,0.125]
+, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
   [ [ Plain [Str "Right"] ]
   , [ Plain [Str "Left"] ]
   , [ Plain [Str "Center"] ]
@@ -18,7 +18,7 @@ Pandoc (Meta [] [] "")
   , [ Plain [Str "1"] ]
   , [ Plain [Str "1"] ] ] ]
 , Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
-, Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.15,8.75e-2,0.1625,0.125]
+, Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
   [ [ Plain [Str "Right"] ]
   , [ Plain [Str "Left"] ]
   , [ Plain [Str "Center"] ]
@@ -36,7 +36,7 @@ Pandoc (Meta [] [] "")
   , [ Plain [Str "1"] ]
   , [ Plain [Str "1"] ] ] ]
 , Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]
-, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.15,8.75e-2,0.1625,0.125]
+, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
   [ [ Plain [Str "Right"] ]
   , [ Plain [Str "Left"] ]
   , [ Plain [Str "Center"] ]
diff --git a/tests/tables.opendocument b/tests/tables.opendocument
index 1b81cddf2..18a7b3cbd 100644
--- a/tests/tables.opendocument
+++ b/tests/tables.opendocument
@@ -67,91 +67,67 @@
       <style:paragraph-properties fo:text-align="end" style:justify-single-word="false" />
     </style:style>
     <style:style style:name="Table1">
-      <style:table-properties style:rel-width="100%" table:align="center" />
-    </style:style>
-    <style:style style:name="Table1.A" style:family="table-column">
-      <style:table-column-properties style:column-width="1.05in" />
-    </style:style>
-    <style:style style:name="Table1.B" style:family="table-column">
-      <style:table-column-properties style:column-width="0.61in" />
-    </style:style>
-    <style:style style:name="Table1.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.14in" />
-    </style:style>
-    <style:style style:name="Table1.D" style:family="table-column">
-      <style:table-column-properties style:column-width="0.88in" />
+      <style:table-properties table:align="center" />
     </style:style>
+    <style:style style:name="Table1.A" style:family="table-column" />
+    <style:style style:name="Table1.B" style:family="table-column" />
+    <style:style style:name="Table1.C" style:family="table-column" />
+    <style:style style:name="Table1.D" style:family="table-column" />
     <style:style style:name="Table1.A1" style:family="table-cell">
       <style:table-cell-properties fo:border="none" />
     </style:style>
     <style:style style:name="Table2">
-      <style:table-properties style:rel-width="100%" table:align="center" />
-    </style:style>
-    <style:style style:name="Table2.A" style:family="table-column">
-      <style:table-column-properties style:column-width="1.05in" />
-    </style:style>
-    <style:style style:name="Table2.B" style:family="table-column">
-      <style:table-column-properties style:column-width="0.61in" />
-    </style:style>
-    <style:style style:name="Table2.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.14in" />
-    </style:style>
-    <style:style style:name="Table2.D" style:family="table-column">
-      <style:table-column-properties style:column-width="0.88in" />
+      <style:table-properties table:align="center" />
     </style:style>
+    <style:style style:name="Table2.A" style:family="table-column" />
+    <style:style style:name="Table2.B" style:family="table-column" />
+    <style:style style:name="Table2.C" style:family="table-column" />
+    <style:style style:name="Table2.D" style:family="table-column" />
     <style:style style:name="Table2.A1" style:family="table-cell">
       <style:table-cell-properties fo:border="none" />
     </style:style>
     <style:style style:name="Table3">
-      <style:table-properties style:rel-width="100%" table:align="center" />
-    </style:style>
-    <style:style style:name="Table3.A" style:family="table-column">
-      <style:table-column-properties style:column-width="1.05in" />
-    </style:style>
-    <style:style style:name="Table3.B" style:family="table-column">
-      <style:table-column-properties style:column-width="0.61in" />
-    </style:style>
-    <style:style style:name="Table3.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.14in" />
-    </style:style>
-    <style:style style:name="Table3.D" style:family="table-column">
-      <style:table-column-properties style:column-width="0.88in" />
+      <style:table-properties table:align="center" />
     </style:style>
+    <style:style style:name="Table3.A" style:family="table-column" />
+    <style:style style:name="Table3.B" style:family="table-column" />
+    <style:style style:name="Table3.C" style:family="table-column" />
+    <style:style style:name="Table3.D" style:family="table-column" />
     <style:style style:name="Table3.A1" style:family="table-cell">
       <style:table-cell-properties fo:border="none" />
     </style:style>
     <style:style style:name="Table4">
-      <style:table-properties style:rel-width="100%" table:align="center" />
+      <style:table-properties table:align="center" />
     </style:style>
     <style:style style:name="Table4.A" style:family="table-column">
-      <style:table-column-properties style:column-width="1.05in" />
+      <style:table-column-properties style:rel-column-width="9830*" />
     </style:style>
     <style:style style:name="Table4.B" style:family="table-column">
-      <style:table-column-properties style:column-width="0.96in" />
+      <style:table-column-properties style:rel-column-width="9011*" />
     </style:style>
     <style:style style:name="Table4.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.14in" />
+      <style:table-column-properties style:rel-column-width="10649*" />
     </style:style>
     <style:style style:name="Table4.D" style:family="table-column">
-      <style:table-column-properties style:column-width="2.36in" />
+      <style:table-column-properties style:rel-column-width="22118*" />
     </style:style>
     <style:style style:name="Table4.A1" style:family="table-cell">
       <style:table-cell-properties fo:border="none" />
     </style:style>
     <style:style style:name="Table5">
-      <style:table-properties style:rel-width="100%" table:align="center" />
+      <style:table-properties table:align="center" />
     </style:style>
     <style:style style:name="Table5.A" style:family="table-column">
-      <style:table-column-properties style:column-width="1.05in" />
+      <style:table-column-properties style:rel-column-width="9830*" />
     </style:style>
     <style:style style:name="Table5.B" style:family="table-column">
-      <style:table-column-properties style:column-width="0.96in" />
+      <style:table-column-properties style:rel-column-width="9011*" />
     </style:style>
     <style:style style:name="Table5.C" style:family="table-column">
-      <style:table-column-properties style:column-width="1.14in" />
+      <style:table-column-properties style:rel-column-width="10649*" />
     </style:style>
     <style:style style:name="Table5.D" style:family="table-column">
-      <style:table-column-properties style:column-width="2.36in" />
+      <style:table-column-properties style:rel-column-width="22118*" />
     </style:style>
     <style:style style:name="Table5.A1" style:family="table-cell">
       <style:table-cell-properties fo:border="none" />
diff --git a/tests/tables.rst b/tests/tables.rst
index db5c1c3d8..0db3efcc5 100644
--- a/tests/tables.rst
+++ b/tests/tables.rst
@@ -1,40 +1,40 @@
 Simple table with caption:
 
-+-------------+--------+--------------+-----------+
-| Right       | Left   | Center       | Default   |
-+=============+========+==============+===========+
-| 12          | 12     | 12           | 12        |
-+-------------+--------+--------------+-----------+
-| 123         | 123    | 123          | 123       |
-+-------------+--------+--------------+-----------+
-| 1           | 1      | 1            | 1         |
-+-------------+--------+--------------+-----------+
++---------+--------+----------+-----------+
+| Right   | Left   | Center   | Default   |
++=========+========+==========+===========+
+| 12      | 12     | 12       | 12        |
++---------+--------+----------+-----------+
+| 123     | 123    | 123      | 123       |
++---------+--------+----------+-----------+
+| 1       | 1      | 1        | 1         |
++---------+--------+----------+-----------+
 
 Table: Demonstration of simple table syntax.
 
 Simple table without caption:
 
-+-------------+--------+--------------+-----------+
-| Right       | Left   | Center       | Default   |
-+=============+========+==============+===========+
-| 12          | 12     | 12           | 12        |
-+-------------+--------+--------------+-----------+
-| 123         | 123    | 123          | 123       |
-+-------------+--------+--------------+-----------+
-| 1           | 1      | 1            | 1         |
-+-------------+--------+--------------+-----------+
++---------+--------+----------+-----------+
+| Right   | Left   | Center   | Default   |
++=========+========+==========+===========+
+| 12      | 12     | 12       | 12        |
++---------+--------+----------+-----------+
+| 123     | 123    | 123      | 123       |
++---------+--------+----------+-----------+
+| 1       | 1      | 1        | 1         |
++---------+--------+----------+-----------+
 
 Simple table indented two spaces:
 
-+-------------+--------+--------------+-----------+
-| Right       | Left   | Center       | Default   |
-+=============+========+==============+===========+
-| 12          | 12     | 12           | 12        |
-+-------------+--------+--------------+-----------+
-| 123         | 123    | 123          | 123       |
-+-------------+--------+--------------+-----------+
-| 1           | 1      | 1            | 1         |
-+-------------+--------+--------------+-----------+
++---------+--------+----------+-----------+
+| Right   | Left   | Center   | Default   |
++=========+========+==========+===========+
+| 12      | 12     | 12       | 12        |
++---------+--------+----------+-----------+
+| 123     | 123    | 123      | 123       |
++---------+--------+----------+-----------+
+| 1       | 1      | 1        | 1         |
++---------+--------+----------+-----------+
 
 Table: Demonstration of simple table syntax.
 
diff --git a/tests/tables.rtf b/tests/tables.rtf
index 0485d4978..bd0a88467 100644
--- a/tests/tables.rtf
+++ b/tests/tables.rtf
@@ -1,7 +1,7 @@
 {\pard \ql \f0 \sa180 \li0 \fi0 Simple table with caption:\par}
 {
 \trowd \trgaph120
-\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2052\clbrdrb\brdrs\cellx3456\clbrdrb\brdrs\cellx4536
+\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}
@@ -16,7 +16,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
@@ -31,7 +31,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
@@ -46,7 +46,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
@@ -63,7 +63,7 @@
 {\pard \ql \f0 \sa180 \li0 \fi0 Simple table without caption:\par}
 {
 \trowd \trgaph120
-\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2052\clbrdrb\brdrs\cellx3456\clbrdrb\brdrs\cellx4536
+\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}
@@ -78,7 +78,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
@@ -93,7 +93,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
@@ -108,7 +108,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
@@ -125,7 +125,7 @@
 {\pard \ql \f0 \sa180 \li0 \fi0 Simple table indented two spaces:\par}
 {
 \trowd \trgaph120
-\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2052\clbrdrb\brdrs\cellx3456\clbrdrb\brdrs\cellx4536
+\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}
@@ -140,7 +140,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
@@ -155,7 +155,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
@@ -170,7 +170,7 @@
 \intbl\row}
 {
 \trowd \trgaph120
-\cellx1296\cellx2052\cellx3456\cellx4536
+\cellx2160\cellx4320\cellx6480\cellx8640
 \trkeep\intbl
 {
 {\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
diff --git a/tests/tables.texinfo b/tests/tables.texinfo
index 2b637d7d5..592e36855 100644
--- a/tests/tables.texinfo
+++ b/tests/tables.texinfo
@@ -4,7 +4,7 @@
 Simple table with caption:
 
 @float
-@multitable @columnfractions 0.15 0.09 0.16 0.13 
+@multitable {Right} {Left} {Center} {Default} 
 @headitem 
 Right
  @tab Left
@@ -30,7 +30,7 @@ Right
 @end float
 Simple table without caption:
 
-@multitable @columnfractions 0.15 0.09 0.16 0.13 
+@multitable {Right} {Left} {Center} {Default} 
 @headitem 
 Right
  @tab Left
@@ -56,7 +56,7 @@ Right
 Simple table indented two spaces:
 
 @float
-@multitable @columnfractions 0.15 0.09 0.16 0.13 
+@multitable {Right} {Left} {Center} {Default} 
 @headitem 
 Right
  @tab Left