spec: Convert some tables that didn't get converted from troff properly

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 194 insertions, 89 deletions

diff --git a/specs/sect1-9.xml b/specs/sect1-9.xml
index 29d795a..fb6ce6d 100644
--- a/specs/sect1-9.xml
+++ b/specs/sect1-9.xml
@@ -5988,70 +5988,145 @@ The font itself will be freed when no other resource references it.
     <title>QueryFont</title>
     <indexterm significance="preferred"><primary>QueryFont</primary></indexterm>
 <informaltable frame='none'>
-  <tgroup cols='1' align='left'>
+  <tgroup cols='3' align='left' rowsep='0'>
   <colspec colname='c1' colsep='0'/>
+  <colspec colname='c2' colsep='0'/>
+  <colspec colname='c3' colsep='0'/>
+  <spanspec spanname='all' namest='c1' nameend='c3'/>
   <tbody>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 <emphasis remap='I'>font</emphasis>: FONTABLE
 <!-- .in -.2i -->
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
    ▶
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 font-info: FONTINFO
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 char-infos: LISTofCHARINFO
 <!-- .in -.2i -->
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry valign='top' morerows='18'>
 <!-- .in +.2i -->
 where:
-<!-- .IP -->
-<!-- .TS -->
-l lw(3i).
-T{
+      </entry>
+    </row>
+    <row>
+      <entry valign='top' morerows='9'>
 FONTINFO:
-T}	T{
+      </entry>
+      <entry>
 [draw-direction:
 { <emphasis role='bold'>LeftToRight</emphasis>,
-<emphasis role='bold'>RightToLeft</emphasis>}
-T}
-	\ min-char-or-byte2, max-char-or-byte2: CARD16
-	\ min-byte1, max-byte1: CARD8
-	\ all-chars-exist: BOOL
-	\ default-char: CARD16
-	\ min-bounds: CHARINFO
-	\ max-bounds: CHARINFO
-	\ font-ascent: INT16
-	\ font-descent: INT16
-	\ properties: LISTofFONTPROP]
-FONTPROP:	[name: ATOM
-	\ value: &lt;32-bit-value&gt;]
-CHARINFO:	[left-side-bearing: INT16
-	\ right-side-bearing: INT16
-	\ character-width: INT16
-	\ ascent: INT16
-	\ descent: INT16
-	\ attributes: CARD16]
-<!-- .TE -->
-<!-- .in -.2i -->
+<emphasis role='bold'>RightToLeft</emphasis> }
       </entry>
     </row>
-    <row rowsep='0'>
+    <row>
+      <entry>
+min-char-or-byte2, max-char-or-byte2: CARD16
+      </entry>
+    </row>
+    <row>
+      <entry>
+min-byte1, max-byte1: CARD8
+      </entry>
+    </row>
+    <row>
+      <entry>
+all-chars-exist: BOOL
+      </entry>
+    </row>
+    <row>
+      <entry>
+default-char: CARD16
+      </entry>
+    </row>
+    <row>
+      <entry>
+min-bounds: CHARINFO
+      </entry>
+    </row>
+    <row>
+      <entry>
+max-bounds: CHARINFO
+      </entry>
+    </row>
+    <row>
+      <entry>
+font-ascent: INT16
+      </entry>
+    </row>
+    <row>
+      <entry>
+font-descent: INT16
+      </entry>
+    </row>
+    <row>
+      <entry>
+properties: LISTofFONTPROP]
+      </entry>
+    </row>
+    <row>
+      <entry valign='top' morerows='1'>
+FONTPROP:
+      </entry>
+      <entry>
+[name: ATOM
+      </entry>
+    </row>
+    <row>
+      <entry>
+value: &lt;32-bit-value&gt;]
+      </entry>
+    </row>
+    <row>
+      <entry valign='top' morerows='5'>
+CHARINFO:
+      </entry>
+      <entry>
+[left-side-bearing: INT16
+      </entry>
+    </row>
+    <row>
+      <entry>
+right-side-bearing: INT16
+      </entry>
+    </row>
+    <row>
+      <entry>
+character-width: INT16
+      </entry>
+    </row>
+    <row>
+      <entry>
+ascent: INT16
+      </entry>
+    </row>
+    <row>
+      <entry>
+descent: INT16
+      </entry>
+    </row>
+    <row>
       <entry>
+attributes: CARD16]
+      </entry>
+    </row>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 Errors:
 <emphasis role='bold'>Font</emphasis>
@@ -8664,16 +8739,26 @@ The skewed-angle and normal-angle are expressed in radians (rather
 than in degrees scaled by 64) in the range [0,2*PI).
 The atan returns a value in the range [-PI/2,PI/2].
 The adjust is:
-</para>
-<para>
-<!-- .TS -->
-l l.
-0	for normal-angle in the range [0,PI/2)
-PI	for normal-angle in the range [PI/2,(3*PI)/2)
-2*PI	for normal-angle in the range [(3*PI)/2,2*PI)
-<!-- .TE -->
-</para>
-<para>
+<informaltable frame="none">
+  <tgroup cols='2' align='left' rowsep="0">
+    <colspec colname='c1' colwidth='1*' colsep="0"/>
+    <colspec colname='c2' colwidth='2*' colsep="0"/>
+    <tbody>
+      <row>
+	<entry>0</entry>
+	<entry>for normal-angle in the range [0,PI/2)</entry>
+      </row>
+      <row>
+	<entry>PI</entry>
+	<entry>for normal-angle in the range [PI/2,(3*PI)/2)</entry>
+      </row>
+      <row>
+	<entry>2*PI</entry>
+	<entry>for normal-angle in the range [(3*PI)/2,2*PI)</entry>
+      </row>
+    </tbody>
+  </tgroup>
+</informaltable>
 </para>
 <para>
 The arcs are drawn in the order listed.
@@ -9243,54 +9328,64 @@ It is intended specifically for rudimentary hardcopy support.
     <title>PolyText8</title>
     <indexterm significance="preferred"><primary>PolyText8</primary></indexterm>
 <informaltable frame='none'>
-  <tgroup cols='1' align='left'>
+  <tgroup cols='3' align='left' rowsep='0'>
   <colspec colname='c1' colsep='0'/>
+  <colspec colname='c2' colsep='0'/>
+  <colspec colname='c3' colsep='0'/>
+  <spanspec spanname='all' namest='c1' nameend='c3'/>
   <tbody>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 <emphasis remap='I'>drawable</emphasis>: DRAWABLE
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <emphasis remap='I'>gc</emphasis>: GCONTEXT
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <emphasis remap='I'>x</emphasis>, <emphasis remap='I'>y</emphasis>: INT16
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <emphasis remap='I'>items</emphasis>: LISTofTEXTITEM8
 <!-- .in -.2i -->
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry valign='top' morerows='3'>
 <!-- .in +.2i -->
 where:
-<!-- .TS -->
-r l.
-TEXTITEM8:	TEXTELT8 or FONT
       </entry>
     </row>
-    <row rowsep='0'>
+    <row>
+      <entry>
+TEXTITEM8:
+      </entry>
       <entry>
-TEXTELT8:	[delta: INT8
+TEXTELT8 or FONT
       </entry>
     </row>
-    <row rowsep='0'>
+    <row>
+      <entry valign='top' morerows='1'>
+TEXTELT8:
+      </entry>
       <entry>
-	\ string: STRING8]
-<!-- .TE -->
-<!-- .in -.2i -->
+[delta: INT8
       </entry>
     </row>
-    <row rowsep='0'>
+    <row>
       <entry>
+string: STRING8]
+<!-- .in -.2i -->
+      </entry>
+    </row>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 Errors:
 <emphasis role='bold'>Drawable</emphasis>,
@@ -9346,54 +9441,64 @@ tile-stipple-x-origin, tile-stipple-y-origin
     <title>PolyText16</title>
     <indexterm significance="preferred"><primary>PolyText16</primary></indexterm>
 <informaltable frame='none'>
-  <tgroup cols='1' align='left'>
+  <tgroup cols='3' align='left' rowsep='0'>
   <colspec colname='c1' colsep='0'/>
+  <colspec colname='c2' colsep='0'/>
+  <colspec colname='c3' colsep='0'/>
+  <spanspec spanname='all' namest='c1' nameend='c3'/>
   <tbody>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 <emphasis remap='I'>drawable</emphasis>: DRAWABLE
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <emphasis remap='I'>gc</emphasis>: GCONTEXT
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <emphasis remap='I'>x</emphasis>, <emphasis remap='I'>y</emphasis>: INT16
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry spanname='all'>
 <emphasis remap='I'>items</emphasis>: LISTofTEXTITEM16
 <!-- .in -.2i -->
       </entry>
     </row>
-    <row rowsep='0'>
-      <entry>
+    <row>
+      <entry valign='top' morerows='3'>
 <!-- .in +.2i -->
 where:
-<!-- .TS -->
-r l.
-TEXTITEM16:	TEXTELT16 or FONT
       </entry>
     </row>
-    <row rowsep='0'>
+    <row>
       <entry>
-TEXTELT16:	[delta: INT8
+TEXTITEM16:
+      </entry>
+      <entry>
+TEXTELT16 or FONT
       </entry>
     </row>
-    <row rowsep='0'>
+    <row>
+      <entry valign='top' morerows='1'>
+TEXTELT16:
+      </entry>
       <entry>
-	\ string: STRING16]
-<!-- .TE -->
-<!-- .in -.2i -->
+[delta: INT8
       </entry>
     </row>
     <row rowsep='0'>
       <entry>
+string: STRING16]
+<!-- .in -.2i -->
+      </entry>
+    </row>
+    <row>
+      <entry spanname='all'>
 <!-- .in +.2i -->
 Errors:
 <emphasis role='bold'>Drawable</emphasis>,