Merge remote-tracking branch 'origin/released'

1 files changed, 91 insertions, 83 deletions

diff --git a/libX11/specs/XKB/ch09.xml b/libX11/specs/XKB/ch09.xml
index 9a6bc9b73..3f14eed68 100644
--- a/libX11/specs/XKB/ch09.xml
+++ b/libX11/specs/XKB/ch09.xml
@@ -115,75 +115,76 @@ XkbBellNotify</emphasis>
  events.
 </para>
 
-<table frame='none'>
+<table frame='topbot'>
 <title>Predefined Bells</title>
-<tgroup cols='2'>
-<colspec colsep='0'/>
-<colspec colsep='0'/>
+<?dbfo keep-together="always" ?>
+<tgroup cols='2' align='left' colsep='0' rowsep='0'>
+<colspec colname='c1' colwidth='1.0*'/>
+<colspec colname='c2' colwidth='1.0*'/>
 <thead>
-<row rowsep='0'>
+<row rowsep='1'>
   <entry>Action</entry>
   <entry>Named Bell</entry>
 </row>
 </thead>
 <tbody>
-<row rowsep='0'>
+<row>
     <entry>Indicator turned on</entry>
     <entry>AX_IndicatorOn</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>Indicator turned off</entry>
     <entry>AX_IndicatorOff</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>More than one indicator changed state</entry>
     <entry>AX_IndicatorChange</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>Control turned on</entry>
     <entry>AX_FeatureOn</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>Control turned off</entry>
     <entry>AX_FeatureOff</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>More than one control changed state</entry>
     <entry>AX_FeatureChange</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>SlowKeys and BounceKeys about to be turned on or off</entry>
     <entry>AX_SlowKeysWarning</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>SlowKeys key pressed</entry>
     <entry>AX_SlowKeyPress</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>SlowKeys key accepted</entry>
     <entry>AX_SlowKeyAccept</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>SlowKeys key rejected</entry>
     <entry>AX_SlowKeyReject</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>Accepted SlowKeys key released</entry>
     <entry>AX_SlowKeyRelease</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>BounceKeys key rejected</entry>
     <entry>AX_BounceKeyReject</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>StickyKeys key latched</entry>
     <entry>AX_StickyLatch</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>StickyKeys key locked</entry>
     <entry>AX_StickyLock</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>StickyKeys key unlocked</entry>
     <entry>AX_StickyUnlock</entry>
   </row>
@@ -266,15 +267,16 @@ XkbBellNotifyEvent</emphasis>
  to be generated when a bell function is called.
 </para>
 
-<table frame='none'>
+<table frame='topbot'>
 <title>Bell Sounding and Bell Event Generating</title>
-<tgroup cols='4'>
-<colspec colsep='0'/>
-<colspec colsep='0'/>
-<colspec colsep='0'/>
-<colspec colsep='0'/>
+<?dbfo keep-together="always" ?>
+<tgroup cols='4' align='left' colsep='0' rowsep='0'>
+<colspec colname='c1' colwidth='1.0*'/>
+<colspec colname='c2' colwidth='1.0*'/>
+<colspec colname='c3' colwidth='1.0*'/>
+<colspec colname='c4' colwidth='1.0*'/>
 <thead>
-  <row rowsep='0'>
+  <row rowsep='1'>
     <entry>Function called</entry>
     <entry>AudibleBell</entry>
     <entry>Server sounds a bell</entry>
@@ -282,49 +284,49 @@ XkbBellNotifyEvent</emphasis>
   </row>
 </thead>
 <tbody>
-<row rowsep='0'>
+<row>
     <entry>XkbDeviceBell</entry>
     <entry>On</entry>
     <entry>Yes</entry>
     <entry>Yes</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbDeviceBell</entry>
     <entry>Off</entry>
     <entry>No</entry>
     <entry>Yes</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbBell</entry>
     <entry>On</entry>
     <entry>Yes</entry>
     <entry>Yes</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbBell</entry>
     <entry>Off</entry>
     <entry>No</entry>
     <entry>Yes</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbDeviceBellEvent</entry>
     <entry>On or Off</entry>
     <entry>No</entry>
     <entry>Yes</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbBellEvent</entry>
     <entry>On or Off</entry>
     <entry>No</entry>
     <entry>Yes</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbDeviceForceBell</entry>
     <entry>On or Off</entry>
     <entry>Yes</entry>
     <entry>No</entry>
 </row>
-<row rowsep='0'>
+<row>
     <entry>XkbForceBell</entry>
     <entry>On or Off</entry>
     <entry>Yes</entry>
@@ -344,10 +346,11 @@ XkbDeviceBell.</emphasis>
 </para>
 
 <informaltable frame='none'>
-<tgroup cols='1'>
-<colspec 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 role='functiondecl'>
 Bool <emphasis>
 XkbDeviceBell</emphasis>
@@ -356,21 +359,21 @@ display, window, device_id, bell_class, bell_id, percent, name</emphasis>
 )
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Display *<emphasis>
       display</emphasis>
 ;            /* connection to the X server */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Window<emphasis>
       window</emphasis>
 ;            /* window for which the bell is generated, or None */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 device_spec</emphasis>
@@ -379,28 +382,28 @@ XkbUseCoreKbd</emphasis>
  */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 bell_class</emphasis>
 ;            /* X input extension bell class of the bell to be rung */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 bell_id</emphasis>
 ;            /* X input extension bell ID of the bell to be rung */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 int      <emphasis>
 percent</emphasis>
 ;            /* bell volume, from -100 to 100 inclusive */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Atom      <emphasis>
 name</emphasis>
@@ -469,10 +472,11 @@ XkbBell.</emphasis>
 </para>
 
 <informaltable frame='none'>
-<tgroup cols='1'>
-<colspec 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 role='functiondecl'>
 Bool <emphasis>
 XkbBell</emphasis>
@@ -481,28 +485,28 @@ display, window, percent, name</emphasis>
 )
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Display *      <emphasis>
 display</emphasis>
 ;            /* connection to the X server */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Window<emphasis>
       window</emphasis>
 ;            /* event window, or None*/
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 int<emphasis>
       percent</emphasis>
 ;            /* relative volume, which can range from -100 to 100 inclusive */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Atom<emphasis>
       name</emphasis>
@@ -589,10 +593,11 @@ XkbDeviceBellEvent.</emphasis>
 </para>
 
 <informaltable frame='none'>
-<tgroup cols='1'>
-<colspec 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 role='functiondecl'>
 Bool <emphasis>
 XkbDeviceBellEvent</emphasis>
@@ -601,21 +606,21 @@ display, window, device_spec, bell_class, bell_id, percent, name</emphasis>
 )
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Display *      <emphasis>
 display</emphasis>
 ;      /* connection to the X server */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Window      <emphasis>
 window</emphasis>
 ;      /* event window, or None*/
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 device_spec</emphasis>
@@ -624,28 +629,28 @@ XkbUseCoreKbd</emphasis>
  */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 bell_class;</emphasis>
       /* input extension bell class for the event */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 bell_id</emphasis>
 ;      /* input extension bell ID for the event */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 int      <emphasis>
 percent</emphasis>
 ;      /* volume for the bell, which can range from -100 to 100 inclusive */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Atom      <emphasis>
 name</emphasis>
@@ -697,10 +702,11 @@ XkbBellEvent.</emphasis>
 
 
 <informaltable frame='none'>
-<tgroup cols='1'>
-<colspec 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 role='functiondecl'>
 Bool <emphasis>
 XkbBellEvent</emphasis>
@@ -709,28 +715,28 @@ display, window, percent, name</emphasis>
 )
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Display *      <emphasis>
 display</emphasis>
 ;            /* connection to the X server */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Window      <emphasis>
 window</emphasis>
 ;            /* the event window, or None */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 int      <emphasis>
 percent</emphasis>
 ;            /* relative volume, which can range from -100 to 100 inclusive */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Atom      <emphasis>
 name</emphasis>
@@ -796,10 +802,11 @@ audible bells, use <emphasis>XkbForceDeviceBell</emphasis>.
 </para>
 
 <informaltable frame='none'>
-<tgroup cols='1'>
-<colspec 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 role='functiondecl'>
 Bool <emphasis>
 XkbForceDeviceBell</emphasis>
@@ -808,21 +815,21 @@ display, window, device_spec, bell_class, bell_id, percent</emphasis>
 )
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Display *      <emphasis>
 display</emphasis>
 ;            /* connection to the X server */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Window      <emphasis>
 window</emphasis>
 ;            /* event window, or None */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 device_spec</emphasis>
@@ -831,21 +838,21 @@ XkbUseCoreKbd</emphasis>
  */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 bell_class</emphasis>
 ;            /* input extension class of the bell to be rung */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 unsigned int      <emphasis>
 bell_id</emphasis>
 ;            /* input extension ID of the bell to be rung */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 int      <emphasis>
 percent</emphasis>
@@ -893,10 +900,11 @@ XkbForceBell</emphasis>.
 </para>
 
 <informaltable frame='none'>
-<tgroup cols='1'>
-<colspec 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 role='functiondecl'>
 Bool <emphasis>
 XkbForceBell</emphasis>
@@ -904,14 +912,14 @@ XkbForceBell</emphasis>
 display, percent)</emphasis>
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 Display *      <emphasis>
 display</emphasis>
 ;      /* connection to the X server */
     </entry>
   </row>
-  <row rowsep='0'>
+  <row>
     <entry role='functionargdecl'>
 int      <emphasis>
 percent</emphasis>