From e6725415d8e5cbb514b8d6056e0700152c540fa0 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 7 Jan 2024 00:49:18 +0000 Subject: [PATCH] ncurses 6.4 - patch 20240106 + use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc, ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD + minor manpage formatting changes for consistency. + modify doc-html test package's install-directory, per lintian. + add attr_get.3x to man_db.renames.in (patch by Sven Joachim). --- Ada95/package/debian/copyright | 4 +- COPYING | 4 +- NEWS | 11 +- VERSION | 2 +- dist.mk | 17 +- doc/html/man/curs_bkgd.3x.html | 8 +- doc/html/man/curs_bkgrnd.3x.html | 12 +- doc/html/man/curs_clear.3x.html | 26 +- doc/html/man/curs_inopts.3x.html | 24 +- doc/html/man/curs_kernel.3x.html | 22 +- doc/html/man/curs_outopts.3x.html | 14 +- doc/html/man/curs_overlay.3x.html | 14 +- doc/html/man/curs_pad.3x.html | 14 +- doc/html/man/curs_refresh.3x.html | 22 +- doc/html/man/curs_termattrs.3x.html | 26 +- doc/html/man/curs_util.3x.html | 34 +- doc/html/man/curs_variables.3x.html | 30 +- doc/html/man/form_hook.3x.html | 10 +- doc/html/man/infocmp.1m.html | 12 +- doc/html/man/ncurses.3x.html | 12 +- doc/html/man/terminfo.5.html | 6 +- man/curs_clear.3x | 14 +- man/curs_kernel.3x | 12 +- man/curs_outopts.3x | 8 +- man/curs_overlay.3x | 8 +- man/curs_pad.3x | 8 +- man/curs_refresh.3x | 12 +- man/curs_termattrs.3x | 14 +- man/curs_util.3x | 22 +- man/curs_variables.3x | 16 +- man/form_hook.3x | 8 +- man/man_db.renames.in | 7 +- man/ncurses.3x | 48 +- misc/terminfo.src | 3707 ++++++++++++------------- package/debian-mingw/changelog | 4 +- package/debian-mingw/copyright | 4 +- package/debian-mingw64/changelog | 4 +- package/debian-mingw64/copyright | 4 +- package/debian/changelog | 4 +- package/debian/copyright | 4 +- package/debian/rules | 6 +- package/mingw-ncurses.nsi | 6 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- test/package/debian-mingw/copyright | 4 +- test/package/debian-mingw64/copyright | 4 +- test/package/debian/copyright | 4 +- 48 files changed, 2049 insertions(+), 2213 deletions(-) diff --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright index 3c8e5256..b4060150 100644 --- a/Ada95/package/debian/copyright +++ b/Ada95/package/debian/copyright @@ -4,12 +4,12 @@ Current ncurses maintainer: Thomas Dickey ------------------------------------------------------------------------------- Files: * -Copyright: 2017-2022,2023 by Thomas E. Dickey +Copyright: 2017-2023,2024 by Thomas E. Dickey Copyright: 1998-2016,2017 Free Software Foundation, Inc. License: X11 Files: aclocal.m4 package -Copyright: 2010-2020,2021 by Thomas E. Dickey +Copyright: 2010-2023,2024 by Thomas E. Dickey License: X11 Permission is hereby granted, free of charge, to any person obtaining a diff --git a/COPYING b/COPYING index 2abcc60d..540047f1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2018-2022,2023 Thomas E. Dickey +Copyright 2018-2023,2024 Thomas E. Dickey Copyright 1998-2017,2018 Free Software Foundation, Inc. Permission is hereby granted, free of charge, to any person obtaining a @@ -26,4 +26,4 @@ sale, use or other dealings in this Software without prior written authorization. -- vile:txtmode fc=72 --- $Id: COPYING,v 1.12 2023/01/07 17:55:53 tom Exp $ +-- $Id: COPYING,v 1.13 2024/01/05 21:13:17 tom Exp $ diff --git a/NEWS b/NEWS index 8f115f89..cfcc1d3b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright 2018-2022,2023 Thomas E. Dickey -- +-- Copyright 2018-2023,2024 Thomas E. Dickey -- -- Copyright 1998-2017,2018 Free Software Foundation, Inc. -- -- -- -- Permission is hereby granted, free of charge, to any person obtaining a -- @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.4057 2023/12/31 00:17:55 tom Exp $ +-- $Id: NEWS,v 1.4062 2024/01/06 23:40:56 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,13 @@ 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. +20240106 + + use ansi+arrows, ansi+apparrows, ansi+csr, ansi+erase, ansi+idc, + ansi+idc1, ansi+idl, ansi+idl1, ansi+inittabs to trim -TD + + minor manpage formatting changes for consistency. + + modify doc-html test package's install-directory, per lintian. + + add attr_get.3x to man_db.renames.in (patch by Sven Joachim). + 20231230 + improve formatting/style of manpages (patches by Branden Robinson). + add ms-vt100-16color, winconsole -TD diff --git a/VERSION b/VERSION index d7b54615..bb21a273 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.4 20231230 +5:0:10 6.4 20240106 diff --git a/dist.mk b/dist.mk index 69ec2bfe..ba3338a4 100644 --- a/dist.mk +++ b/dist.mk @@ -1,5 +1,5 @@ ############################################################################## -# Copyright 2018-2022,2023 Thomas E. Dickey # +# Copyright 2018-2023,2024 Thomas E. Dickey # # Copyright 1998-2017,2018 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1586 2023/12/30 11:24:34 tom Exp $ +# $Id: dist.mk,v 1.1591 2024/01/06 11:19:36 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 = 20231230 +NCURSES_PATCH = 20240106 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) @@ -63,7 +63,7 @@ GNATHTML= gnathtml # would remove some text. The man program on Redhat 6.1 appears to work with # man2html if we set the top/bottom margins to 6 (the default is 7). Newer # versions of 'man' leave no margin (and make it harder to sync with pages). -MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index +MAN2HTML= man2html -botm=0 -topm=0 -cgiurl '$$title.$$section$$subsection.html' -index -mixsecs ALL = ANNOUNCE doc/html/announce.html doc/ncurses-intro.doc doc/hackguide.doc manhtml adahtml @@ -124,9 +124,10 @@ manhtml: @echo 's///g' >> subst.tmp @echo 's/<\/I>/<\/EM>/g' >> subst.tmp @misc/csort < subst.tmp | uniq > subst.sed - @echo '/<\/TITLE>/a\' >> subst.sed - @echo '\' >> subst.sed - #@rm -f subst.tmp + @echo 's%[_-]*_-[_-]*%_%g' >> subst.sed + @echo '/<\/TITLE>/a\\' >> subst.sed + @echo '\\' >> subst.sed + @rm -f subst.tmp @for f in man/*.[0-9]* ; do \ m=`basename $$f` ;\ T=`$${EGREP-grep -E} '^.TH' $$f|sed -e 's/^.TH //' -e s'/"//g' -e 's/[ ]\+$$//'` ; \ @@ -152,7 +153,7 @@ manhtml: sed -e 's/"curses.3x.html"/"ncurses.3x.html"/g' \ >> doc/html/man/$$g ;\ done - #@rm -f subst.sed + @rm -f subst.sed # # Please note that this target can only be properly built if the build of the diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html index 078fd793..6a487215 100644 --- a/doc/html/man/curs_bkgd.3x.html +++ b/doc/html/man/curs_bkgd.3x.html @@ -84,7 +84,7 @@ on the screen. -

bkgd, wbkgd

+

bkgd, wbkgd

        bkgd  and  wbkgd set the background property of stdscr or the specified
        window and then apply this setting to  every  character  cell  in  that
        window.
@@ -129,7 +129,7 @@
        character's color attribute.
 
 
-

bkgdset, wbkgdset

+

bkgdset, wbkgdset

        bkgdset and  wbkgdset  manipulate  the  background  of  the  applicable
        window, without updating the character cells as bkgd and wbkgd do; only
        future writes reflect the updated background.
@@ -197,8 +197,8 @@ ncurses 6.4                       2023-12-23                     SYNOPSIS
 
  • DESCRIPTION
 
 
    • 
diff --git a/doc/html/man/curs_bkgrnd.3x.html b/doc/html/man/curs_bkgrnd.3x.html
index 8dcd4c41..376210a5 100644
--- a/doc/html/man/curs_bkgrnd.3x.html
+++ b/doc/html/man/curs_bkgrnd.3x.html
@@ -85,7 +85,7 @@
        on the screen.
 
 
-

    bkgrnd, wbkgrnd

    +

    bkgrnd, wbkgrnd

            bkgrnd  and  wbkgrnd  set  the  background  property  of  stdscr or the
        specified window and then apply this setting to every character cell in
        that window.
@@ -130,13 +130,13 @@
        character's color attribute.
 
 
-

    bkgrndset, wbkgrndset

    +

    bkgrndset, wbkgrndset

            bkgrndset and wbkgrndset manipulate the background  of  the  applicable
        window,  without updating the character cells as bkgrnd and wbkgrnd do;
        only future writes reflect the updated background.
 
 
-

    getbkgrnd, wgetbkgrnd

    +

    getbkgrnd, wgetbkgrnd

            The getbkgrnd and wgetbkgrnd functions obtain the background  character
        and  attribute  pair of stdscr or the specified window and store it via
        the wch pointer.
@@ -185,9 +185,9 @@ ncurses 6.4                       2023-12-23                   SYNOPSIS
 
  • DESCRIPTION
 
 
    • 
 
  • RETURN VALUE
    • 
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index 359c9441..e63e5583 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -1,6 +1,6 @@
 
 
 
 
 
 
-curs_clear 3x 2023-12-16 ncurses 6.4 Library calls
+curs_clear 3x 2024-01-05 ncurses 6.4 Library calls
 
 
 
 
-
    curs_clear 3x 2023-12-16 ncurses 6.4 Library calls
    
+
    curs_clear 3x 2024-01-05 ncurses 6.4 Library calls
    
 
     curs_clear(3x)                   Library calls                  curs_clear(3x)
 
@@ -69,7 +69,7 @@
 
 
    DESCRIPTION
     
-
    erase/werase
    +
    erase, werase
            The erase and werase routines copy blanks  to  every  position  in  the
        window, clearing the screen.
 
@@ -77,20 +77,20 @@
        by wbkgdset(3x)) merged into them.
 
 
-
    clear/wclear
    +
    clear, wclear
            The clear and wclear routines are like erase and werase, but they  also
        call  clearok(3x), so that the screen is cleared completely on the next
        call to wrefresh for that window and repainted from scratch.
 
 
-
    clrtobot/wclrtobot
    +
    clrtobot, wclrtobot
            The clrtobot and wclrtobot routines erase from the cursor to the end of
        screen.   That is, they erase all lines below the cursor in the window.
        Also, the current line to  the  right  of  the  cursor,  inclusive,  is
        erased.
 
 
-
    clrtoeol/wclrtoeol
    +
    clrtoeol, wclrtoeol
            The clrtoeol and wclrtoeol routines erase the current line to the right
        of the cursor, inclusive, to the end of the current line.
 
@@ -138,7 +138,7 @@
 
 
 
-ncurses 6.4                       2023-12-16                    curs_clear(3x)
+ncurses 6.4                       2024-01-05                    curs_clear(3x)

    cbreak, nocbreak

    +

    cbreak, nocbreak

            Normally,  the terminal driver buffers typed characters until a newline
        or  carriage  return  is  typed.   The  cbreak  routine  disables  line
        buffering  and  erase/kill  character-processing  (interrupt  and  flow
@@ -115,7 +115,7 @@
        discussion of how these routines interact with echo and noecho.]
 
 
-

    echo, noecho

    +

    echo, noecho

            The echo and noecho routines control whether characters  typed  by  the
        user  are  echoed  by  getch(3x)  as  they  are  typed.  Echoing by the
        terminal driver is always disabled, but  initially  getch  is  in  echo
@@ -170,7 +170,7 @@
        called and rmm is sent when meta(win, FALSE) is called.
 
 
-

    nl, nonl

    +

    nl, nonl

            The  nl and nonl routines control whether the underlying display device
        translates the return key into newline on input.
 
@@ -189,7 +189,7 @@
        user.
 
 
-

    raw, noraw

    +

    raw, noraw

            The raw and noraw routines place the terminal into or out of raw  mode.
        Raw  mode  is  similar  to  cbreak  mode,  in that characters typed are
        immediately passed through to the user program.   The  differences  are
@@ -199,7 +199,7 @@
        terminal driver that are not set by curses.
 
 
-

    qiflush, nqiflush

    +

    qiflush, nqiflush

            When the noqiflush routine is used, normal flush of  input  and  output
        queues  associated  with the INTR, QUIT and SUSP characters will not be
        done [see termios(3)].  When qiflush is  called,  the  queues  will  be
@@ -208,7 +208,7 @@
        the interrupt had not occurred, after the handler exits.
 
 
-

    timeout, wtimeout

    +

    timeout, wtimeout

            The timeout and wtimeout routines set blocking or non-blocking read for
        a given window.  If delay is negative, a blocking read is  used  (i.e.,
        waits  indefinitely  for input).  If delay is zero, then a non-blocking
@@ -345,18 +345,18 @@ ncurses 6.4                       2023-12-23                   SYNOPSIS
 
  • DESCRIPTION
 
 
    • 
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index c13997e4..35a505ef 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -1,6 +1,6 @@
 
 
 
 
 
 
-curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls
+curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls
 
 
 
 
-
    curs_kernel 3x 2023-12-16 ncurses 6.4 Library calls
    
+
    curs_kernel 3x 2024-01-05 ncurses 6.4 Library calls
    
 
     curs_kernel(3x)                  Library calls                 curs_kernel(3x)
 
@@ -78,7 +78,7 @@
        routines.
 
 
-
    def_prog_mode, def_shell_mode
    +
    def_prog_mode, def_shell_mode
            The def_prog_mode and def_shell_mode routines save the current terminal
        modes as the "program" (in curses) or "shell" (not in curses) state for
        use by the reset_prog_mode and reset_shell_mode routines.  This is done
@@ -86,14 +86,14 @@
        context allocated by newterm.
 
 
-
    reset_prog_mode, reset_shell_mode
    +
    reset_prog_mode, reset_shell_mode
            The  reset_prog_mode and reset_shell_mode routines restore the terminal
        to "program" (in curses) or "shell" (out of curses) state.   These  are
        done  automatically by endwin(3x) and, after an endwin, by doupdate, so
        they normally are not called.
 
 
-
    resetty, savetty
    +
    resetty, savetty
            The resetty and savetty routines save and  restore  the  state  of  the
        terminal  modes.   savetty  saves  the  current  state  in a buffer and
        resetty restores the state to what it was at the last call to savetty.
@@ -209,7 +209,7 @@
 
 
 
-ncurses 6.4                       2023-12-16                   curs_kernel(3x)
+ncurses 6.4                       2024-01-05                   curs_kernel(3x)

    Comparison Options [-d] [-c] [-n]

    +

    Comparison Options [-d] [-c] [-n]

            infocmp  compares  the  terminfo  description  of  the  first  terminal
        terminal-type  with  each  of the descriptions given by the entries for
        the other terminal's terminal-types.  If a capability  is  defined  for
@@ -115,7 +115,7 @@
             variable TERM for each of the terminal-types.
 
 
-

    Source Listing Options [-I] [-L] [-C] [-r]

    +

    Source Listing Options [-I] [-L] [-C] [-r]

            The -I, -L, and -C options will  produce  a  source  listing  for  each
        terminal named.
 
@@ -178,7 +178,7 @@
            %p2 is printed before %p1   %r        hp
 
 
-

    Use= Option [-u]

    +

    Use= Option [-u]

            The -u option produces a  terminfo  source  description  of  the  first
        terminal terminal-type which is relative to the sum of the descriptions
        given by the entries for the other terminal-types.   It  does  this  by
@@ -540,9 +540,9 @@ ncurses 6.4                       2023-12-30                       DESCRIPTION
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 75e66f4f..adc7badb 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -1,7 +1,7 @@