When text blocks aren't used, the 'x' column modifier (a DWB 3.3 and GNU
tbl extension) is unnecessary because the table is set as wide as its
entries require--and will happily overset the line (though GNU tbl
embeds troff warnings that issue at formatting time if this happens).

But when text blocks _are_ used, we want traditional tbl implementations
to use a reasonable size for the columns containing them.  Use the 'w'
column modifier to specify an explicit width that works with a line
length of 65n, the AT&T nroff default (also that of Plan 9, DWB 3.3,
Solaris 10 [and presumably all System V nroffs], and consequently the
minimum length one can expect with today's more flexible formatters
(which actually use 78-80n, but all of which support 'x' anyway).

The 'x' modifier overrides a preceding 'w' modifier applicable to the
same column.

GNU tbl(1):
   Column modifiers
     Any number of modifiers can follow a column classifier.  Modifier
     arguments, where accepted, are case‐sensitive.  If a given modifier
     is applied to a classifier more than once, or if conflicting
     modifiers are applied, only the last occurrence has effect.  The
     modifier x is mutually exclusive with e and w, but e is not
     mutually exclusive with w; if these are used in combination,
     x unsets both e and w, while either e or w overrides x.

Heirloom Doctools tbl and mandoc(1) behave compatibly.

* include/Caps:
* include/Caps.aix4:
* include/Caps.hpux11:
* include/Caps.keys:
* include/Caps.osf1r5:
* include/Caps.uwin:
* man/curs_add_wch.3x:
* man/curs_getch.3x:
* man/curs_mouse.3x:
* man/curs_terminfo.3x:
* man/curs_util.3x:
* man/toe.1m: Do it.
---
 include/Caps         | 22 +++++++++++-----------
 include/Caps.aix4    | 22 +++++++++++-----------
 include/Caps.hpux11  | 22 +++++++++++-----------
 include/Caps.keys    | 22 +++++++++++-----------
 include/Caps.osf1r5  | 16 ++++++++--------
 include/Caps.uwin    | 14 +++++++-------
 man/curs_add_wch.3x  |  6 +++---
 man/curs_getch.3x    |  2 +-
 man/curs_mouse.3x    |  4 ++--
 man/curs_terminfo.3x |  4 ++--
 man/curs_util.3x     |  2 +-
 man/toe.1m           |  6 +++---
 12 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/include/Caps b/include/Caps
index 40c12f440..e98909e72 100644
--- a/include/Caps
+++ b/include/Caps
@@ -251,7 +251,7 @@
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Boolean Capability Name      TI      TC      Description
 #%_
@@ -299,7 +299,7 @@ lpi_changes_res                     lpix    bool    YG      
-       -       -----   changing line pitch changes resolution
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -335,7 +335,7 @@ no_color_video                      ncv     num     NC      
-       -       -----   video attributes that cannot be used with
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -363,7 +363,7 @@ bit_image_type                      bitype  num     Yp      
-       -       -----   type of bit-image device
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -432,7 +432,7 @@ key_down                    kcud1   str     kd      
KEY_DOWN        0402    YBCGE   down-arrow key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_eic                                krmir   str     kM      KEY_EIC         
0514    -B-G-*  sent by rmir or smir in insert mode
 key_eol                                kel     str     kE      KEY_EOL         
0517    -B-G-*  clear-to-end-of-line key
 key_eos                                ked     str     kS      KEY_EOS         
0516    -B-G-*  clear-to-end-of-screen key
@@ -498,7 +498,7 @@ reset_2string                       rs2     str     r2      
-               -       -B---   reset string
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 reset_3string                  rs3     str     r3      -               -       
-B---   reset string
 reset_file                     rf      str     rf      -               -       
-B---   name of reset file
 restore_cursor                 rc      str     rc      -               -       
YBCG-   restore cursor to position of last save_cursor
@@ -568,7 +568,7 @@ key_undo                    kund    str     &8      
KEY_UNDO        0630    -----   undo key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_sbeg                       kBEG    str     &9      KEY_SBEG        0572    
-----   shifted begin key
 key_scancel                    kCAN    str     &0      KEY_SCANCEL     0573    
-----   shifted cancel key
 key_scommand                   kCMD    str     *1      KEY_SCOMMAND    0574    
-----   shifted command key
@@ -634,7 +634,7 @@ key_f42                             kf42    str     FW      
KEY_F(42)       -       ----E   F42 function key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_f43                                kf43    str     FX      KEY_F(43)       
-       ----E   F43 function key
 key_f44                                kf44    str     FY      KEY_F(44)       
-       ----E   F44 function key
 key_f45                                kf45    str     FZ      KEY_F(45)       
-       ----E   F45 function key
@@ -706,7 +706,7 @@ enter_doublewide_mode               swidm   str     ZF      
-               -       -----   Enter double-wide mode
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 enter_draft_quality            sdrfq   str     ZG      -               -       
-----   Enter draft-quality mode
 enter_italics_mode             sitm    str     ZH      -               -       
-----   Enter italic mode
 enter_leftward_mode            slm     str     ZI      -               -       
-----   Start leftward carriage motion
@@ -762,7 +762,7 @@ zero_motion                 zerom   str     Zx      -       
        -       -----   No motion for subsequent character
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -818,7 +818,7 @@ alt_scancode_esc            scesa   str     S8      -       
        -       -----   Alternate escape for scancode emulatio
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 1adb848e0..21587a8fd 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -246,7 +246,7 @@
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Boolean Capability Name      TI      TC      Description
 #%_
@@ -294,7 +294,7 @@ lpi_changes_res                     lpix    bool    YG      
-       -       -----   changing line pitch changes resolution
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -327,7 +327,7 @@ no_color_video                      ncv     num     NC      
-       -       -----   video attributes that cannot be used with
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -355,7 +355,7 @@ bit_image_type                      bitype  num     Yp      
-       -       -----   type of bit-image device
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -424,7 +424,7 @@ key_down                    kcud1   str     kd      
KEY_DOWN        0402    YBCGE   down-arrow key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_eic                                krmir   str     kM      KEY_EIC         
0514    -B-G-*  sent by rmir or smir in insert mode
 key_eol                                kel     str     kE      KEY_EOL         
0517    -B-G-*  clear-to-end-of-line key
 key_eos                                ked     str     kS      KEY_EOS         
0516    -B-G-*  clear-to-end-of-screen key
@@ -490,7 +490,7 @@ reset_2string                       rs2     str     r2      
-               -       -B---   reset string
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 reset_3string                  rs3     str     r3      -               -       
-B---   reset string
 reset_file                     rf      str     rf      -               -       
-B---   name of reset file
 restore_cursor                 rc      str     rc      -               -       
YBCG-   restore cursor to position of last save_cursor
@@ -642,7 +642,7 @@ key_f42                             kf42    str     FW      
KEY_F(42)       -       ----E   F42 function key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_f43                                kf43    str     FX      KEY_F(43)       
-       ----E   F43 function key
 key_f44                                kf44    str     FY      KEY_F(44)       
-       ----E   F44 function key
 key_f45                                kf45    str     FZ      KEY_F(45)       
-       ----E   F45 function key
@@ -719,7 +719,7 @@ key_undo                    kund    str     &8      
KEY_UNDO        0630    -----   undo key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_sbeg                       kBEG    str     &9      KEY_SBEG        0572    
-----   shifted begin key
 key_scancel                    kCAN    str     &0      KEY_SCANCEL     0573    
-----   shifted cancel key
 key_scommand                   kCMD    str     *1      KEY_SCOMMAND    0574    
-----   shifted command key
@@ -800,7 +800,7 @@ enter_doublewide_mode               swidm   str     ZF      
-               -       -----   Enter double-wide mode
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 enter_draft_quality            sdrfq   str     ZG      -               -       
-----   Enter draft-quality mode
 enter_italics_mode             sitm    str     ZH      -               -       
-----   Enter italic mode
 enter_leftward_mode            slm     str     ZI      -               -       
-----   Start leftward carriage motion
@@ -856,7 +856,7 @@ zero_motion                 zerom   str     Zx      -       
        -       -----   No motion for subsequent character
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -912,7 +912,7 @@ alt_scancode_esc            scesa   str     S8      -       
        -       -----   Alternate escape for scancode emulatio
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index 723556fa1..5bfbcb632 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -246,7 +246,7 @@
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Boolean Capability Name      TI      TC      Description
 #%_
@@ -295,7 +295,7 @@ lpi_changes_res                     lpix    bool    YG      
-       -       -----   changing line pitch changes resolution
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -329,7 +329,7 @@ no_color_video                      ncv     num     NC      
-       -       -----   video attributes that cannot be used with
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -357,7 +357,7 @@ bit_image_type                      bitype  num     Yp      
-       -       -----   type of bit-image device
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -426,7 +426,7 @@ key_down                    kcud1   str     kd      
KEY_DOWN        0402    YBCGE   down-arrow key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_eic                                krmir   str     kM      KEY_EIC         
0514    -B-G-*  sent by rmir or smir in insert mode
 key_eol                                kel     str     kE      KEY_EOL         
0517    -B-G-*  clear-to-end-of-line key
 key_eos                                ked     str     kS      KEY_EOS         
0516    -B-G-*  clear-to-end-of-screen key
@@ -492,7 +492,7 @@ reset_2string                       rs2     str     r2      
-               -       -B---   reset string
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 reset_3string                  rs3     str     r3      -               -       
-B---   reset string
 reset_file                     rf      str     rf      -               -       
-B---   name of reset file
 restore_cursor                 rc      str     rc      -               -       
YBCG-   restore cursor to position of last save_cursor
@@ -561,7 +561,7 @@ key_f42                             kf42    str     FW      
KEY_F(42)       -       ----E   F42 function key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_f43                                kf43    str     FX      KEY_F(43)       
-       ----E   F43 function key
 key_f44                                kf44    str     FY      KEY_F(44)       
-       ----E   F44 function key
 key_f45                                kf45    str     FZ      KEY_F(45)       
-       ----E   F45 function key
@@ -625,7 +625,7 @@ key_undo                    kund    str     &8      
KEY_UNDO        0630    -----   undo key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_sbeg                       kBEG    str     &9      KEY_SBEG        0572    
-----   shifted begin key
 key_scancel                    kCAN    str     &0      KEY_SCANCEL     0573    
-----   shifted cancel key
 key_scommand                   kCMD    str     *1      KEY_SCOMMAND    0574    
-----   shifted command key
@@ -706,7 +706,7 @@ enter_doublewide_mode               swidm   str     ZF      
-               -       -----   Enter double-wide mode
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 enter_draft_quality            sdrfq   str     ZG      -               -       
-----   Enter draft-quality mode
 enter_italics_mode             sitm    str     ZH      -               -       
-----   Enter italic mode
 enter_leftward_mode            slm     str     ZI      -               -       
-----   Start leftward carriage motion
@@ -762,7 +762,7 @@ zero_motion                 zerom   str     Zx      -       
        -       -----   No motion for subsequent character
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -820,7 +820,7 @@ alt_scancode_esc            scesa   str     S8      -       
        -       -----   Alternate escape for scancode emulatio
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
diff --git a/include/Caps.keys b/include/Caps.keys
index 6f8a84e34..0179f73a7 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -249,7 +249,7 @@
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Boolean Capability Name      TI      TC      Description
 #%_
@@ -297,7 +297,7 @@ lpi_changes_res                     lpix    bool    YG      
-       -       -----   changing line pitch changes resolution
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -330,7 +330,7 @@ no_color_video                      ncv     num     NC      
-       -       -----   video attributes that cannot be used with
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -358,7 +358,7 @@ bit_image_type                      bitype  num     Yp      
-       -       -----   type of bit-image device
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -427,7 +427,7 @@ key_down                    kcud1   str     kd      
KEY_DOWN        0402    YBCGE   down-arrow key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_eic                                krmir   str     kM      KEY_EIC         
0514    -B-G-*  sent by rmir or smir in insert mode
 key_eol                                kel     str     kE      KEY_EOL         
0517    -B-G-*  clear-to-end-of-line key
 key_eos                                ked     str     kS      KEY_EOS         
0516    -B-G-*  clear-to-end-of-screen key
@@ -493,7 +493,7 @@ reset_2string                       rs2     str     r2      
-               -       -B---   reset string
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 reset_3string                  rs3     str     r3      -               -       
-B---   reset string
 reset_file                     rf      str     rf      -               -       
-B---   name of reset file
 restore_cursor                 rc      str     rc      -               -       
YBCG-   restore cursor to position of last save_cursor
@@ -563,7 +563,7 @@ key_undo                    kund    str     &8      
KEY_UNDO        0630    -----   undo key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_sbeg                       kBEG    str     &9      KEY_SBEG        0572    
-----   shifted begin key
 key_scancel                    kCAN    str     &0      KEY_SCANCEL     0573    
-----   shifted cancel key
 key_scommand                   kCMD    str     *1      KEY_SCOMMAND    0574    
-----   shifted command key
@@ -629,7 +629,7 @@ key_f42                             kf42    str     FW      
KEY_F(42)       -       ----E   F42 function key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_f43                                kf43    str     FX      KEY_F(43)       
-       ----E   F43 function key
 key_f44                                kf44    str     FY      KEY_F(44)       
-       ----E   F44 function key
 key_f45                                kf45    str     FZ      KEY_F(45)       
-       ----E   F45 function key
@@ -789,7 +789,7 @@ enter_doublewide_mode               swidm   str     ZF      
-               -       -----   Enter double-wide mode
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 enter_draft_quality            sdrfq   str     ZG      -               -       
-----   Enter draft-quality mode
 enter_italics_mode             sitm    str     ZH      -               -       
-----   Enter italic mode
 enter_leftward_mode            slm     str     ZI      -               -       
-----   Start leftward carriage motion
@@ -845,7 +845,7 @@ zero_motion                 zerom   str     Zx      -       
        -       -----   No motion for subsequent character
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -901,7 +901,7 @@ alt_scancode_esc            scesa   str     S8      -       
        -       -----   Alternate escape for scancode emulatio
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index ece14aef2..95692bf3b 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -246,7 +246,7 @@
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Boolean Capability Name      TI      TC      Description
 #%_
@@ -294,7 +294,7 @@ semi_auto_right_margin              sam     bool    YE      
-       -       -----   printing in last column causes cr
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -338,7 +338,7 @@ wide_char_size                      widcs   num     Yn      
-       -       -----   character step size when in double wide
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -407,7 +407,7 @@ key_down                    kcud1   str     kd      
KEY_DOWN        0402    YBCGE   down-arrow key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_eic                                krmir   str     kM      KEY_EIC         
0514    -B-G-*  sent by rmir or smir in insert mode
 key_eol                                kel     str     kE      KEY_EOL         
0517    -B-G-*  clear-to-end-of-line key
 key_eos                                ked     str     kS      KEY_EOS         
0516    -B-G-*  clear-to-end-of-screen key
@@ -473,7 +473,7 @@ reset_2string                       rs2     str     r2      
-               -       -B---   reset string
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 reset_3string                  rs3     str     r3      -               -       
-B---   reset string
 reset_file                     rf      str     rf      -               -       
-B---   name of reset file
 restore_cursor                 rc      str     rc      -               -       
YBCG-   restore cursor to position of last save_cursor
@@ -632,7 +632,7 @@ enter_doublewide_mode               swidm   str     ZF      
-               -       -----   Enter double-wide mode
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 enter_draft_quality            sdrfq   str     ZG      -               -       
-----   Enter draft-quality mode
 enter_italics_mode             sitm    str     ZH      -               -       
-----   Enter italic mode
 enter_leftward_mode            slm     str     ZI      -               -       
-----   Start leftward carriage motion
@@ -682,7 +682,7 @@ key_f42                             kf42    str     FW      
KEY_F(42)       -       ----E   F42 function key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_f43                                kf43    str     FX      KEY_F(43)       
-       ----E   F43 function key
 key_f44                                kf44    str     FY      KEY_F(44)       
-       ----E   F44 function key
 key_f45                                kf45    str     FZ      KEY_F(45)       
-       ----E   F45 function key
@@ -724,7 +724,7 @@ key_save                    ksav    str     &6      
KEY_SAVE        0571    -----   save key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
+#%Lbw(25n)2 Lbw(8n)2 Lb2 Lw(17n)x.
 key_sbeg                       kBEG    str     &9      KEY_SBEG        0572    
-----   shifted begin key
 key_scancel                    kCAN    str     &0      KEY_SCANCEL     0573    
-----   shifted cancel key
 key_scommand                   kCMD    str     *1      KEY_SCOMMAND    0574    
-----   shifted command key
diff --git a/include/Caps.uwin b/include/Caps.uwin
index afaaa7f47..c85f43210 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -246,7 +246,7 @@
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Boolean Capability Name      TI      TC      Description
 #%_
@@ -287,7 +287,7 @@ hue_lightness_saturation    hls     bool    hl      -       
-       -----   terminal uses only HLS color nota
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%Numeric Capability Name      TI      TC      Description
 #%_
@@ -316,7 +316,7 @@ no_color_video                      ncv     num     NC      
-       -       -----   video attributes that cannot be used with
 #%center;
 #%Lb        Cb       S   Lb
 #%Lb        Lb       Lb  Lb
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 #%\&   Code    \&
 #%String Capability Name       TI      TC      Description
 #%_
@@ -385,7 +385,7 @@ key_down                    kcud1   str     kd      
KEY_DOWN        0402    YBCGE   down-arrow key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 key_eic                                krmir   str     kM      KEY_EIC         
0514    -B-G-*  sent by rmir or smir in insert mode
 key_eol                                kel     str     kE      KEY_EOL         
0517    -B-G-*  clear-to-end-of-line key
 key_eos                                ked     str     kS      KEY_EOS         
0516    -B-G-*  clear-to-end-of-screen key
@@ -451,7 +451,7 @@ reset_2string                       rs2     str     r2      
-               -       -B---   reset string
 #%.TE
 #%.TS
 #%center;
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 reset_3string                  rs3     str     r3      -               -       
-B---   reset string
 reset_file                     rf      str     rf      -               -       
-B---   name of reset file
 restore_cursor                 rc      str     rc      -               -       
YBCG-   restore cursor to position of last save_cursor
@@ -521,7 +521,7 @@ key_undo                    kund    str     &8      
KEY_UNDO        0630    -----   undo key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 key_sbeg                       kBEG    str     &9      KEY_SBEG        0572    
-----   shifted begin key
 key_scancel                    kCAN    str     &0      KEY_SCANCEL     0573    
-----   shifted cancel key
 key_scommand                   kCMD    str     *1      KEY_SCOMMAND    0574    
-----   shifted command key
@@ -587,7 +587,7 @@ key_f42                             kf42    str     FW      
KEY_F(42)       -       ----E   F42 function key
 #%.TE
 #%.TS
 #%center;
-#%Lbw(24n)2 Lbw(7n)2 Lb2 Lx.
+#%Lbw(24n)2 Lbw(7n)2 Lb2 Lw(17n)x.
 key_f43                                kf43    str     FX      KEY_F(43)       
-       ----E   F43 function key
 key_f44                                kf44    str     FY      KEY_F(44)       
-       ----E   F44 function key
 key_f45                                kf45    str     FZ      KEY_F(45)       
-       ----E   F45 function key
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 79d8bb2aa..992b37c7a 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -328,7 +328,7 @@ .SS "Forms-Drawing Characters"
 .TS
 Lb Lb Lb Lb Lb
 Lb Lb Lb Lb Lb
-Lb L  L  L  Lx.
+Lb L  L  L  Lw(15n)x.
 \&     Unicode ACS     acsc    \&
 Symbol Default Default char    Glyph Name
 _
@@ -406,7 +406,7 @@ .SS "Forms-Drawing Characters"
 .TS
 Lb Lb Lb Lb Lb
 Lb Lb Lb Lb Lb
-Lb L  L  L  Lx.
+Lb L  L  L  Lw(14n)x.
 \&     Unicode ASCII   acsc    \&
 ACS Name       Default Default Char    Glyph Name
 _
@@ -453,7 +453,7 @@ .SS "Forms-Drawing Characters"
 .TS
 Lb Lb Lb Lb Lb
 Lb Lb Lb Lb Lb
-Lb L  L  L  Lx.
+Lb L  L  L  Lw(14n)x.
 \&     Unicode ASCII   acsc    \&
 ACS Name       Default Default Char    Glyph Name
 _
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 98f9ad4b9..65a7b29cb 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -321,7 +321,7 @@ .SS "Key Codes"
 .\" get_wch(3X) or having that page cross reference this one?
 .TS
 Lb Lb
-Lb Lx.
+Lb Lw(36n)x.
 Symbol Key name
 =
 KEY_BREAK      Break key
diff --git a/man/curs_mouse.3x b/man/curs_mouse.3x
index a180d7769..4af33598e 100644
--- a/man/curs_mouse.3x
+++ b/man/curs_mouse.3x
@@ -173,7 +173,7 @@ .SS "Mouse Events"
 .PP
 .TS
 Lb Lb
-Lb Lx.
+Lb Lw(33n)x.
 Name   Description
 =
 BUTTON1_PRESSED        mouse button 1 down
@@ -601,7 +601,7 @@ .SH HISTORY
 .\" V1R1.0 C Curses" book, Chapter 17, pp. 179-186 (PDF 213-220).
 .RS 8
 .TS
-Lb Lb Lb Lx.
+Lb Lb Lb Lw(23n)x.
 buttons        btns    BT      T{
 Number of buttons on the mouse
 T}
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 6a5d02008..6dca13c18 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -1070,7 +1070,7 @@ .SH HISTORY
 .PP
 .TS
 Lb Lb
-LI Lx.
+Li Lw(47n)x.
 Function       Description
 _
 fixterm        restore terminal to \*(``in \fIcurses\fP\*('' state
@@ -1100,7 +1100,7 @@ .SH HISTORY
 .PP
 .TS
 Lb Lb
-LI Lx.
+Li Lw(48n)x.
 Function       Description
 _
 tgetent        look up \fItermcap\fP entry for given \fIname\fP
diff --git a/man/curs_util.3x b/man/curs_util.3x
index 71e82e8ea..487232902 100644
--- a/man/curs_util.3x
+++ b/man/curs_util.3x
@@ -258,7 +258,7 @@ .SS use_tioctl
 .IP
 .TS
 Lb Lb Lb
-Lb Lb Lx.
+Lb Lb Lw(29n)x.
 use_env        use_tioctl      Summary
 _
 TRUE   FALSE   T{
diff --git a/man/toe.1m b/man/toe.1m
index bca02e86b..7149aa398 100644
--- a/man/toe.1m
+++ b/man/toe.1m
@@ -171,7 +171,7 @@ .SH EXAMPLES
 .\" toe -a | grep -E '^(xterm|vt)'
 .ft \*(CW
 .TS
-L2 Lx.
+L2 Lw(32n)x.
 xterm\-color   generic color xterm
 xterm\-xfree86 xterm terminal emulator (XFree86)
 xterm\-vt220   xterm emulating vt220
@@ -201,13 +201,13 @@ .SH EXAMPLES
 .\" toe -as | grep -E '(^-+>|:.(xterm|vt))'
 .ft \*(CW
 .TS
-Lx.
+Lw(31n)x.
 \-\-> /etc/terminfo
 \-\-\-\-> /lib/terminfo
 \-\-\-\-\-\-> /usr/share/terminfo
 .TE
 .TS
-L1 L2 Lx.
+L1 L2 Lw(31n)x.
 \-\-*\-\-\-:   vt100   dec vt100 (w/advanced video)
 \-\-*\-\-\-:   vt102   dec vt102
 \-\-*\-\-\-:   vt220   dec vt220
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature

Reply via email to