libX11 specs: review doclifter generated tables

Many tables had a questionnable layout and some had information dropped.
Each table was cross-referenced with a pre-docbook version
to ensure semantic integrity.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

9 files changed, 192 insertions, 274 deletions

diff --git a/specs/libX11/AppA.xml b/specs/libX11/AppA.xml
index 2f4f03e9..0bd585cd 100644
--- a/specs/libX11/AppA.xml
+++ b/specs/libX11/AppA.xml
@@ -14,8 +14,8 @@ and the corresponding protocol request that it generates.
   <tgroup cols="2">
     <thead>
       <row>
-	<entry>Xlib Function</entry>
-	<entry>Protocol Request</entry>
+	<entry align='left'>Xlib Function</entry>
+	<entry align='left'>Protocol Request</entry>
       </row>
     </thead>
     <tbody>
@@ -1062,8 +1062,8 @@ order) and the Xlib functions that reference it.
   <tgroup cols="2">
     <thead>
       <row>
-	<entry>Protocol Request</entry>
-	<entry>Xlib Function</entry>
+	<entry align='left'>Protocol Request</entry>
+	<entry align='left'>Xlib Function</entry>
       </row>
     </thead>
     <tbody>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index ce9cd3d8..c2c70cbd 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -426,17 +426,17 @@ and
 windows:
 </para>
 <informaltable>
-  <tgroup cols='4' align='center'>
-  <colspec colname='c1'/>
-  <colspec colname='c2'/>
-  <colspec colname='c3'/>
-  <colspec colname='c4'/>
+  <tgroup cols='4'>
+  <colspec colname='c1' align='left'/>
+  <colspec colname='c2' align='left'/>
+  <colspec colname='c3' align='center'/>
+  <colspec colname='c4' align='center'/>
   <thead>
     <row>
       <entry>Attribute</entry>
       <entry>Default</entry>
       <entry>InputOutput</entry>
-      <entry>nputOnly</entry>
+      <entry>InputOnly</entry>
     </row>
   </thead>
   <tbody>
@@ -758,9 +758,9 @@ change of width and height, the (x, y) pairs are defined:
 <para>
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='2' align='center'>
-  <colspec colname='c1'/>
-  <colspec colname='c2'/>
+  <tgroup cols='2'>
+  <colspec colname='c1' align='left'/>
+  <colspec colname='c2' align='left'/>
   <thead>
     <row>
       <entry>Gravity Direction</entry>
@@ -2437,8 +2437,8 @@ error results.
 If a sibling and a stack_mode are specified, 
 the window is restacked as follows:
 </para>
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable  frame="none">
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -2476,8 +2476,8 @@ If a stack_mode is specified but no sibling is specified,
 the window is restacked as follows:
 </para>
 
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable  frame="none">
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -2497,6 +2497,7 @@ the top of the stack.
       </entry>
     </row>
     <row>
+      <entry><symbol>BottomIf</symbol></entry>
       <entry>
 If the window occludes any sibling, the window is placed at
 the bottom of the stack.
diff --git a/specs/libX11/CH06.xml b/specs/libX11/CH06.xml
index aa81cb81..e4c54fd7 100644
--- a/specs/libX11/CH06.xml
+++ b/specs/libX11/CH06.xml
@@ -6996,15 +6996,15 @@ spaces.
 The conversion functions provided by Xlib are:
 </para>
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Function</entry>
-      <entry>Converts from</entry>
-      <entry>Converts to</entry>
+      <entry align='center'>Function</entry>
+      <entry align='center'>Converts from</entry>
+      <entry align='center'>Converts to</entry>
     </row>
   </thead>
   <tbody>
diff --git a/specs/libX11/CH07.xml b/specs/libX11/CH07.xml
index 71c48432..0b873078 100644
--- a/specs/libX11/CH07.xml
+++ b/specs/libX11/CH07.xml
@@ -137,14 +137,13 @@ typedef struct {
 The default GC values are:
 </para>
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
-  <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Component</entry>
-      <entry>Default</entry>
+      <entry align='center'>Component</entry>
+      <entry align='center'>Default</entry>
     </row>
   </thead>
   <tbody>
@@ -194,15 +193,11 @@ The default GC values are:
     </row>
     <row>
       <entry>tile</entry>
-      <entry>Pixmap of unspecified size filled with foreground pixel</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>(that is, client specified pixel if any, else 0)</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>(subsequent changes to foreground do not affect this pixmap)</entry>
+      <entry>
+      <para>Pixmap of unspecified size filled with foreground pixel</para>
+      <para>(that is, client specified pixel if any, else 0)</para>
+      <para>(subsequent changes to foreground do not affect this pixmap)</para>
+      </entry>
     </row>
     <row>
       <entry>stipple</entry>
@@ -284,15 +279,15 @@ are:
 <!-- .\".CP T 1 -->
 <!-- .\"Display Functions -->
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Function Name</entry>
-      <entry>Value</entry>
-      <entry>Operation</entry>
+      <entry align='center'>Function Name</entry>
+      <entry align='center'>Value</entry>
+      <entry align='center'>Operation</entry>
     </row>
   </thead>
   <tbody>
@@ -632,7 +627,7 @@ the semantics depends on the line-width and the cap-style:
 </para>
 
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -747,7 +742,7 @@ the following apply:
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -781,7 +776,7 @@ the odd dashes are controlled by the fill-style in the following manner:
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
diff --git a/specs/libX11/CH10.xml b/specs/libX11/CH10.xml
index 8a06a706..d3ddd340 100644
--- a/specs/libX11/CH10.xml
+++ b/specs/libX11/CH10.xml
@@ -80,13 +80,13 @@ The processing associated with these events is discussed in section 10.5.
 <para>
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Event Category</entry>
-      <entry>Event Type</entry>
+      <entry align='left'>Event Category</entry>
+      <entry align='left'>Event Type</entry>
     </row>
   </thead>
   <tbody>
@@ -370,13 +370,13 @@ event mask:
 <!-- .\" .CP T 2 -->
 <!-- .\"Event Mask Definitions -->
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Event Mask</entry>
-      <entry>Circumstances</entry>
+      <entry align='left'>Event Mask</entry>
+      <entry align='left'>Circumstances</entry>
     </row>
   </thead>
   <tbody>
@@ -558,42 +558,34 @@ Note that N.A. appears in columns for which the information is not applicable.
 <!-- .ps 9 -->
 <!-- .nr PS 9 -->
 <informaltable>
-  <tgroup cols='4' align='center'>
+  <tgroup cols='4'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <colspec colname='c4'/>
   <thead>
     <row>
-      <entry>Event Mask</entry>
-      <entry>Event Type</entry>
-      <entry>Structure</entry>
-      <entry>Generic Structure</entry>
+      <entry align='left'>Event Mask</entry>
+      <entry align='left'>Event Type</entry>
+      <entry align='left'>Structure</entry>
+      <entry align='left'>Generic Structure</entry>
     </row>
   </thead>
   <tbody>
     <row>
-      <entry>ButtonMotionMask</entry>
+      <entry>
+      <para>ButtonMotionMask</para>
+      <para>Button1MotionMask</para>
+      <para>Button2MotionMask</para>
+      <para>Button3MotionMask</para>
+      <para>Button4MotionMask</para>
+      <para>Button5MotionMask</para>
+      </entry>
       <entry>MotionNotify</entry>
       <entry>XPointerMovedEvent</entry>
       <entry>XMotionEvent</entry>
     </row>
     <row>
-      <entry>Button1MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button2MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button3MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button4MotionMask</entry>
-    </row>
-    <row>
-      <entry>Button5MotionMask</entry>
-    </row>
-    <row>
       <entry>ButtonPressMask</entry>
       <entry>ButtonPress</entry>
       <entry>XButtonPressedEvent</entry>
@@ -628,23 +620,21 @@ Note that N.A. appears in columns for which the information is not applicable.
       <entry>XExposeEvent </entry>
     </row>
     <row>
-      <entry>GCGraphicsExposures in GC</entry>
+      <entry morerows='1'>GCGraphicsExposures in GC</entry>
       <entry>GraphicsExpose</entry>
       <entry>XGraphicsExposeEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>NoExpose</entry>
       <entry>XNoExposeEvent</entry>
     </row>
     <row>
-      <entry>FocusChangeMask</entry>
+      <entry morerows='1'>FocusChangeMask</entry>
       <entry>FocusIn</entry>
       <entry>XFocusInEvent</entry>
       <entry>XFocusChangeEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>FocusOut</entry>
       <entry>XFocusOutEvent</entry>
       <entry>XFocusChangeEvent</entry>
@@ -693,92 +683,77 @@ Note that N.A. appears in columns for which the information is not applicable.
       <entry>XResizeRequestEvent</entry>
     </row>
     <row>
-      <entry>StructureNotifyMask</entry>
+      <entry morerows='6'>StructureNotifyMask</entry>
       <entry>CirculateNotify</entry>
       <entry>XCirculateEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ConfigureNotify</entry>
       <entry>XConfigureEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>DestroyNotify</entry>
       <entry>XDestroyWindowEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>GravityNotify</entry>
       <entry>XGravityEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>MapNotify</entry>
       <entry>XMapEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ReparentNotify</entry>
       <entry>XReparentEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>UnmapNotify</entry>
       <entry>XUnmapEvent</entry>
     </row>
     <row>
-      <entry>SubstructureNotifyMask</entry>
+      <entry morerows='7'>SubstructureNotifyMask</entry>
       <entry>CirculateNotify</entry>
       <entry>XCirculateEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ConfigureNotify</entry>
       <entry>XConfigureEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>CreateNotify</entry>
       <entry>XCreateWindowEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>DestroyNotify</entry>
       <entry>XDestroyWindowEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>GravityNotify</entry>
       <entry>XGravityEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>MapNotify</entry>
       <entry>XMapEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ReparentNotify</entry>
       <entry>XReparentEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>UnmapNotify</entry>
       <entry>XUnmapEvent</entry>
     </row>
     <row>
-      <entry>SubstructureRedirectMask</entry>
+      <entry morerows='2'>SubstructureRedirectMask</entry>
       <entry>CirculateRequest</entry>
       <entry>XCirculateRequestEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>ConfigureRequest</entry>
       <entry>XConfigureRequestEvent</entry>
     </row>
     <row>
-      <entry></entry>
       <entry>MapRequest</entry>
       <entry>XMapRequestEvent</entry>
     </row>
@@ -812,9 +787,6 @@ Note that N.A. appears in columns for which the information is not applicable.
       <entry>VisibilityNotify</entry>
       <entry>XVisibilityEvent</entry>
     </row>
-    <row>
-      <entry>_</entry>
-    </row>
   </tbody>
   </tgroup>
 </informaltable>
@@ -919,13 +891,13 @@ The effect is essentially equivalent to an
 with these client passed arguments:
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Argument</entry>
-      <entry>Value</entry>
+      <entry align='left'>Argument</entry>
+      <entry align='left'>Value</entry>
     </row>
   </thead>
   <tbody>
@@ -1316,13 +1288,13 @@ Some of the symbols mentioned in this section have fixed values, as
 follows:
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Symbol</entry>
-      <entry>Value</entry>
+      <entry align='left'>Symbol</entry>
+      <entry align='left'>Value</entry>
     </row>
   </thead>
   <tbody>
diff --git a/specs/libX11/CH11.xml b/specs/libX11/CH11.xml
index 39b891a3..f203f6f1 100644
--- a/specs/libX11/CH11.xml
+++ b/specs/libX11/CH11.xml
@@ -2049,40 +2049,30 @@ chapter:
 <indexterm significance="preferred"><primary>BadFont</primary></indexterm>
 <indexterm significance="preferred"><primary>BadGC</primary></indexterm>
 <indexterm significance="preferred"><primary>BadIDChoice</primary></indexterm>
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable frame='none'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Error Code</entry>
-      <entry>Description</entry>
+      <entry align='left'>Error Code</entry>
+      <entry align='left'>Description</entry>
     </row>
   </thead>
   <tbody>
     <row>
       <entry><errorname id='BadAccess'>BadAccess</errorname></entry>
-      <entry>A client attempts to grab a key/button combination already grabbed
-      by another client.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to free a colormap entry that it had not already allocated
-      or to free an entry in a colormap that was created with all entries writable.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to store into a read-only or unallocated colormap entry.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to modify the access control list from other than the local
-      (or otherwise authorized) host.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>A client attempts to select an event type that another client
-      has already selected.</entry>
+      <entry>
+      <para>A client attempts to grab a key/button combination already grabbed
+      by another client.</para>
+      <para>A client attempts to free a colormap entry that it had not already allocated
+      or to free an entry in a colormap that was created with all entries writable.</para>
+      <para>A client attempts to store into a read-only or unallocated colormap entry.</para>
+      <para>A client attempts to modify the access control list from other than the local
+      (or otherwise authorized) host.</para>
+      <para>A client attempts to select an event type that another client
+      has already selected.</para>
+      </entry>
     </row>
     <row>
       <entry><errorname id='BadAlloc'>BadAlloc</errorname></entry>
@@ -2144,34 +2134,22 @@ chapter:
     </row>
     <row>
       <entry><errorname id='BadLength'>BadLength</errorname></entry>
-      <entry>The length of a request is shorter or longer than that required to
+      <entry><para>The length of a request is shorter or longer than that required to
       contain the arguments.
-      This is an internal Xlib or server error.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>
-      The length of a request exceeds the maximum length accepted by the server.</entry>
+      This is an internal Xlib or server error.</para>
+      <para>The length of a request exceeds the maximum length accepted by the server.</para>
+      </entry>
     </row>
     <row>
       <entry><errorname id='BadMatch'>BadMatch</errorname></entry>
-      <entry>In a graphics request,
-      the root and depth of the graphics context do not match those of the drawable.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>An <symbol>InputOnly</symbol> window is used as a drawable.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>
-      Some argument or pair of arguments has the correct type and range,
-      but it fails to match in some other way required by the request.</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>An <symbol>InputOnly</symbol>
-      window lacks this attribute.</entry>
+      <entry><para>In a graphics request,
+      the root and depth of the graphics context do not match those of the drawable.</para>
+      <para>An <symbol>InputOnly</symbol> window is used as a drawable.</para>
+      <para>Some argument or pair of arguments has the correct type and range,
+      but it fails to match in some other way required by the request.</para>
+      <para>An <symbol>InputOnly</symbol>
+      window lacks this attribute.</para>
+      </entry>
     </row>
     <row>
       <entry><errorname id='BadName'>BadName</errorname></entry>
diff --git a/specs/libX11/CH12.xml b/specs/libX11/CH12.xml
index d71332c6..8334e9eb 100644
--- a/specs/libX11/CH12.xml
+++ b/specs/libX11/CH12.xml
@@ -1572,8 +1572,8 @@ time of the most recent active grab for the client or if the specified time
 is later than the current X server time.
 Depending on the event_mode argument, the following occurs:
 </para>
-<informaltable>
-  <tgroup cols='2' align='center'>
+<informaltable frame='none'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
diff --git a/specs/libX11/CH13.xml b/specs/libX11/CH13.xml
index 93e3db7c..65a92e72 100644
--- a/specs/libX11/CH13.xml
+++ b/specs/libX11/CH13.xml
@@ -287,63 +287,54 @@ the following table describes the locale (and modifiers) dependency:
 </para>
 
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry>Locale from</entry>
-      <entry>Affects the Function</entry>
-      <entry>In</entry>
+      <entry align='center'>Locale from</entry>
+      <entry align='center'>Affects the Function</entry>
+      <entry align='center'>In</entry>
     </row>
   </thead>
   <tbody>
     <row>
-      <entry></entry>
-      <entry>Locale Query/Configuration:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Locale Query/Configuration:</emphasis></entry>
     </row>
     <row>
-      <entry><function>setlocale</function></entry>
+      <entry morerows='1'><function>setlocale</function></entry>
       <entry><function>XSupportsLocale</function></entry>
       <entry>Locale queried</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XSetLocaleModifiers</function></entry>
       <entry>Locale modified</entry>
     </row>
     <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Resources:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Resources:</emphasis></entry>
     </row>
     <row>
       <entry><function>setlocale</function></entry>
-      <entry><function>XrmGetFileDatabase</function></entry>
+      <entry>
+        <para><function>XrmGetFileDatabase</function></para>
+        <para><function>XrmGetStringDatabase</function></para>
+      </entry>
       <entry>Locale of <type>XrmDatabase</type></entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XrmGetStringDatabase</function></entry>
-    </row>
-    <row>
       <entry><type>XrmDatabase</type></entry>
-      <entry><function>XrmPutFileDatabase</function></entry>
+      <entry>
+        <para><function>XrmPutFileDatabase</function></para>
+        <para><function>XrmLocaleOfDatabase</function></para>
+      </entry>
       <entry>Locale of <type>XrmDatabase</type></entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XrmLocaleOfDatabase</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Setting Standard Properties:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Setting Standard Properties:</emphasis></entry>
     </row>
     <row>
       <entry><function>setlocale</function></entry>
@@ -354,129 +345,100 @@ the following table describes the locale (and modifiers) dependency:
     </row>
     <row>
       <entry><function>setlocale</function></entry>
-      <entry><function>XmbTextPropertyToTextList</function></entry>
+      <entry>
+        <para><function>XmbTextPropertyToTextList</function></para>
+        <para><function>XwcTextPropertyToTextList</function></para>
+        <para><function>XmbTextListToTextProperty</function></para>
+        <para><function>XwcTextListToTextProperty</function></para>
+      </entry>
       <entry>Encoding of supplied/returned text</entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XwcTextPropertyToTextList</function></entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Text Input:</emphasis></entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XmbTextListToTextProperty</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><function>XwcTextListToTextProperty</function></entry>
-    </row>
-    <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Text Input:</entry>
-    </row>
-    <row>
-      <entry><function>setlocale</function></entry>
+      <entry morerows='2'><function>setlocale</function></entry>
       <entry><function>XOpenIM</function></entry>
       <entry><acronym>XIM</acronym> input method selection</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XRegisterIMInstantiateCallback</function></entry>
       <entry><acronym>XIM</acronym> selection</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XUnregisterIMInstantiateCallback</function></entry>
       <entry><acronym>XIM</acronym> selection</entry>
     </row>
     <row>
-      <entry><type>XIM</type></entry>
+      <entry morerows='1'><type>XIM</type></entry>
       <entry><function>XCreateIC</function></entry>
       <entry><acronym>XIC</acronym> input method configuration</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XLocaleOfIM</function>,  and so on</entry>
       <entry>Queried locale</entry>
     </row>
     <row>
-      <entry><type>XIC</type></entry>
+      <entry morerows='1'><type>XIC</type></entry>
       <entry><function>XmbLookupString</function></entry>
       <entry>Keyboard layout</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XwcLookupString</function></entry>
       <entry>Encoding of returned text</entry>
     </row>
     <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Text Drawing:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Text Drawing:</emphasis></entry>
     </row>
     <row>
-      <entry><function>setlocale</function></entry>
+      <entry morerows='1'><function>setlocale</function></entry>
       <entry><function>XOpenOM</function></entry>
       <entry><acronym>XOM</acronym> output method selection</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XCreateFontSet</function></entry>
       <entry>Charsets of fonts in XFontSet</entry>
     </row>
     <row>
-      <entry><type>XOM</type></entry>
+      <entry morerows='1'><type>XOM</type></entry>
       <entry><function>XCreateOC</function></entry>
       <entry><acronym>XOC</acronym> output method configuration</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XLocaleOfOM</function>,  and so on</entry>
       <entry>Queried locale</entry>
     </row>
     <row>
-      <entry><type>XFontSet</type></entry>
+      <entry morerows='2'><type>XFontSet</type></entry>
       <entry><function>XmbDrawText</function>,</entry>
       <entry>Locale of supplied text</entry>
     </row>
     <row>
-      <entry></entry>
       <entry><function>XwcDrawText</function>, and so on</entry>
       <entry>Locale of supplied text</entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XExtentsOfFontSet</function>, and so on</entry>
+      <entry>
+        <para><function>XExtentsOfFontSet</function>,  and so on</para>
+        <para><function>XmbTextExtents</function>,</para>
+        <para><function>XwcTextExtents</function>,  and so on</para>
+      </entry>
       <entry>Locale-dependent metrics</entry>
     </row>
     <row>
-      <entry></entry>
-      <entry><function>XmbTextExtents</function>,</entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry><function>XwcTextExtents</function>,  and so on</entry>
-    </row>
-    <row>
-      <entry></entry>
-    </row>
-    <row>
-      <entry></entry>
-      <entry>Xlib Errors:</entry>
+      <entry nameend='c3' namest='c1'>
+      <emphasis role='bold'>Xlib Errors:</emphasis></entry>
     </row>
     <row>
       <entry><function>setlocale</function></entry>
-      <entry><function>XGetErrorDatabaseText</function></entry>
+      <entry>
+        <para><function>XGetErrorDatabaseText</function>,</para>
+        <para><function>XGetErrorText</function>,  and so on</para>
+      </entry>
       <entry>Locale of error message</entry>
     </row>
-    <row>
-      <entry></entry>
-      <entry><function>XGetErrorText</function></entry>
-    </row>
   </tbody>
   </tgroup>
 </informaltable>
@@ -1067,13 +1029,13 @@ The following key applies to this table.
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -1085,14 +1047,16 @@ The following key applies to this table.
   </tgroup>
 </informaltable>
 
+<para></para>
+
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry><acronym>XOM</acronym> Value</entry>
-      <entry>Key</entry>
+      <entry align='left'><acronym>XOM</acronym> Value</entry>
+      <entry align='left'>Key</entry>
     </row>
   </thead>
   <tbody>
@@ -1676,13 +1640,13 @@ The third column indicates how each of the <acronym>XOC</acronym> values is trea
 The following keys apply to this table.
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -1707,17 +1671,18 @@ The following keys apply to this table.
   </tgroup>
 </informaltable>
 
-<!-- .LP -->
+<para></para>
+
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <thead>
     <row>
-      <entry><acronym>XOC</acronym> Value</entry>
-      <entry>Alternative Interface</entry>
-      <entry>Key</entry>
+      <entry align='left'><acronym>XOC</acronym> Value</entry>
+      <entry align='left'>Alternative Interface</entry>
+      <entry align='left'>Key</entry>
     </row>
   </thead>
   <tbody>
@@ -5037,7 +5002,7 @@ To support management of input methods in these cases, the following
 functions are provided:
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -5779,13 +5744,13 @@ are treated by that input style.
 The following keys apply to this table.
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -5808,15 +5773,16 @@ The following keys apply to this table.
   </tgroup>
 </informaltable>
 
-<!-- .LP -->
+<para></para>
+
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry><acronym>XIM</acronym> Value</entry>
-      <entry>Key</entry>
+      <entry align='left'><acronym>XIM</acronym> Value</entry>
+      <entry align='left'>Key</entry>
     </row>
   </thead>
   <tbody>
@@ -5965,7 +5931,7 @@ by the input method for preedit information.
 <indexterm significance="preferred"><primary>XIMPreeditNothing</primary></indexterm>
 <indexterm significance="preferred"><primary>XIMPreeditNone</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -6023,7 +5989,7 @@ by the input method for status information.
 <indexterm significance="preferred"><primary>XIMStatusNothing</primary></indexterm>
 <indexterm significance="preferred"><primary>XIMStatusNone</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -6866,13 +6832,13 @@ are treated by that input style.
 The following keys apply to these tables.
 </para>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <thead>
     <row>
-      <entry>Key</entry>
-      <entry>Explanation</entry>
+      <entry align='left'>Key</entry>
+      <entry align='left'>Explanation</entry>
     </row>
   </thead>
   <tbody>
@@ -6926,9 +6892,11 @@ The following keys apply to these tables.
   </tgroup>
 </informaltable>
 
+<para></para>
+
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='7' align='center'>
+  <tgroup cols='7'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -6936,7 +6904,7 @@ The following keys apply to these tables.
   <colspec colname='c5'/>
   <colspec colname='c6'/>
   <colspec colname='c7'/>
-  <tbody>
+  <thead>
     <row>
       <entry><acronym>XIC</acronym> Value</entry>
       <entry>Geometry Mangement</entry>
@@ -6946,6 +6914,8 @@ The following keys apply to these tables.
       <entry>Preedit Nothing</entry>
       <entry>Preedit None</entry>
     </row>
+    </thead>
+  <tbody>
     <row>
       <entry>Input Style</entry>
       <entry></entry>
@@ -7187,9 +7157,11 @@ The following keys apply to these tables.
   </tgroup>
 </informaltable>
 
+<para></para>
+
 <!-- .LP -->
 <informaltable>
-  <tgroup cols='6' align='center'>
+  <tgroup cols='6'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -7844,7 +7816,7 @@ is ignored when evaluating whether the key is hot or not.
 </para>
 
 <informaltable>
-  <tgroup cols='3' align='center'>
+  <tgroup cols='3'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
@@ -8411,7 +8383,7 @@ The set of preedit callbacks is as follows:
 <indexterm significance="preferred"><primary>XNPreeditDrawCallback</primary></indexterm>
 <indexterm significance="preferred"><primary>XNPreeditCaretCallback</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -8447,7 +8419,7 @@ The set of status callbacks is as follows:
 <indexterm significance="preferred"><primary>XNStatusDoneCallback</primary></indexterm>
 <indexterm significance="preferred"><primary>XNStatusDrawCallback</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -9549,7 +9521,7 @@ These values are defined as follows:
 <indexterm significance="preferred"><primary>XIMCaretUp</primary></indexterm>
 <indexterm significance="preferred"><primary>XIMCaretDown</primary></indexterm>
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
@@ -10133,7 +10105,7 @@ The possible values returned are:
 </para>
 
 <informaltable>
-  <tgroup cols='2' align='center'>
+  <tgroup cols='2'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <tbody>
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index 4bfa96cb..20693eb1 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -31,17 +31,17 @@ managers are:
 </para>
 
 <informaltable>
-  <tgroup cols='4' align='center'>
+  <tgroup cols='4'>
   <colspec colname='c1'/>
   <colspec colname='c2'/>
   <colspec colname='c3'/>
   <colspec colname='c4'/>
   <thead>
     <row>
-      <entry>Name</entry>
-      <entry>Type</entry>
-      <entry>Format</entry>
-      <entry>Description</entry>
+      <entry align='center'>Name</entry>
+      <entry align='center'>Type</entry>
+      <entry align='center'>Format</entry>
+      <entry align='center'>Description</entry>
     </row>
   </thead>
   <tbody>