[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 39/40] Revise terminfo capability tables.
|
From: |
G. Branden Robinson |
|
Subject: |
[PATCH 39/40] Revise terminfo capability tables. |
|
Date: |
Fri, 12 Jan 2024 14:05:57 -0600 |
* include/Caps:
* include/Caps.aix4:
* include/Caps.hpux11:
* include/Caps.keys:
* include/Caps.osf1r5:
* include/Caps.uwin:
+ Stop inserting blank lines into man(7) input. Use empty requests
instead.
+ Drop throat-clearing language like "These are the Boolean
capabilities:" before tables; the capability types are already
declared in column headings.
+ Stop bracketing tables with requests to manipulating adjustment.
This doesn't work as people expect; if a site's local man(7)
configuration turned off adjustment, the `ad` request at the end of
each table would turn it back on again. This reënablement of
adjustment also frustrates diffing of man page changes due to
changes in adjustment parity. See "MKterminfo.sh" below for the new
approach.
+ Drop "H" argument from `TS` tokens/macro calls. They are
meaningless in man(7).
+ Drop "expand" region option from tables. It makes "center"
pointless because it expands the gaps between columns until the
table reaches the line length.
+ Stop manually specifying column widths. Use `x` column modifier on
"Description" column instead. This and the previous change make the
tables format much better on wide terminals (and when typeset).
+ Use spanning and centering column classifiers to set the column
headings more attractively.
+ Abbreviate terminfo and termcap code columns as "TI" and "TC",
respectively, beneath a spanning "Code" heading. The latter in
particular buys precious space because termcap codes are only two
characters anyway.
+ Draw a horizontal rule under the table heading.
+ Stop indenting the hardcopy capability table.
+ Use paragraphing macros to manage space around tables.
+ Revise table data.
- Recast "keyboard_transmit" as ordinary prose.
- Recast "language/codeset" as a comma-separated list instead, to
add a fortuitous break point.
* man/MKterminfo.sh: Revise sed substitution to add an `.ad l` request
at the beginning of every text block generated in the capability
tables. Because the adjustment mode within a text block is discarded
by tbl(1), this works to left-align text blocks, permit them to break
(as desired by use of a text block in the first place), and doesn't
interfere with the alignment/adjustment of text outside the table.
---
include/Caps | 141 +++++++++++++++++++++-----------------------
include/Caps.aix4 | 135 ++++++++++++++++++++----------------------
include/Caps.hpux11 | 137 +++++++++++++++++++++---------------------
include/Caps.keys | 135 ++++++++++++++++++++----------------------
include/Caps.osf1r5 | 64 +++++++++-----------
include/Caps.uwin | 64 +++++++++-----------
man/MKterminfo.sh | 4 +-
7 files changed, 325 insertions(+), 355 deletions(-)
diff --git a/include/Caps b/include/Caps
index e21d59243..52bf75ed3 100644
--- a/include/Caps
+++ b/include/Caps
@@ -204,18 +204,16 @@
#%.TP
#%(#\d\fIi\fP\u)
#%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
#%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBBooleans name Code\fR
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Boolean Capability Name TI TC Description
+#%_
auto_left_margin bw bool bw - - YB-G-
cub1 wraps from column 0 to last column
auto_right_margin am bool am - - YBCGE
terminal has automatic margins
no_esc_ctlc xsb bool xb - - YBCG-
beehive (f1=escape, f2=ctrl C)
@@ -254,18 +252,16 @@ semi_auto_right_margin sam bool YE
- - ----- printing in last column causes cr
cpi_changes_res cpix bool YF - -
----- changing character pitch changes resolution
lpi_changes_res lpix bool YG - -
----- changing line pitch changes resolution
#%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
columns cols num co - -
YBCGE number of columns in a line
init_tabs it num it - - YB-G-
tabs initially every # spaces
lines lines num li - - YBCGE
number of lines on screen or page
@@ -284,20 +280,21 @@ max_colors colors num Co
- - ----- maximum number of colors on screen
max_pairs pairs num pa - - -----
maximum number of color-pairs on the screen
no_color_video ncv num NC - - -----
video attributes that cannot be used with colors
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following numeric capabilities are present in the SVr4.0 term structure,
#%but are not yet documented in the man page.
#%They came in with SVr4's printer support.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
buffer_capacity bufsz num Ya - -
----- numbers of bytes buffered before printing
dot_vert_spacing spinv num Yb - - -----
spacing of pins vertically in pins per inch
dot_horz_spacing spinh num Yc - - -----
spacing of dots horizontally in dots per inch
@@ -316,18 +313,16 @@ buttons btns num BT
- - ----- number of buttons on mouse
bit_image_entwining bitwin num Yo - - -----
number of passes for each bit-image row
bit_image_type bitype num Yp - - -----
type of bit-image device
#%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
back_tab cbt str bt - -
YBCGE back tab (P)
bell bel str bl - -
YB-GE audible signal (bell) (P)
carriage_return cr str cr -
- YBCGE carriage return (P*) (P*)
@@ -416,8 +411,8 @@ key_sf kind str kF
KEY_SF 0520 -B-G-* scroll-forward key
key_sr kri str kR KEY_SR 0521
-B-G-* scroll-backward key
key_stab khts str kT KEY_STAB 0524
-B-G-* set-tab key
key_up kcuu1 str ku KEY_UP 0403
YBCGE up-arrow key
-keypad_local rmkx str ke - -
YBCGE leave 'keyboard_transmit' mode
-keypad_xmit smkx str ks - -
YBCGE enter 'keyboard_transmit' mode
+keypad_local rmkx str ke - -
YBCGE leave keyboard transmit mode
+keypad_xmit smkx str ks - -
YBCGE enter keyboard transmit mode
lab_f0 lf0 str l0 - -
-B-G-* label on function key f0 if not f0
lab_f1 lf1 str l1 - -
-B-G-* label on function key f1 if not f1
lab_f10 lf10 str la -
- ----- label on function key f10 if not f10
@@ -693,19 +688,20 @@ superscript_characters supcs str Zv
- - ----- List of superscriptable characte
these_cause_cr docr str Zw - -
----- Printing any of these characters causes CR
zero_motion zerom str Zx - -
----- No motion for subsequent character
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following string capabilities are present in the SVr4.0 term structure,
#%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
char_set_names csnm str Zy - -
----- Produce #1'th item from list of character set names
key_mouse kmous str Km KEY_MOUSE 0631
----- Mouse event has occurred
mouse_info minfo str Mi - -
----- Mouse status information
@@ -714,7 +710,7 @@ get_mouse getm str Gm -
- ----- Curses should get button events, parameter #1
set_a_foreground setaf str AF - -
----- Set foreground color to #1, using ANSI escape
set_a_background setab str AB - -
----- Set background color to #1, using ANSI escape
pkey_plab pfxl str xl - -
----- Program function key #1 to type string #2 and show string #3
-device_type devt str dv - -
----- Indicate language/codeset support
+device_type devt str dv - -
----- Indicate language, codeset support
code_set_init csin str ci - -
----- Init sequence for multiple codesets
set0_des_seq s0ds str s0 - -
----- Shift to codeset 0 (EUC set 0, ASCII)
set1_des_seq s1ds str s1 - -
----- Shift to codeset 1
@@ -742,9 +738,8 @@ pc_term_options pctrm str S6
- - ----- PC terminal options
scancode_escape scesc str S7 -
- ----- Escape for scancode emulation
alt_scancode_esc scesa str S8 - -
----- Alternate escape for scancode emulation
#%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
#%The XSI Curses standard added these hardcopy capabilities.
#%They were used in some post-4.1 versions of System V curses,
#%e.g., Solaris 2.5 and IRIX 6.x.
@@ -753,15 +748,16 @@ alt_scancode_esc scesa str S8 -
- ----- Alternate escape for scancode emulatio
#%If your compiled terminfo entries use these,
#%they may not be binary-compatible with System V terminfo
#%entries after SVr4.1; beware!
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
enter_horizontal_hl_mode ehhlm str Xh - -
----- Enter horizontal highlight mode
enter_left_hl_mode elhlm str Xl - -
----- Enter left highlight mode
enter_low_hl_mode elohlm str Xo - -
----- Enter low highlight mode
@@ -771,7 +767,6 @@ enter_vertical_hl_mode evhlm str Xv
- - ----- Enter vertical highlight mode
set_a_attributes sgr1 str sA - -
----- Define second set of video attributes #1-#6
set_pglen_inch slength str YI - -
----- Set page length to #1 hundredth of an inch (some implementations use sL
for termcap).
#%.TE
-#%.ad
#
# The magic token below tells the tic compiler-generator code that all the caps
# past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.aix4 b/include/Caps.aix4
index 3b2389be3..ce19c7f11 100644
--- a/include/Caps.aix4
+++ b/include/Caps.aix4
@@ -204,18 +204,16 @@
#%.TP
#%(#\d\fIi\fP\u)
#%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
#%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBBooleans name Code\fR
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Boolean Capability Name TI TC Description
+#%_
auto_left_margin bw bool bw - - YB-G-
cub1 wraps from column 0 to last column
auto_right_margin am bool am - - YBCGE
terminal has automatic margins
no_esc_ctlc xsb bool xb - - YBCG-
beehive (f1=escape, f2=ctrl C)
@@ -254,18 +252,16 @@ semi_auto_right_margin sam bool YE
- - ----- printing in last column causes cr
cpi_changes_res cpix bool YF - -
----- changing character pitch changes resolution
lpi_changes_res lpix bool YG - -
----- changing line pitch changes resolution
#%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
columns cols num co - -
YBCGE number of columns in a line
init_tabs it num it - - YB-G-
tabs initially every # spaces
lines lines num li - - YBCGE
number of lines on screen or page
@@ -284,20 +280,21 @@ max_colors colors num Co
- - ----- maximum number of colors on screen
max_pairs pairs num pa - - -----
maximum number of color-pairs on the screen
no_color_video ncv num NC - - -----
video attributes that cannot be used with colors
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following numeric capabilities are present in the SVr4.0 term structure,
#%but are not yet documented in the man page.
#%They came in with SVr4's printer support.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
buffer_capacity bufsz num Ya - -
----- numbers of bytes buffered before printing
dot_vert_spacing spinv num Yb - - -----
spacing of pins vertically in pins per inch
dot_horz_spacing spinh num Yc - - -----
spacing of dots horizontally in dots per inch
@@ -316,18 +313,16 @@ buttons btns num BT
- - ----- number of buttons on mouse
bit_image_entwining bitwin num Yo - - -----
number of passes for each bit-image row
bit_image_type bitype num Yp - - -----
type of bit-image device
#%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
back_tab cbt str bt - -
YBCGE back tab (P)
bell bel str bl - -
YB-GE audible signal (bell) (P)
carriage_return cr str cr -
- YBCGE carriage return (P*) (P*)
@@ -795,19 +790,20 @@ superscript_characters supcs str Zv
- - ----- List of superscriptable characte
these_cause_cr docr str Zw - -
----- Printing any of these characters causes CR
zero_motion zerom str Zx - -
----- No motion for subsequent character
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following string capabilities are present in the SVr4.0 term structure,
#%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
char_set_names csnm str Zy - -
----- Produce #1'th item from list of character set names
key_mouse kmous str Km KEY_MOUSE 0631
----- Mouse event has occurred
mouse_info minfo str Mi - -
----- Mouse status information
@@ -844,9 +840,8 @@ pc_term_options pctrm str S6
- - ----- PC terminal options
scancode_escape scesc str S7 -
- ----- Escape for scancode emulation
alt_scancode_esc scesa str S8 - -
----- Alternate escape for scancode emulation
#%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
#%The XSI Curses standard added these hardcopy capabilities.
#%They were used in some post-4.1 versions of System V curses,
#%e.g., Solaris 2.5 and IRIX 6.x.
@@ -855,15 +850,16 @@ alt_scancode_esc scesa str S8 -
- ----- Alternate escape for scancode emulatio
#%If your compiled terminfo entries use these,
#%they may not be binary-compatible with System V terminfo
#%entries after SVr4.1; beware!
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
#enter_horizontal_hl_mode ehhlm str Xh - -
----- Enter horizontal highlight mode
#enter_left_hl_mode elhlm str Xl - -
----- Enter left highlight mode
#enter_low_hl_mode elohlm str Xo - -
----- Enter low highlight mode
@@ -873,7 +869,6 @@ alt_scancode_esc scesa str S8 -
- ----- Alternate escape for scancode emulatio
#set_a_attributes sgr1 str sA - -
----- Define second set of video attributes #1-#6
set_pglen_inch slength str YI - -
----- Set page length to #1 hundredth of an inch (some implementations use sL
for termcap).
#%.TE
-#%.ad
#
# The magic token below tells the tic compiler-generator code that all the caps
# past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.hpux11 b/include/Caps.hpux11
index f9633f4c5..0b42f02ad 100644
--- a/include/Caps.hpux11
+++ b/include/Caps.hpux11
@@ -204,18 +204,16 @@
#%.TP
#%(#\d\fIi\fP\u)
#%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
#%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBBooleans name Code\fR
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Boolean Capability Name TI TC Description
+#%_
auto_left_margin bw bool bw - - YB-G-
cub1 wraps from column 0 to last column
auto_right_margin am bool am - - YBCGE
terminal has automatic margins
no_esc_ctlc xsb bool xb - - YBCG-
beehive (f1=escape, f2=ctrl C)
@@ -255,18 +253,16 @@ semi_auto_right_margin sam bool YE
- - ----- printing in last column causes cr
cpi_changes_res cpix bool YF - -
----- changing character pitch changes resolution
lpi_changes_res lpix bool YG - -
----- changing line pitch changes resolution
#%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
columns cols num co - -
YBCGE number of columns in a line
init_tabs it num it - - YB-G-
tabs initially every # spaces
lines lines num li - - YBCGE
number of lines on screen or page
@@ -286,20 +282,21 @@ max_colors colors num Co
- - ----- maximum number of colors on screen
max_pairs pairs num pa - - -----
maximum number of color-pairs on the screen
no_color_video ncv num NC - - -----
video attributes that cannot be used with colors
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following numeric capabilities are present in the SVr4.0 term structure,
#%but are not yet documented in the man page.
#%They came in with SVr4's printer support.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
buffer_capacity bufsz num Ya - -
----- numbers of bytes buffered before printing
dot_vert_spacing spinv num Yb - - -----
spacing of pins vertically in pins per inch
dot_horz_spacing spinh num Yc - - -----
spacing of dots horizontally in dots per inch
@@ -318,18 +315,16 @@ buttons btns num BT
- - ----- number of buttons on mouse
bit_image_entwining bitwin num Yo - - -----
number of passes for each bit-image row
bit_image_type bitype num Yp - - -----
type of bit-image device
#%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
back_tab cbt str bt - -
YBCGE back tab (P)
bell bel str bl - -
YB-GE audible signal (bell) (P)
carriage_return cr str cr -
- YBCGE carriage return (P*) (P*)
@@ -701,19 +696,20 @@ superscript_characters supcs str Zv
- - ----- List of superscriptable characte
these_cause_cr docr str Zw - -
----- Printing any of these characters causes CR
zero_motion zerom str Zx - -
----- No motion for subsequent character
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following string capabilities are present in the SVr4.0 term structure,
#%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
char_set_names csnm str Zy - -
----- Produce #1'th item from list of character set names
key_mouse kmous str Km KEY_MOUSE 0631
----- Mouse event has occurred
mouse_info minfo str Mi - -
----- Mouse status information
@@ -750,9 +746,8 @@ pc_term_options pctrm str S6
- - ----- PC terminal options
scancode_escape scesc str S7 -
- ----- Escape for scancode emulation
alt_scancode_esc scesa str S8 - -
----- Alternate escape for scancode emulation
#%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
#%The XSI Curses standard added these hardcopy capabilities.
#%They were used in some post-4.1 versions of System V curses,
#%e.g., Solaris 2.5 and IRIX 6.x.
@@ -761,17 +756,18 @@ alt_scancode_esc scesa str S8 -
- ----- Alternate escape for scancode emulatio
#%If your compiled terminfo entries use these,
#%they may not be binary-compatible with System V terminfo
#%entries after SVr4.1; beware!
-#%
+#%.
#%AIX and Solaris do not provide termcap names for these; HPUX does.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
set_pglen_inch slength str YI - -
----- Set page length to #1 hundredth of an inch (some implementations use sL
for termcap).
enter_horizontal_hl_mode ehhlm str Q1 - -
----- Enter horizontal highlight mode
enter_left_hl_mode elhlm str Q2 - -
----- Enter left highlight mode
@@ -787,7 +783,6 @@ exit_right_hl_mode rmrhlm str Qb -
- ----K Exit right highlight mode
exit_top_hl_mode rmthlm str Qc - -
----K Exit top highlight mode
exit_vertical_hl_mode rmvhlm str Qd - -
----K Exit vertical highlight mode
#%.TE
-#%.ad
#
# The magic token below tells the tic compiler-generator code that all the caps
# past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.keys b/include/Caps.keys
index 48da83bcb..4df479bdb 100644
--- a/include/Caps.keys
+++ b/include/Caps.keys
@@ -206,18 +206,16 @@
#%.TP
#%(#\d\fIi\fP\u)
#%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
#%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBBooleans name Code\fR
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Boolean Capability Name TI TC Description
+#%_
auto_left_margin bw bool bw - - YB-G-
cub1 wraps from column 0 to last column
auto_right_margin am bool am - - YBCGE
terminal has automatic margins
no_esc_ctlc xsb bool xb - - YBCG-
beehive (f1=escape, f2=ctrl C)
@@ -256,18 +254,16 @@ semi_auto_right_margin sam bool YE
- - ----- printing in last column causes cr
cpi_changes_res cpix bool YF - -
----- changing character pitch changes resolution
lpi_changes_res lpix bool YG - -
----- changing line pitch changes resolution
#%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
columns cols num co - -
YBCGE number of columns in a line
init_tabs it num it - - YB-G-
tabs initially every # spaces
lines lines num li - - YBCGE
number of lines on screen or page
@@ -286,20 +282,21 @@ max_colors colors num Co
- - ----- maximum number of colors on screen
max_pairs pairs num pa - - -----
maximum number of color-pairs on the screen
no_color_video ncv num NC - - -----
video attributes that cannot be used with colors
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following numeric capabilities are present in the SVr4.0 term structure,
#%but are not yet documented in the man page.
#%They came in with SVr4's printer support.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
buffer_capacity bufsz num Ya - -
----- numbers of bytes buffered before printing
dot_vert_spacing spinv num Yb - - -----
spacing of pins vertically in pins per inch
dot_horz_spacing spinh num Yc - - -----
spacing of dots horizontally in dots per inch
@@ -318,18 +315,16 @@ buttons btns num BT
- - ----- number of buttons on mouse
bit_image_entwining bitwin num Yo - - -----
number of passes for each bit-image row
bit_image_type bitype num Yp - - -----
type of bit-image device
#%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
back_tab cbt str bt - -
YBCGE back tab (P)
bell bel str bl - -
YB-GE audible signal (bell) (P)
carriage_return cr str cr -
- YBCGE carriage return (P*) (P*)
@@ -783,19 +778,20 @@ superscript_characters supcs str Zv
- - ----- List of superscriptable characte
these_cause_cr docr str Zw - -
----- Printing any of these characters causes CR
zero_motion zerom str Zx - -
----- No motion for subsequent character
#%.TE
-#%.ad
-#%
+#%.PP
+#%.
#%The following string capabilities are present in the SVr4.0 term structure,
#%but were originally not documented in the man page.
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw18.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
char_set_names csnm str Zy - -
----- Produce #1'th item from list of character set names
key_mouse kmous str Km KEY_MOUSE 0631
----- Mouse event has occurred
mouse_info minfo str Mi - -
----- Mouse status information
@@ -832,9 +828,8 @@ pc_term_options pctrm str S6
- - ----- PC terminal options
scancode_escape scesc str S7 -
- ----- Escape for scancode emulation
alt_scancode_esc scesa str S8 - -
----- Alternate escape for scancode emulation
#%.TE
-#%.ad
-#%
-#%.in .8i
+#%.PP
+#%.
#%The XSI Curses standard added these hardcopy capabilities.
#%They were used in some post-4.1 versions of System V curses,
#%e.g., Solaris 2.5 and IRIX 6.x.
@@ -843,15 +838,16 @@ alt_scancode_esc scesa str S8 -
- ----- Alternate escape for scancode emulatio
#%If your compiled terminfo entries use these,
#%they may not be binary-compatible with System V terminfo
#%entries after SVr4.1; beware!
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.
+#%.PP
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
enter_horizontal_hl_mode ehhlm str Xh - -
----- Enter horizontal highlight mode
enter_left_hl_mode elhlm str Xl - -
----- Enter left highlight mode
enter_low_hl_mode elohlm str Xo - -
----- Enter low highlight mode
@@ -861,7 +857,6 @@ enter_vertical_hl_mode evhlm str Xv
- - ----- Enter vertical highlight mode
set_a_attributes sgr1 str sA - -
----- Define second set of video attributes #1-#6
set_pglen_inch slength str YI - -
----- Set page length to #1 hundredth of an inch (some implementations use sL
for termcap).
#%.TE
-#%.ad
#
# The magic token below tells the tic compiler-generator code that all the caps
# past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/include/Caps.osf1r5 b/include/Caps.osf1r5
index 04d8f55fd..ed738063f 100644
--- a/include/Caps.osf1r5
+++ b/include/Caps.osf1r5
@@ -204,18 +204,16 @@
#%.TP
#%(#\d\fIi\fP\u)
#%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
#%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBBooleans name Code\fR
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Boolean Capability Name TI TC Description
+#%_
auto_left_margin bw bool bw - - YB-G-
cub1 wraps from column 0 to last column
auto_right_margin am bool am - - YBCGE
terminal has automatic margins
no_esc_ctlc xsb bool xb - - YBCG-
beehive (f1=escape, f2=ctrl C)
@@ -254,18 +252,16 @@ prtr_silent mc5i bool 5i
- - ----- printer will not echo on screen
row_addr_glitch xvpa bool YD - -
----- only positive motion for vpa/mvpa caps
semi_auto_right_margin sam bool YE - - -----
printing in last column causes cr
#%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
columns cols num co - -
YBCGE number of columns in a line
init_tabs it num it - - YB-G-
tabs initially every # spaces
lines lines num li - - YBCGE
number of lines on screen or page
@@ -300,18 +296,16 @@ output_res_vert_inch orvi num Yl
- - ----- vertical resolution in units per inc
print_rate cps num Ym - - -----
print rate in characters per second
wide_char_size widcs num Yn - - -----
character step size when in double wide mode
#%.TE
-#%.ad
-#%
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
back_tab cbt str bt - -
YBCGE back tab (P)
bell bel str bl - -
YB-GE audible signal (bell) (P)
carriage_return cr str cr -
- YBCGE carriage return (P*) (P*)
diff --git a/include/Caps.uwin b/include/Caps.uwin
index 5c210223a..6c2187fe4 100644
--- a/include/Caps.uwin
+++ b/include/Caps.uwin
@@ -204,18 +204,16 @@
#%.TP
#%(#\d\fIi\fP\u)
#%indicates the \fIi\fP\uth\d parameter.
-#%
+#%.
#%.PP
-#% These are the Boolean capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBBooleans name Code\fR
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Boolean Capability Name TI TC Description
+#%_
auto_left_margin bw bool bw - - YB-G-
cub1 wraps from column 0 to last column
auto_right_margin am bool am - - YBCGE
terminal has automatic margins
no_esc_ctlc xsb bool xb - - YBCG-
beehive (f1=escape, f2=ctrl C)
@@ -247,18 +245,16 @@ back_color_erase bce bool ut -
- ----- screen erased with background color
can_change ccc bool cc - - -----
terminal can re-define existing colors
hue_lightness_saturation hls bool hl - - -----
terminal uses only HLS color notation (Tektronix)
#%.TE
-#%.ad
-#%
-#%These are the numeric capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBNumeric name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%Numeric Capability Name TI TC Description
+#%_
columns cols num co - -
YBCGE number of columns in a line
init_tabs it num it - - YB-G-
tabs initially every # spaces
lines lines num li - - YBCGE
number of lines on screen or page
@@ -278,17 +274,16 @@ max_colors colors num Co
- - ----- maximum number of colors on screen
max_pairs pairs num pa - - -----
maximum number of color-pairs on the screen
no_color_video ncv num NC - - -----
video attributes that cannot be used with colors
#%.TE
-#%.ad
-#%These are the string capabilities:
-#%
-#%.na
-#%.TS H
-#%center expand;
-#%c l l c
-#%c l l c
-#%lw25 lw6 lw2 lw20.
-#%\fBVariable Cap- TCap Description\fR
-#%\fBString name Code\fR
+#%.PP
+#%.
+#%.TS
+#%center;
+#%Lb Cb S Lb
+#%Lb Lb Lb Lb
+#%Lb Lb Lb Lx.
+#%\& Code \&
+#%String Capability Name TI TC Description
+#%_
back_tab cbt str bt - -
YBCGE back tab (P)
bell bel str bl - -
YB-GE audible signal (bell) (P)
carriage_return cr str cr -
- YBCGE carriage return (P*) (P*)
@@ -588,7 +583,6 @@ set_background setb str Sb
- - ----- Set background color #1
set_color_pair scp str sp - -
----- Set current color pair to #1
set_foreground setf str Sf - -
----- Set foreground color #1
#%.TE
-#%.ad
#%
# The magic token below tells the tic compiler-generator code that all the caps
# past it should be ignored (not written out) when dumping terminfo objects. It
diff --git a/man/MKterminfo.sh b/man/MKterminfo.sh
index 323c525f3..b01b6f6a9 100755
--- a/man/MKterminfo.sh
+++ b/man/MKterminfo.sh
@@ -83,7 +83,9 @@ cat $caps | sed -n "\
/^#/d
s/[ ][ ]*/ /g
s/$/T}/
-s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]*
[Y\-][B\-][C\-][G\-][EK\-]\** / T{/
+s/ [A-Z0-9_()\-][A-Z0-9_()\-]* [0-9\-][0-9\-]*
[Y\-][B\-][C\-][G\-][EK\-]\** / T{\\
+.ad l\
+/
s/ bool / /p
s/ num / /p
s/ str / /p
--
2.30.2
signature.asc
Description: PGP signature
- [PATCH 39/40] Revise terminfo capability tables.,
G. Branden Robinson <=