Updated table tests

diff --git a/testdocs/table.xml b/testdocs/table.xml
index 61c354fa0ef579d192ffb07b4a8568de105632bd..2858fe6722c4517ab21baa12db24b1f9b2bd35cb 100644 (file)
--- a/testdocs/table.xml
+++ b/testdocs/table.xml
@@ -4,7 +4,7 @@
 <chapter>
 <title>Tables</title>
 
-<table>
+<table frame="all">
 <title>TFoot Test</title>
 <tgroup cols="2">
 <tfoot>
@@ -22,54 +22,7 @@
 </tgroup>
 </table>
 
-<table id="ug-t3-2">
-<title>Slicing Options</title>
-<tgroup cols="4" align="left">
-<colspec colnum="2" colname="c2"/>
-<colspec colnum="4" colname="c4"/>
-<spanspec spanname="hspan" namest="c2" nameend="c4" align="center"/>
-<thead>
-<row>
-<entry morerows="1" valign="middle">Output</entry>
-<entry namest="c2" nameend="c4">Input</entry>
-</row>
-<row>
-<entry align="left">Uniform</entry>
-<entry>Perimeter</entry>
-<entry>Curvilinear</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry>Uniform</entry>
-<entry>OrthoSlice, Slice</entry>
-<entry align="center">-</entry>
-<entry align="center">-</entry>
-
-</row>
-<row>
-<entry>Perimeter</entry>
-<entry align="center">-</entry>
-<entry>OrthoSlice</entry>
-<entry align="center">-</entry>
-</row>
-<row>
-<entry>Curvilinear</entry>
-<entry>OrthoSlice</entry>
-<entry>OrthoSlice</entry>
-<entry>OrthoSlice</entry>
-</row>
-<row>
-<entry>Pyramid</entry>
-<entry align="center">-</entry>
-<entry align="center">-</entry>
-<entry>ProbeLat</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-<table id="width-test-1">
+<table id="width-test-1" frame="all">
 <title>Width Test 1</title>
 <tgroup cols="4" align="left">
 <colspec colnum="1" colname="c1" colwidth="1in"/>
@@ -95,15 +48,15 @@
 
 <para>1:</para>
 
-<!--
+<screen>
 +........+........+........+........+
 |        |   B    |        |   D    |
 +   A    +........+   C    +........+
 |        |        |        |   E    |
 +........+........+........+........+
--->
+</screen>
 
-<informaltable>
+<informaltable frame="all">
 <tgroup cols="4">
 <colspec colname="c4a" colnum="4"/>
 <tbody>
@@ -122,7 +75,7 @@
 
 <para>2:</para>
 
-<!--
+<screen>
 +........+........+........+........+
 |   A    |   B    |   C    |   D    |
 +........+........+        +        +
@@ -132,9 +85,9 @@
 +        +........+........+........+
 |        |   H    |        |   I    |
 +........+........+........+........+
--->
+</screen>
 
-<informaltable>
+<informaltable frame="all">
 <tgroup cols="4">
 <colspec colname="c4b" colnum="4"/>
 <tbody>
@@ -161,7 +114,7 @@
 
 <para>3:</para>
 
-<!--
+<screen>
 +........+........+........+........+
 |   A    |   B    |   C    |   D    |
 +........+        +........+        +
@@ -171,9 +124,9 @@
 +........+........+........+........+
 |   H    |        |   I    |   J    |
 +........+........+........+........+
--->
+</screen>
 
-<informaltable>
+<informaltable frame="all">
 <tgroup cols="4">
 <colspec colname="c3c" colnum="3"/>
 <colspec colname="c4c" colnum="4"/>
@@ -202,7 +155,71 @@
 
 <para>4:</para>
 
-<!--
+<screen>
++........+........+........+........+........+
+|   A    |        |        |        |        |
++        +........+........+........+........+
+|        |   B    |        |        C        |
++        +........+........+........+........+
+|        |        |   D    |        |        |
++........+........+        +........+........+
+|        |        |        |        |   E    |
++........+........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="5">
+<colspec colname="c3d" colnum="3"/>
+<colspec colname="c4d" colnum="4"/>
+<colspec colname="c5d" colnum="5"/>
+<tbody>
+<row>
+  <entry morerows="2">A</entry>
+</row>
+<row>
+  <entry>B</entry>
+  <entry namest="c4d" nameend="c5d">C</entry>
+</row>
+<row>
+  <entry namest="c3d" morerows="1">D</entry>
+</row>
+<row>
+  <entry namest="c5d">E</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>5:</para>
+
+<screen>
++........+........+........+........+
+|        |   B    |        |   D    |
++   A    +........+   C    +........+
+|        |        |        |   E    |
++........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="4">
+<colspec colname="c4a" colnum="4"/>
+<tbody>
+<row>
+  <entry morerows="1">A</entry>
+  <entry>B</entry>
+  <entry morerows="1">C</entry>
+  <entry>D</entry>
+</row>
+<row>
+  <entry namest="c4a">E</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>6:</para>
+
+<screen>
 +........+........+........+........+
 |   A    |        |        |        |
 +        +........+........+........+
@@ -212,9 +229,9 @@
 +........+........+        +........+
 |        |        |        |   E    |
 +........+........+........+........+
--->
+</screen>
 
-<informaltable>
+<informaltable frame="all">
 <tgroup cols="4">
 <colspec colname="c3d" colnum="3"/>
 <colspec colname="c4d" colnum="4"/>
@@ -236,4 +253,282 @@
 </tgroup>
 </informaltable>
 
+<para>7:</para>
+
+<screen>
++........+........+........+........+........+
+|        A        |        |        B        |
++........+........+........+........+........+
+|   X    |                          |        |
++........+            C             +........+
+|   Y    |                          |        |
++........+........+........+........+........+
+|        D        |        |        E        |
++........+........+........+........+........+
+|   F    |   G    |   H    |   I    |   J    |
++........+........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="5">
+<colspec colname="c1c"/>
+<colspec colname="c2c"/>
+<colspec colname="c3c"/>
+<colspec colname="c4c"/>
+<colspec colname="c5c"/>
+<tbody>
+<row>
+  <entry namest="c1c" nameend="c2c">A</entry>
+  <entry namest="c4c" nameend="c5c">B</entry>
+</row>
+<row>
+  <entry>X</entry>
+  <entry namest="c2c" nameend="c4c" morerows="1">C</entry>
+</row>
+<row>
+  <entry>Y</entry>
+</row>
+<row>
+  <entry namest="c1c" nameend="c2c">D</entry>
+  <entry namest="c4c" nameend="c5c">E</entry>
+</row>
+<row>
+  <entry>F</entry>
+  <entry>G</entry>
+  <entry>H</entry>
+  <entry>I</entry>
+  <entry>J</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>8:</para>
+
+<screen>
++........+........+........+........+........+
+|        A        |        |        B        |
++........+........+........+........+........+
+|   X    |                          |        |
++........+            C             +........+
+|   Y    |                          |        |
++........+........+........+........+........+
+|        D        |        |        E        |
++........+........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="5">
+<colspec colname="c1c"/>
+<colspec colname="c2c"/>
+<colspec colname="c3c"/>
+<colspec colname="c4c"/>
+<colspec colname="c5c"/>
+<tbody>
+<row>
+  <entry namest="c1c" nameend="c2c">A</entry>
+  <entry namest="c4c" nameend="c5c">B</entry>
+</row>
+<row>
+  <entry>X</entry>
+  <entry namest="c2c" nameend="c4c" morerows="1">C</entry>
+</row>
+<row>
+  <entry>Y</entry>
+</row>
+<row>
+  <entry namest="c1c" nameend="c2c">D</entry>
+  <entry namest="c4c" nameend="c5c">E</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>9:</para>
+
+<screen>
++........+........+........+........+........+
+|        A        |        |        B        |
++........+........+........+........+........+
+|        |            C             |        |
++........+........+........+........+........+
+|        D        |        |        E        |
++........+........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="5">
+<colspec colname="c1c"/>
+<colspec colname="c2c"/>
+<colspec colname="c3c"/>
+<colspec colname="c4c"/>
+<colspec colname="c5c"/>
+<tbody>
+<row>
+  <entry namest="c1c" nameend="c2c">A</entry>
+  <entry namest="c4c" nameend="c5c">B</entry>
+</row>
+<row>
+  <entry namest="c2c" nameend="c4c">C</entry>
+</row>
+<row>
+  <entry namest="c1c" nameend="c2c">D</entry>
+  <entry namest="c4c" nameend="c5c">E</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>10:</para>
+
+<screen>
++........+........+........+........+
+|   A    |        |        |    F   |
++........+........+........+........+
+|        |   B    |                 |
++........+........+        D        +
+|   C    |        |                 |
++........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="4">
+<colspec colname="c1a" colnum="1"/>
+<colspec colname="c2a" colnum="2"/>
+<colspec colname="c3a" colnum="3"/>
+<colspec colname="c4a" colnum="4"/>
+<tbody>
+<row>
+  <entry>A</entry>
+  <entry colname="c4a">F</entry>
+</row>
+<row>
+  <entry colname="c2a">B</entry>
+  <entry namest="c3a" nameend="c4a" morerows="1">D</entry>
+</row>
+<row>
+  <entry>C</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>11:</para>
+
+<screen>
++........+........+........+........+
+|        |        |        |    F   |
++   A    +........+........+........+
+|        |        B                 |
++........+                          +
+|   C    |                          |
++........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="4">
+<colspec colname="c1a" colnum="1"/>
+<colspec colname="c2a" colnum="2"/>
+<colspec colname="c3a" colnum="3"/>
+<colspec colname="c4a" colnum="4"/>
+<tbody>
+<row>
+  <entry morerows="1">A</entry>
+  <entry colname="c4a">F</entry>
+</row>
+<row>
+  <entry namest="c2a" nameend="c4a" morerows="1">B</entry>
+</row>
+<row>
+  <entry>C</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>12:</para>
+
+<screen>
++........+........+........+
+|   A    |        |        |
++........+........+........+
+|        |        B        |
++........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="3">
+<colspec colname="c2a" colnum="2"/>
+<colspec colname="c3a" colnum="3"/>
+<tbody>
+<row>
+  <entry>A</entry>
+</row>
+<row>
+  <entry namest="c2a" nameend="c3a">B</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>13:</para>
+
+<screen>
++........+........+........+........+........+
+|   A    |        |        |        |        |
++........+........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="5">
+<tbody>
+<row>
+  <entry>A</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
+<para>14:</para>
+
+<screen>
++........+........+........+........+........+
+|   A    |        |        |        |        |
++        +........+........+........+........+
+|        |   B    |        |        C        |
++        +........+........+........+........+
+|        |        |   D    |        |        |
++........+........+        +........+........+
+|        |        |        |        |   E    |
++........+........+........+........+........+
+|        |        |            F             |
++........+........+........+........+........+
+</screen>
+
+<informaltable frame="all">
+<tgroup cols="5">
+<colspec colname="c3d" colnum="3"/>
+<colspec colname="c4d" colnum="4"/>
+<colspec colname="c5d" colnum="5"/>
+<tbody>
+<row>
+  <entry morerows="2">A</entry>
+</row>
+<row>
+  <entry>B</entry>
+  <entry namest="c4d" nameend="c5d">C</entry>
+</row>
+<row>
+  <entry namest="c3d" morerows="1">D</entry>
+</row>
+<row>
+  <entry namest="c5d">E</entry>
+</row>
+<row>
+  <entry namest="c3d" nameend="c5d">F</entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+
 </chapter>