Merge remote-tracking branch 'origin/released'

3 files changed, 373 insertions, 350 deletions

diff --git a/libX11/specs/i18n/framework/framework.xml b/libX11/specs/i18n/framework/framework.xml
index 79688e712..632430181 100644
--- a/libX11/specs/i18n/framework/framework.xml
+++ b/libX11/specs/i18n/framework/framework.xml
@@ -350,50 +350,51 @@ The following values are defined as standard arguments. Other values
 are implementation dependent.
 </para>
 
-<informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="3*" colsep="0"/>
+<informaltable frame="topbot">
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth="3.0*"/>
+  <colspec colname='c2' colwidth="1.0*"/>
+  <colspec colname='c3' colwidth="3.0*"/>
   <thead>
-    <row>
+    <row rowsep='1'>
       <entry>Name</entry>
       <entry>Type</entry>
       <entry>Description</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>XlcNCodeset</entry>
       <entry>char*</entry>
       <entry>codeset part of locale name</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNDefaultString</entry>
       <entry>char*</entry>
       <entry>XDefaultString()</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNEncodingName</entry>
       <entry>char*</entry>
       <entry>encoding name</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNLanguage</entry>
       <entry>char*</entry>
       <entry>language part of locale name</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNMbCurMax</entry>
       <entry>int</entry>
       <entry>ANSI C MB_CUR_MAX</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNStateDependentEncoding</entry>
       <entry>Bool</entry>
       <entry>is state-dependent encoding or not</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNTerritory</entry>
       <entry>char*</entry>
       <entry>territory part of locale name</entry>
@@ -465,130 +466,131 @@ returns NULL, if no XlcCharSet bound to specified "<emphasis remap='I'>name</emp
 The following character sets are pre-registered.
 </para>
 
-<informaltable frame="none">
-  <tgroup cols='2' align='left'>
-  <colspec colname='c1' colwidth="1*" colsep="0"/>
-  <colspec colname='c2' colwidth="2*" colsep="0"/>
+<informaltable frame="topbot">
+  <?dbfo keep-together="auto" ?>
+  <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth="1.0*"/>
+  <colspec colname='c2' colwidth="2.0*"/>
   <thead>
-    <row>
+    <row rowsep='1'>
       <entry>Name</entry>
       <entry>Description</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-1:GL</entry>
       <entry>7-bit ASCII graphics (ANSI X3.4-1968),</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>Left half of ISO 8859 sets</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>JISX0201.1976-0:GL</entry>
       <entry>Left half of JIS X0201-1976 (reaffirmed 1984),</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>8-Bit Alphanumeric-Katakana Code</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-1:GR</entry>
       <entry>Right half of ISO 8859-1, Latin alphabet No. 1</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-2:GR</entry>
       <entry>Right half of ISO 8859-2, Latin alphabet No. 2</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-3:GR</entry>
       <entry>Right half of ISO 8859-3, Latin alphabet No. 3</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-4:GR</entry>
       <entry>Right half of ISO 8859-4, Latin alphabet No. 4</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-7:GR</entry>
       <entry>Right half of ISO 8859-7, Latin/Greek alphabet</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-6:GR</entry>
       <entry>Right half of ISO 8859-6, Latin/Arabic alphabet</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-8:GR</entry>
       <entry>Right half of ISO 8859-8, Latin/Hebrew alphabet</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-5:GR</entry>
       <entry>Right half of ISO 8859-5, Latin/Cyrillic alphabet</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ISO8859-9:GR</entry>
       <entry>Right half of ISO 8859-9, Latin alphabet No. 5</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>JISX0201.1976-0:GR</entry>
       <entry>Right half of JIS X0201-1976 (reaffirmed 1984),</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>8-Bit Alphanumeric-Katakana Code</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>GB2312.1980-0:GL</entry>
       <entry>GB2312-1980, China (PRC) Hanzi defined as GL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>GB2312.1980-0:GR</entry>
       <entry>GB2312-1980, China (PRC) Hanzi defined as GR</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>JISX0208.1983-0:GL</entry>
       <entry>JIS X0208-1983, Japanese Graphic Character Set</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>defined as GL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>JISX0208.1983-0:GR</entry>
       <entry>JIS X0208-1983, Japanese Graphic Character Set</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>defined as GR</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>KSC5601.1987-0:GL</entry>
       <entry>KS C5601-1987, Korean Graphic Character Set</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>defined as GL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>KSC5601.1987-0:GR</entry>
       <entry>KS C5601-1987, Korean Graphic Character Set</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>defined as GR</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>JISX0212.1990-0:GL</entry>
       <entry>JIS X0212-1990, Japanese Graphic Character Set</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>defined as GL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>JISX0212.1990-0:GR</entry>
       <entry>JIS X0212-1990, Japanese Graphic Character Set</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>defined as GR</entry>
     </row>
@@ -636,45 +638,46 @@ be obtained.  The following values are defined as standard arguments.
 Other values are implementation dependent.
 </para>
 
-<informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="3*" colsep="0"/>
+<informaltable frame="topbot">
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth="2.0*"/>
+  <colspec colname='c2' colwidth="1.0*"/>
+  <colspec colname='c3' colwidth="3.0*"/>
   <thead>
-    <row>
+    <row rowsep='1'>
       <entry>Name</entry>
       <entry>Type</entry>
       <entry>Description</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>XlcNName</entry>
       <entry>char*</entry>
       <entry>charset name</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNEncodingName</entry>
       <entry>char*</entry>
       <entry>XLFD CharSet Registry and Encoding</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNSide</entry>
       <entry>XlcSide</entry>
       <entry>charset side (GL, GR, ...)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNCharSize</entry>
       <entry>int</entry>
       <entry>number of octets per character</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNSetSize</entry>
       <entry>int</entry>
       <entry>number of character sets</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNControlSequence</entry>
       <entry>char*</entry>
       <entry>control sequence of Compound Text</entry>
@@ -750,14 +753,15 @@ The following types are pre-defined. Other types are implementation
 dependent.
 </para>
 
-<informaltable>
-  <tgroup cols='4' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="3*" colsep="0"/>
-  <colspec colname='c4' colwidth="2*" colsep="0"/>
+<informaltable frame="topbot">
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='4' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth="2.0*"/>
+  <colspec colname='c2' colwidth="1.0*"/>
+  <colspec colname='c3' colwidth="2.0*"/>
+  <colspec colname='c4' colwidth="3.0*"/>
   <thead>
-    <row>
+    <row rowsep='1'>
       <entry>Name</entry>
       <entry>Type</entry>
       <entry>Description</entry>
@@ -765,37 +769,37 @@ dependent.
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>XlcNMultiByte</entry>
       <entry>char *</entry>
       <entry>multibyte</entry>
       <entry>-</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNWideChar</entry>
       <entry>wchar_t *</entry>
       <entry>wide character</entry>
       <entry>-</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNCompoundText</entry>
       <entry>char *</entry>
       <entry>COMPOUND_TEXT</entry>
       <entry>-</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNString</entry>
       <entry>char *</entry>
       <entry>STRING</entry>
       <entry>-</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNCharSet</entry>
       <entry>char *</entry>
       <entry>per charset</entry>
       <entry>XlcCharSet</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNChar</entry>
       <entry>char *</entry>
       <entry>per character</entry>
@@ -863,25 +867,26 @@ The following 2 converters prepared by locale returns appropriate
 charset (XlcCharSet) in an area pointed by args[0].
 </para>
 
-<informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="1*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="2*" colsep="0"/>
+<informaltable frame="topbot">
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth="1.0*"/>
+  <colspec colname='c2' colwidth="1.0*"/>
+  <colspec colname='c3' colwidth="2.0*"/>
   <thead>
-    <row>
+    <row rowsep='1'>
       <entry>From</entry>
       <entry>To</entry>
       <entry>Description</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>XlcNMultiByte</entry>
       <entry>XlcNCharSet</entry>
       <entry>Segmentation (Decomposing)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XlcNWideChar</entry>
       <entry>XlcNCharSet</entry>
       <entry>Segmentation (Decomposing)</entry>
diff --git a/libX11/specs/i18n/localedb/localedb.xml b/libX11/specs/i18n/localedb/localedb.xml
index c08516125..caacd82d5 100644
--- a/libX11/specs/i18n/localedb/localedb.xml
+++ b/libX11/specs/i18n/localedb/localedb.xml
@@ -155,127 +155,128 @@ The format of category definition is;
 </para>
 
 <informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="6*" colsep="0"/>
+  <?dbfo keep-together="auto" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth='3.0*'/>
+  <colspec colname='c2' colwidth='1.0*'/>
+  <colspec colname='c3' colwidth='6.0*'/>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>CategoryDefinition</entry>
       <entry>::=</entry>
       <entry>CategoryHeader CategorySpec CategoryTrailer</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>CategoryHeader</entry>
       <entry>::=</entry>
       <entry>CategoryName NL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>CategorySpec</entry>
       <entry>::=</entry>
       <entry>{ ClassSpec }</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>CategoryTrailer</entry>
       <entry>::=</entry>
       <entry>"END" Delimiter CategoryName NL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>CategoryName</entry>
       <entry>::=</entry>
       <entry>String</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ClassSpec</entry>
       <entry>::=</entry>
       <entry>ClassName Delimiter ClassValue NL</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ClassName</entry>
       <entry>::=</entry>
       <entry>String</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ClassValue</entry>
       <entry>::=</entry>
       <entry>ValueList | "{" NL { ClassSpec } "}"</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ValueList</entry>
       <entry>::=</entry>
       <entry>Value | Value ";" ValueList</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Value</entry>
       <entry>::=</entry>
       <entry>ValuePiece | ValuePiece Value</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ValuePiece</entry>
       <entry>::=</entry>
       <entry>String | QuotedString | NumericString</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>String</entry>
       <entry>::=</entry>
       <entry>Char { Char }</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>QuotedString</entry>
       <entry>::=</entry>
       <entry>""" QuotedChar { QuotedChar } """</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>NumericString</entry>
       <entry>::=</entry>
       <entry>"\\o" OctDigit { OctDigit }</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>|</entry>
       <entry>"\\d" DecDigit { DecDigit }</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>|</entry>
       <entry>"\\x" HexDigit { HexDigit }</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Char</entry>
       <entry>::=</entry>
       <entry>&lt;XPCS except NL, Space or unescaped reserved symbols&gt;</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>QuotedChar</entry>
       <entry>::=</entry>
       <entry>&lt;XPCS except unescaped """&gt;</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>OctDigit</entry>
       <entry>::=</entry>
       <entry>&lt;character in the range of "0" - "7"&gt;</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>DecDigit</entry>
       <entry>::=</entry>
       <entry>&lt;character in the range of "0" - "9"&gt;</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>HexDigit</entry>
       <entry>::=</entry>
       <entry>&lt;character in the range of "0" - "9", "a" - "f", "A" - "F"&gt;</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Delimiter</entry>
       <entry>::=</entry>
       <entry>Space { Space }</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Space</entry>
       <entry>::=</entry>
       <entry>&lt;space&gt; | &lt;horizontal tab&gt;</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>NL</entry>
       <entry>::=</entry>
       <entry>&lt;newline&gt;</entry>
@@ -317,14 +318,14 @@ In current sample implementation, categories listed below are available.
 </para>
 
 <informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="2*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth='1.0*'/>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>XLC_FONTSET:XFontSet relative information</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>XLC_XLOCALE:Character classification and conversion information</entry>
     </row>
   </tbody>
@@ -340,30 +341,31 @@ It contains the CHARSET_REGISTRY-CHARSET_ENCODING name and character
 mapping side (GL, GR, etc), and is used in Output Method (OM).
 </para>
 
-<informaltable frame="none">
-  <tgroup cols='3' align='left'>
+<informaltable frame="topbot">
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
   <thead>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="3*" colsep="0"/>
-    <row>
+  <colspec colname='c1' colwidth='3.0*'/>
+  <colspec colname='c2' colwidth='1.0*'/>
+  <colspec colname='c3' colwidth='3.0*'/>
+    <row rowsep='1'>
       <entry>class</entry>
       <entry>super class</entry>
       <entry>description</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>fsN</entry>
       <entry></entry>
       <entry>Nth fontset (N=0,1,2, ...)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>charset</entry>
       <entry>fsN</entry>
       <entry>list of encoding name</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>font</entry>
       <entry>fsN</entry>
       <entry>list of font encoding name</entry>
@@ -393,22 +395,23 @@ Specifies an encoding information to be used internally in Xlib
 for this fontset.  The format of value is;
       </para>
 <informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="4*" colsep="0"/>
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth='3.0*'/>
+  <colspec colname='c2' colwidth='1.0*'/>
+  <colspec colname='c3' colwidth='4.0*'/>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>EncodingInfo</entry>
       <entry>::=</entry>
       <entry>EncodingName [ ":" EncodingSide ]</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>EncodingName</entry>
       <entry>::=</entry>
       <entry>CHARSET_REGISTRY-CHARSET_ENCODING</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>EncodingSide</entry>
       <entry>::=</entry>
       <entry>"GL" | "GR"</entry>
@@ -447,70 +450,71 @@ The XLC_XLOCALE category defines character classification, conversion
 and other character attributes.
 </para>
 
-<informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="3*" colsep="0"/>
+<informaltable frame="topbot">
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth='3.0*'/>
+  <colspec colname='c2' colwidth='1.0*'/>
+  <colspec colname='c3' colwidth='3.0*'/>
   <thead>
-    <row>
+    <row rowsep='1'>
       <entry>class</entry>
       <entry>super class</entry>
       <entry>description</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>encoding_name</entry>
       <entry></entry>
       <entry>codeset name</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>mb_cur_max</entry>
       <entry></entry>
       <entry>MB_CUR_MAX</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>state_depend_encoding</entry>
       <entry></entry>
       <entry>state dependent or not</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>wc_encoding_mask</entry>
       <entry></entry>
       <entry>for parsing wc string</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>wc_shift_bits</entry>
       <entry></entry>
       <entry>for conversion between wc and mb</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>csN</entry>
       <entry></entry>
       <entry>Nth charset (N=0,1,2,...)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>side</entry>
       <entry>csN</entry>
       <entry>mapping side (GL, etc)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>length</entry>
       <entry>csN</entry>
       <entry>length of a character</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>mb_encoding</entry>
       <entry>csN</entry>
       <entry>for parsing mb string</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>wc_encoding</entry>
       <entry>csN</entry>
       <entry>for parsing wc string</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ct_encoding</entry>
       <entry>csN</entry>
       <entry>list of encoding name for ct</entry>
@@ -610,32 +614,33 @@ Specifies a list of shift sequence for parsing multi-byte string.
 The format of this value is;
       </para>
 <informaltable frame="none">
-  <tgroup cols='3' align='left'>
-  <colspec colname='c1' colwidth="3*" colsep="0"/>
-  <colspec colname='c2' colwidth="1*" colsep="0"/>
-  <colspec colname='c3' colwidth="5*" colsep="0"/>
+  <?dbfo keep-together="always" ?>
+  <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+  <colspec colname='c1' colwidth='3.0*'/>
+  <colspec colname='c2' colwidth='1.0*'/>
+  <colspec colname='c3' colwidth='5.0*'/>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>MBEncoding</entry>
       <entry>::=</entry>
       <entry>ShiftType ShiftSequence</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry></entry>
       <entry>|</entry>
       <entry>ShiftType ShiftSequence ";" MBEncoding</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ShiftType</entry>
       <entry>::=</entry>
       <entry>"&lt;SS&gt;"|"&lt;LSL&gt;"|"&lt;LSR&gt;"</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>ShiftSequence</entry>
       <entry>::=</entry>
       <entry>SequenceValue|SequenceValue ShiftSequence</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>SequenceValue</entry>
       <entry>::=</entry>
       <entry>NumericString</entry>
diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml
index afbc69403..68611ea34 100644
--- a/libX11/specs/i18n/trans/trans.xml
+++ b/libX11/specs/i18n/trans/trans.xml
@@ -152,15 +152,16 @@ typedef struct {
 </literallayout>
 
 <informaltable frame="none">
-  <tgroup cols="2">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="0"/>
+  <?dbfo keep-together="always" ?>
+  <tgroup cols="2" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*'/>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry><emphasis>transport_name</emphasis></entry>
       <entry>name of transport<footnote><para>Refer to "The Input Method Protocol: Appendix B</para></footnote></entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry><emphasis>config</emphasis></entry>
       <entry>initial configuration function</entry>
     </row>
@@ -276,16 +277,17 @@ Following functions are used for the transport interface.
 </para>
 
 <table frame="all" id="transport_layer_functions_2">
+  <?dbfo keep-together="always" ?>
   <title>The Transport Layer Functions</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="3*" colsep="1"/>
-  <colspec colname="col2" colwidth="3*" colsep="1"/>
-  <colspec colname="col3" colwidth="1*" colsep="1"/>
+  <tgroup cols="3" align='left' colsep='1' rowsep='1'>
+  <colspec colname="col1" colwidth="3.0*"/>
+  <colspec colname="col2" colwidth="3.0*"/>
+  <colspec colname="col3" colwidth='1.0*'/>
   <thead>
     <row>
-      <entry align="center">Alternate Entry (Interface Layer)</entry>
-      <entry align="center">XimProto member (Transport Layer)</entry>
-      <entry align="center">Section</entry>
+      <entry align='center'>Alternate Entry (Interface Layer)</entry>
+      <entry align='center'>XimProto member (Transport Layer)</entry>
+      <entry align='center'>Section</entry>
     </row>
   </thead>
   <tbody>
@@ -1105,66 +1107,67 @@ window of XIM_SERVER selection, which the IM Server has created.
 Refer to "The Input Method Protocol" for the XIM_SERVER atom.
 </para>
 
-<table frame="none" id="transport_layer_functions">
+<table frame="topbot" id="transport_layer_functions">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage sent to the IMS window.</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep='1'/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_CONNECT", false)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>32</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[0]</entry>
       <entry>client communication window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[1]</entry>
       <entry>client-major-transport-version(*1)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[2]</entry>
       <entry>client-major-transport-version(*1)</entry>
@@ -1179,71 +1182,72 @@ window), the IM Server sends a ClientMessage in the following event's
 format to the client communication window.
 </para>
 
-<table frame="none" id="clientmessage_sent_by_im_server">
+<table frame="topbot" id="clientmessage_sent_by_im_server">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage sent by IM Server.</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_CONNECT", false)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>32</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[0]</entry>
       <entry>client communication window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[1]</entry>
       <entry>client-major-transport-version(*1)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[2]</entry>
       <entry>client-major-transport-version(*1)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[3]</entry>
       <entry>dividing size between ClientMessage and Property(*2)</entry>
@@ -1262,11 +1266,12 @@ major/minor-transport-version, as follows:
 </para>
 
 <table frame="all" id="readwrite_method_and_the_majorminor_transport_version">
-<title>The read/write method and the major/minor-transport-version</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="1"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3*" colsep="1"/>
+  <?dbfo keep-together="always" ?>
+  <title>The read/write method and the major/minor-transport-version</title>
+  <tgroup cols="3" colsep='1' rowsep='1'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*'/>
+  <colspec colname="col3" colwidth="3.0*"/>
   <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="center"/>
   <thead>
     <row>
@@ -1280,25 +1285,25 @@ major/minor-transport-version, as follows:
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry morerows="2">0</entry>
       <entry>0</entry>
       <entry>only-CM &amp; Property-with-CM</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>1</entry>
       <entry>only-CM &amp; multi-CM</entry>
     </row>
-    <row rowsep="1">
+    <row>
       <entry>2</entry>
       <entry>only-CM &amp; multi-CM &amp; Property-with-CM</entry>
     </row>
-    <row rowsep="1">
+    <row>
       <entry>1</entry>
       <entry>0</entry>
       <entry>PropertyNotify</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry morerows="1">2</entry>
       <entry>0</entry>
       <entry>only-CM &amp; PropertyNotify</entry>
@@ -1380,56 +1385,57 @@ the X Window System.
 If data is sent via ClientMessage event, the format is as follows:
 </para>
 
-<table frame="none" id="clientmessage_events_format_first_or_middle">
+<table frame="topbot" id="clientmessage_events_format_first_or_middle">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage event's format (first or middle)</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_MOREDATA", False)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>char</entry>
       <entry>data.b[20]</entry>
       <entry>(read/write DATA : 20 byte)</entry>
@@ -1440,56 +1446,57 @@ If data is sent via ClientMessage event, the format is as follows:
 
 
 
-<table frame="none" id="clientmessage_events_format_only_or_last">
+<table frame="topbot" id="clientmessage_events_format_only_or_last">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage event's format (only or last)</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_PROTOCOL", False)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>char</entry>
       <entry>data.b[20]</entry>
       <entry>(read/write DATA : MAX 20 byte)
@@ -1534,51 +1541,52 @@ The arguments of the XChangeProperty are as follows:
 </para>
 
 
-<table frame="none" id="xchangeproperty_events_format">
+<table frame="topbot" id="xchangeproperty_events_format">
+  <?dbfo keep-together="always" ?>
   <title>The XChangeProperty event's format</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
   <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Argument</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Argument</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS communication window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>property</entry>
       <entry>read/write property Atom (*1)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>mode</entry>
       <entry>PropModeAppend</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_char</entry>
       <entry>*data</entry>
       <entry>read/write DATA</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>nelements</entry>
       <entry>length of DATA</entry>
@@ -1603,61 +1611,62 @@ If Atom is notified via ClientMessage event, the format of the ClientMessage
 is as follows:
 </para>
 
-<table frame="none" id="clientmessage_events_format_to_send_atom_of_property">
+<table frame="topbot" id="clientmessage_events_format_to_send_atom_of_property">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage event's format to send Atom of property</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_PROTOCOL", False)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[0]</entry>
       <entry>length of read/write property Atom</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[1]</entry>
       <entry>read/write property Atom</entry>
@@ -1677,56 +1686,57 @@ is as follows:
 The format of the ClientMessage is as follows:
 </para>
 
-<table frame="none" id="clientmessage_events_format_first_or_middle_2">
+<table frame="topbot" id="clientmessage_events_format_first_or_middle_2">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage event's format (first or middle)</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_MOREDATA", False)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>char</entry>
       <entry>data.b[20]</entry>
       <entry>(read/write DATA : 20 byte)</entry>
@@ -1739,56 +1749,57 @@ The format of the ClientMessage is as follows:
 
 
 
-<table frame="none" id="clientmessage_events_format_only_or_last_2">
+<table frame="topbot" id="clientmessage_events_format_only_or_last_2">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage event's format (only or last)</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_PROTOCOL", False)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>char</entry>
       <entry>data.b[20]</entry>
       <entry>(read/write DATA : MAX 20 byte) (*1)</entry>
@@ -1833,51 +1844,52 @@ PropertyNotify event.
 The arguments of the XChangeProperty are as follows:
 </para>
 
-<table frame="none" id="xchangeproperty_events_format_b">
+<table frame="topbot" id="xchangeproperty_events_format_b">
+  <?dbfo keep-together="always" ?>
   <title>The XChangeProperty event's format</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
   <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Argument</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Argument</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS communication window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>property</entry>
       <entry>read/write property Atom (*1)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>mode</entry>
       <entry>PropModeAppend</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_char</entry>
       <entry>*data</entry>
       <entry>read/write DATA</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>nelements</entry>
       <entry>length of DATA</entry>
@@ -1901,61 +1913,62 @@ If Atom is notified via ClientMessage event, the format of the ClientMessage
 is as follows:
 </para>
 
-<table frame="none" id="clientmessage_events_format_to_send_atom_of_property_2">
+<table frame="topbot" id="clientmessage_events_format_to_send_atom_of_property_2">
+  <?dbfo keep-together="always" ?>
   <title>The ClientMessage event's format to send Atom of property</title>
-  <tgroup cols="3">
-  <colspec colname="col1" colwidth="1*" colsep="0"/>
-  <colspec colname="col2" colwidth="1*" colsep="1"/>
-  <colspec colname="col3" colwidth="3.5*" colsep="0"/>
-  <spanspec namest="col1" nameend="col2" spanname="span-horiz" align="left"/>
+  <tgroup cols="3" align='left' colsep='0' rowsep='0'>
+  <colspec colname="col1" colwidth='1.0*'/>
+  <colspec colname="col2" colwidth='1.0*' colsep="1"/>
+  <colspec colname="col3" colwidth="3.5*"/>
+  <spanspec namest="col1" nameend="col2" spanname="span-horiz"/>
   <thead>
-    <row>
-      <entry align="left" spanname="span-horiz">Structure Member</entry>
-      <entry align="left">Contents</entry>
+    <row rowsep='1'>
+      <entry spanname="span-horiz" colsep='1'>Structure Member</entry>
+      <entry>Contents</entry>
     </row>
   </thead>
   <tbody>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>type</entry>
       <entry>ClientMessage</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>u_long</entry>
       <entry>serial</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Bool</entry>
       <entry>send_event</entry>
       <entry>Set by the X Window System</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Display</entry>
       <entry>*display</entry>
       <entry>The display to which connects</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Window</entry>
       <entry>window</entry>
       <entry>IMS Window ID</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>Atom</entry>
       <entry>message_type</entry>
       <entry>XInternAtom(display, "_XIM_PROTOCOL", False)</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>int</entry>
       <entry>format</entry>
       <entry>8</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[0]</entry>
       <entry>length of read/write property Atom</entry>
     </row>
-    <row rowsep="0">
+    <row>
       <entry>long</entry>
       <entry>data.1[1]</entry>
       <entry>read/write property Atom</entry>