From bf2c36c4930ac5bb04cd2b1ba209cd09b6f510ab Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 14 Jan 2024 01:19:03 +0000 Subject: [PATCH] ncurses 6.4 - patch 20240113 + improve formatting/style of manpages (patches by Branden Robinson). + modify dist.mk to avoid passing developer's comments in manpages into the generated html documentation. + use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr to trim -TD + restore padding for wy520* and vt320-k311 (report by Sven Joachim). --- NEWS | 10 +- VERSION | 2 +- dist.mk | 9 +- doc/html/man/captoinfo.1m.html | 4 - doc/html/man/clear.1.html | 3 - doc/html/man/curs_add_wch.3x.html | 135 +- doc/html/man/curs_attr.3x.html | 60 +- doc/html/man/curs_inch.3x.html | 18 +- doc/html/man/curs_mouse.3x.html | 34 +- doc/html/man/curs_printw.3x.html | 5 - doc/html/man/curs_scanw.3x.html | 5 - doc/html/man/curs_scr_dump.3x.html | 1 - doc/html/man/curs_sp_funcs.3x.html | 3 - doc/html/man/curs_termcap.3x.html | 28 - doc/html/man/curs_terminfo.3x.html | 424 ++-- doc/html/man/curs_threads.3x.html | 932 +++++---- doc/html/man/curs_variables.3x.html | 1 - doc/html/man/form_driver.3x.html | 130 +- doc/html/man/infocmp.1m.html | 36 +- doc/html/man/ncurses.3x.html | 621 +++--- doc/html/man/panel.3x.html | 17 - doc/html/man/scr_dump.5.html | 1 - doc/html/man/tabs.1.html | 7 - doc/html/man/term.5.html | 66 +- doc/html/man/term.7.html | 1 - doc/html/man/terminfo.5.html | 2862 +++++++++++++-------------- doc/html/man/toe.1m.html | 33 +- doc/html/man/tput.1.html | 682 ++++--- doc/html/man/tset.1.html | 9 - doc/html/man/user_caps.5.html | 63 +- include/Caps | 145 +- include/Caps.aix4 | 139 +- include/Caps.hpux11 | 141 +- include/Caps.keys | 139 +- include/Caps.osf1r5 | 68 +- include/Caps.uwin | 75 +- man/MKterminfo.sh | 6 +- man/curs_add_wch.3x | 220 +- man/curs_attr.3x | 124 +- man/curs_inch.3x | 17 +- man/curs_mouse.3x | 53 +- man/curs_terminfo.3x | 652 +++--- man/curs_threads.3x | 918 ++++----- man/form_driver.3x | 54 +- man/infocmp.1m | 126 +- man/manhtml.externs | 5 +- man/ncurses.3x | 8 +- man/term.5 | 15 +- man/terminfo.head | 38 +- man/terminfo.tail | 78 +- man/toe.1m | 30 +- man/tput.1 | 1207 ++++++----- man/user_caps.5 | 54 +- misc/terminfo.src | 2649 ++++++++++++------------- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 61 files changed, 6652 insertions(+), 6533 deletions(-) diff --git a/NEWS b/NEWS index cfcc1d3b..49bbd33c 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4062 2024/01/06 23:40:56 tom Exp $ +-- $Id: NEWS,v 1.4064 2024/01/13 22:02:10 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,14 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20240113 + + improve formatting/style of manpages (patches by Branden Robinson). + + modify dist.mk to avoid passing developer's comments in manpages into + the generated html documentation. + + use ansi+local, ansi+local1, ansi+pp, ansi+rca, ansi+rca2, ansi+sgr + to trim -TD + + restore padding for wy520* and vt320-k311 (report by Sven Joachim). + 20240106 + use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc, ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD diff --git a/VERSION b/VERSION index bb21a273..4b0762cf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20240106 +5:0:10 6.4 20240113 diff --git a/dist.mk b/dist.mk index ba3338a4..cd175e62 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1591 2024/01/06 11:19:36 tom Exp $ +# $Id: dist.mk,v 1.1593 2024/01/13 21:07:51 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 4 -NCURSES_PATCH = 20240106 +NCURSES_PATCH = 20240113 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -135,8 +135,9 @@ manhtml: if [ -f doc/html/$$g ]; then chmod +w doc/html/$$g; fi;\ echo "Converting $$m to HTML" ;\ echo ' diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html index 528a60bc..0d64aea2 100644 --- a/doc/html/man/clear.1.html +++ b/doc/html/man/clear.1.html @@ -28,9 +28,6 @@ * authorization. * **************************************************************************** * @Id: clear.1,v 1.46 2023/12/16 20:32:22 tom Exp @ - * https://minnie.tuhs.org/cgi-bin/utree.pl?file=2BSD/src/clear.c - * https://minnie.tuhs.org/cgi-bin/utree.pl?file=Net2/usr/src/usr.bin/\ - * tput/clear.sh --> diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html index e9ed953d..565227c3 100644 --- a/doc/html/man/curs_add_wch.3x.html +++ b/doc/html/man/curs_add_wch.3x.html @@ -1,7 +1,7 @@ -curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls +curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls -

curs_add_wch 3x 2023-12-23 ncurses 6.4 Library calls

+

curs_add_wch 3x 2024-01-13 ncurses 6.4 Library calls

 curs_add_wch(3x)                 Library calls                curs_add_wch(3x)
 
@@ -111,78 +111,79 @@
        lines  and  other  frequently  used  special characters.  These symbols
        correspond to the same VT100 line-drawing set as addch(3x).
 
-       ACS               Unicode    ASCII     acsc    Glyph
-       Name              Default    Default   char    Name
+                       Unicode   ASCII     acsc
 
+
+       ACS Name        Default   Default   Char   Glyph Name
        ------------------------------------------------------------------------
-       WACS_BLOCK        0x25ae     #         0       solid square block
-       WACS_BOARD        0x2592     #         h       board of squares
-       WACS_BTEE         0x2534     +         v       bottom tee
-       WACS_BULLET       0x00b7     o         ~       bullet
-       WACS_CKBOARD      0x2592     :         a       checker board (stipple)
-       WACS_DARROW       0x2193     v         .       arrow pointing down
-       WACS_DEGREE       0x00b0     '         f       degree symbol
-       WACS_DIAMOND      0x25c6     +         `       diamond
-       WACS_GEQUAL       0x2265     >         >       greater-than-or-equal-to
-       WACS_HLINE        0x2500     -         q       horizontal line
-       WACS_LANTERN      0x2603     #         i       lantern symbol
-       WACS_LARROW       0x2190     <         ,       arrow pointing left
-       WACS_LEQUAL       0x2264     <         y       less-than-or-equal-to
-       WACS_LLCORNER     0x2514     +         m       lower left-hand corner
-       WACS_LRCORNER     0x2518     +         j       lower right-hand corner
-       WACS_LTEE         0x2524     +         t       left tee
-       WACS_NEQUAL       0x2260     !         |       not-equal
-       WACS_PI           0x03c0     *         {       greek pi
-       WACS_PLMINUS      0x00b1     #         g       plus/minus
-       WACS_PLUS         0x253c     +         n       plus
-       WACS_RARROW       0x2192     >         +       arrow pointing right
-       WACS_RTEE         0x251c     +         u       right tee
-       WACS_S1           0x23ba     -         o       scan line 1
-       WACS_S3           0x23bb     -         p       scan line 3
-       WACS_S7           0x23bc     -         r       scan line 7
-       WACS_S9           0x23bd     _         s       scan line 9
-       WACS_STERLING     0x00a3     f         }       pound-sterling symbol
-       WACS_TTEE         0x252c     +         w       top tee
-       WACS_UARROW       0x2191     ^         -       arrow pointing up
-       WACS_ULCORNER     0x250c     +         l       upper left-hand corner
-       WACS_URCORNER     0x2510     +         k       upper right-hand corner
-       WACS_VLINE        0x2502     |         x       vertical line
+       WACS_BLOCK      0x25ae    #         0      solid square block
+       WACS_BOARD      0x2592    #         h      board of squares
+       WACS_BTEE       0x2534    +         v      bottom tee
+       WACS_BULLET     0x00b7    o         ~      bullet
+       WACS_CKBOARD    0x2592    :         a      checker board (stipple)
+       WACS_DARROW     0x2193    v         .      arrow pointing down
+       WACS_DEGREE     0x00b0    '         f      degree symbol
+       WACS_DIAMOND    0x25c6    +         `      diamond
+       WACS_GEQUAL     0x2265    >         >      greater-than-or-equal-to
+       WACS_HLINE      0x2500    -         q      horizontal line
+       WACS_LANTERN    0x2603    #         i      lantern symbol
+       WACS_LARROW     0x2190    <         ,      arrow pointing left
+       WACS_LEQUAL     0x2264    <         y      less-than-or-equal-to
+       WACS_LLCORNER   0x2514    +         m      lower left-hand corner
+       WACS_LRCORNER   0x2518    +         j      lower right-hand corner
+       WACS_LTEE       0x2524    +         t      left tee
+       WACS_NEQUAL     0x2260    !         |      not-equal
+       WACS_PI         0x03c0    *         {      greek pi
+       WACS_PLMINUS    0x00b1    #         g      plus/minus
+       WACS_PLUS       0x253c    +         n      plus
+       WACS_RARROW     0x2192    >         +      arrow pointing right
+       WACS_RTEE       0x251c    +         u      right tee
+       WACS_S1         0x23ba    -         o      scan line 1
+       WACS_S3         0x23bb    -         p      scan line 3
+       WACS_S7         0x23bc    -         r      scan line 7
+       WACS_S9         0x23bd    _         s      scan line 9
+       WACS_STERLING   0x00a3    f         }      pound-sterling symbol
+       WACS_TTEE       0x252c    +         w      top tee
+       WACS_UARROW     0x2191    ^         -      arrow pointing up
+       WACS_ULCORNER   0x250c    +         l      upper left-hand corner
+       WACS_URCORNER   0x2510    +         k      upper right-hand corner
+       WACS_VLINE      0x2502    |         x      vertical line
 
        The wide-character configuration of ncurses also  defines  symbols  for
        thick lines (acsc "J" to "V"):
 
-       ACS               Unicode   ASCII     acsc    Glyph
-       Name              Default   Default   char    Name
-       -----------------------------------------------------------------------
-       WACS_T_BTEE       0x253b    +         V       thick tee pointing up
-       WACS_T_HLINE      0x2501    -         Q       thick horizontal line
-       WACS_T_LLCORNER   0x2517    +         M       thick lower left corner
-       WACS_T_LRCORNER   0x251b    +         J       thick lower right corner
-       WACS_T_LTEE       0x252b    +         T       thick tee pointing right
-       WACS_T_PLUS       0x254b    +         N       thick large plus
-       WACS_T_RTEE       0x2523    +         U       thick tee pointing left
-       WACS_T_TTEE       0x2533    +         W       thick tee pointing down
-       WACS_T_ULCORNER   0x250f    +         L       thick upper left corner
-       WACS_T_URCORNER   0x2513    +         K       thick upper right corner
-       WACS_T_VLINE      0x2503    |         X       thick vertical line
+                         Unicode   ASCII     acsc
+       ACS Name          Default   Default   Char   Glyph Name
+       ------------------------------------------------------------------------
+       WACS_T_BTEE       0x253b    +         V      thick tee pointing up
+       WACS_T_HLINE      0x2501    -         Q      thick horizontal line
+       WACS_T_LLCORNER   0x2517    +         M      thick lower left corner
+       WACS_T_LRCORNER   0x251b    +         J      thick lower right corner
+       WACS_T_LTEE       0x252b    +         T      thick tee pointing right
+       WACS_T_PLUS       0x254b    +         N      thick large plus
+       WACS_T_RTEE       0x2523    +         U      thick tee pointing left
+       WACS_T_TTEE       0x2533    +         W      thick tee pointing down
+       WACS_T_ULCORNER   0x250f    +         L      thick upper left corner
+       WACS_T_URCORNER   0x2513    +         K      thick upper right corner
+       WACS_T_VLINE      0x2503    |         X      thick vertical line
 
        and for double-lines (acsc "A" to "I"):
 
-       ACS               Unicode   ASCII     acsc    Glyph
-       Name              Default   Default   char    Name
+                         Unicode   ASCII     acsc
+       ACS Name          Default   Default   Char   Glyph Name
        ------------------------------------------------------------------------
-       WACS_D_BTEE       0x2569    +         H       double tee pointing up
-       WACS_D_HLINE      0x2550    -         R       double horizontal line
-       WACS_D_LLCORNER   0x255a    +         D       double lower left corner
-       WACS_D_LRCORNER   0x255d    +         A       double lower right corner
-       WACS_D_LTEE       0x2560    +         F       double tee pointing right
-       WACS_D_PLUS       0x256c    +         E       double large plus
-       WACS_D_RTEE       0x2563    +         G       double tee pointing left
-       WACS_D_TTEE       0x2566    +         I       double tee pointing down
-
-       WACS_D_ULCORNER   0x2554    +         C       double upper left corner
-       WACS_D_URCORNER   0x2557    +         B       double upper right corner
-       WACS_D_VLINE      0x2551    |         Y       double vertical line
+       WACS_D_BTEE       0x2569    +         H      double tee pointing up
+       WACS_D_HLINE      0x2550    -         R      double horizontal line
+       WACS_D_LLCORNER   0x255a    +         D      double lower left corner
+       WACS_D_LRCORNER   0x255d    +         A      double lower right corner
+       WACS_D_LTEE       0x2560    +         F      double tee pointing right
+       WACS_D_PLUS       0x256c    +         E      double large plus
+       WACS_D_RTEE       0x2563    +         G      double tee pointing left
+
+       WACS_D_TTEE       0x2566    +         I      double tee pointing down
+       WACS_D_ULCORNER   0x2554    +         C      double upper left corner
+       WACS_D_URCORNER   0x2557    +         B      double upper right corner
+       WACS_D_VLINE      0x2551    |         Y      double vertical line
 
        Unicode's  descriptions  for  these  characters  differs  slightly from
        ncurses, by introducing the term "light"  (along  with  less  important
@@ -320,7 +321,7 @@
 
 
 
-ncurses 6.4                       2023-12-23                  curs_add_wch(3x)
+ncurses 6.4                       2024-01-13                  curs_add_wch(3x)