Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 78 insertions, 37 deletions

diff --git a/upstream/mageia-cauldron/man5/terminfo.5 b/upstream/mageia-cauldron/man5/terminfo.5
index c57e8824..2c422817 100644
--- a/upstream/mageia-cauldron/man5/terminfo.5
+++ b/upstream/mageia-cauldron/man5/terminfo.5
@@ -82,7 +82,7 @@ have, by specifying how to perform screen operations, and by
 specifying padding requirements and initialization sequences.
 .PP
 This manual describes \fI\%ncurses\fP
-version 6.4 (patch 20240217).
+version 6.4 (patch 20240323).
 .SS "\fIterminfo\fP Entry Syntax"
 Entries in
 .I terminfo
@@ -229,53 +229,72 @@ using terminal entry.
 .SS "Predefined Capabilities"
 .\" Head of terminfo man page ends here
 .ps -1
-The following is a complete table of the capabilities included in a
-terminfo description block and available to terminfo-using code.
-In each line of the table,
+Tables of capabilities
+.I \%ncurses
+recognizes in a
+.I \%term\%info
+terminal type description and available to
+.IR \%term\%info -using
+code follow.
 .bP
-The \fBvariable\fR is the name by which the programmer (at the terminfo level)
-accesses the capability.
+The capability name identifies the symbol by which the programmer
+using the
+.I \%term\%info
+API accesses the capability.
 .bP
-The \fBcapname\fR (\fICap-name\fP)
-is the short name used in the text of the database,
-and is used by a person updating the database.
+The TI
+.RI ( \%term\%info )
+code is the short name used by a person composing or updating a
+terminal type entry.
 .IP
-Whenever possible, capnames are chosen to be the same as or similar to
-the ANSI X3.64-1979 standard (now superseded by ECMA-48, which uses
-identical or very similar names).
+Whenever possible,
+these codes are the same as or similar to those of the ANSI X3.64-1979
+standard
+(now superseded by ECMA-48,
+which uses identical or very similar names).
 Semantics are also intended to match those of the specification.
 .IP
-Capability names have no hard length limit, but an informal limit of 5
-characters has been adopted to keep them short and to allow the tabs in
-the source file
-.B Caps
+.I \%term\%info
+codes have no hard length limit,
+but
+.I \%ncurses
+maintains an informal one of 5 characters to keep them short and to
+allow the tabs in the source file
+.I Caps
 to line up nicely.
+(Some standard codes exceed this limit regardless.)
 .bP
-The \fBtermcap\fP (\fITcap\fP) code is the old capability name
-(some capabilities are new, and have names which termcap did not originate).
+The TC
+.RI ( \%term\%cap )
+code is that used by the corresponding API of
+.I \%ncurses.
+(Some capabilities are new,
+and have names that BSD
+.I \%term\%cap
+did not originate.)
 .bP
-Finally, the \fBdescription\fP field attempts to convey the semantics of the
-capability.
+The description field attempts to convey the capability's semantics.
 .PP
-You may find some codes in the description field:
+The description field employs a handful of notations.
 .TP
-(P)
-indicates that padding may be specified
+.B (P)
+indicates that padding may be specified.
 .TP
-#[1-9]
-in the description field indicates that the string is passed
-through \fBtparm\fP(3X) with parameters as given (#\fIi\fP).
-.IP
-If no parameters are listed in the description,
-passing the string through \fBtparm\fP(3X) may give unexpected results,
-e.g., if it contains percent (%%) signs.
-.TP
-(P*)
-indicates that padding may vary in proportion to the number of
-lines affected
+.B (P*)
+indicates that padding may vary in proportion to the number of output
+lines affected.
 .TP
-(#\d\fIi\fP\u)
-indicates the \fIi\fP\uth\d parameter.
+.BI # i
+indicates the
+.IR i th
+parameter of a string capability;
+the programmer should pass the string to \fB\%tparm\fP(3X) with the
+parameters listed.
+.IP
+If the description lists no parameters,
+passing the string to \fB\%tparm\fP(3X) may produce unexpected
+behavior,
+for instance if the string contains percent signs.
 .
 .PP
 .TS
@@ -852,6 +871,10 @@ key_down	kcud1	kd	T{
 .ad l
 down-arrow key
 T}
+.TE
+.TS
+center;
+Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_eic	krmir	kM	T{
 .ad l
 sent by rmir or smir in insert mode
@@ -1100,6 +1123,10 @@ reset_2string	rs2	r2	T{
 .ad l
 reset string
 T}
+.TE
+.TS
+center;
+Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 reset_3string	rs3	r3	T{
 .ad l
 reset string
@@ -1348,6 +1375,10 @@ key_undo	kund	&8	T{
 .ad l
 undo key
 T}
+.TE
+.TS
+center;
+Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_sbeg	kBEG	&9	T{
 .ad l
 shifted begin key
@@ -1596,6 +1627,10 @@ key_f42	kf42	FW	T{
 .ad l
 F42 function key
 T}
+.TE
+.TS
+center;
+Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 key_f43	kf43	FX	T{
 .ad l
 F43 function key
@@ -1844,6 +1879,10 @@ enter_doublewide_mode	swidm	ZF	T{
 .ad l
 Enter double-wide mode
 T}
+.TE
+.TS
+center;
+Lbw(25n)2 Lbw(8n)2 Lb2 Lx.
 enter_draft_quality	sdrfq	ZG	T{
 .ad l
 Enter draft-quality mode
@@ -2246,7 +2285,7 @@ T}
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.143 2024/01/13 22:05:39 tom Exp $
+.\" $Id: terminfo.tail,v 1.144 2024/03/02 14:36:39 tom Exp $
 .ps +1
 .SS "User-Defined Capabilities"
 .
@@ -3914,6 +3953,8 @@ magenta	COLOR_MAGENTA	5	max,	0,	max
 cyan	COLOR_CYAN	6	0,	max,	max
 white	COLOR_WHITE	7	max,	max,	max
 .TE
+.br
+.if t .ne 6v
 .PP
 The argument values of \fBsetf\fP/\fBsetb\fP historically correspond to
 a different mapping, i.e.,