From: Thomas E. Dickey Date: Sun, 27 Oct 2019 01:34:14 +0000 (+0000) Subject: ncurses 6.1 - patch 20191026 X-Git-Tag: v6.2~13 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=336aa0803853f7961dd31f1e35cd688d861ffd64 ncurses 6.1 - patch 20191026 + add a note in man/curs_add_wch.3x about Unicode terminology for the line-drawing characters (report by Nick Black). + improve comment in lib_tgoto.c regarding the use of \200 where a \0 would be intended by the caller (report by "64 bit", cf: 20000923). + modify linux-16color to accommodate Linux console driver change in early 2018 (report by Dino Petrucci). --- diff --git a/NEWS b/NEWS index 5244cbb7..d9addf5b 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3396 2019/10/19 21:16:45 tom Exp $ +-- $Id: NEWS,v 1.3399 2019/10/27 00:10:51 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,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. +20191026 + + add a note in man/curs_add_wch.3x about Unicode terminology for the + line-drawing characters (report by Nick Black). + + improve comment in lib_tgoto.c regarding the use of \200 where a + \0 would be intended by the caller (report by "64 bit", cf: 20000923). + + modify linux-16color to accommodate Linux console driver change in + early 2018 (report by Dino Petrucci). + 20191019 + modify make_hash to not require --disable-leaks, to simplify building with address-sanitizer. diff --git a/VERSION b/VERSION index 56fbfa2d..35fbfa40 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20191019 +5:0:10 6.1 20191026 diff --git a/dist.mk b/dist.mk index 13d3daa1..097b2d31 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1311 2019/10/19 12:47:53 tom Exp $ +# $Id: dist.mk,v 1.1312 2019/10/26 08:56:47 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 1 -NCURSES_PATCH = 20191019 +NCURSES_PATCH = 20191026 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index 99d2fa60..539b43fe 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -125,7 +125,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index ad1474ab..ab55c5f5 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -198,7 +198,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 51e563e0..9b26f3c2 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -148,7 +148,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/curs_add_wch.3x.html b/doc/html/man/curs_add_wch.3x.html
index 8e9e64f6..f7f0c243 100644
--- a/doc/html/man/curs_add_wch.3x.html
+++ b/doc/html/man/curs_add_wch.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -138,7 +138,24 @@
        WACS_VLINE        0x2502     |         x       vertical line
 
        The wide-character configuration of ncurses also  defines  symbols  for
-       double-lines:
+       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
+
+       and for double-lines (acsc "A" to "I"):
 
        ACS               Unicode   ASCII     acsc    Glyph
        Name              Default   Default   char    Name
@@ -155,28 +172,22 @@
        WACS_D_URCORNER   0x2557    +         B       double upper right corner
        WACS_D_VLINE      0x2551    |         Y       double vertical line
 
-       and for thick lines:
+       Unicode's  descriptions  for  these  characters  differs  slightly from
+       ncurses, by introducing the term "light"  (along  with  less  important
+       details).   Here are its descriptions for the normal, thick, and double
+       horizontal lines:
 
-       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
+       o   U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+
+       o   U+2501 BOX DRAWINGS HEAVY HORIZONTAL
+
+       o   U+2550 BOX DRAWINGS DOUBLE HORIZONTAL

RETURN VALUE

        All routines return the integer ERR upon failure and OK on success.
 
-       Functions  with  a  "mv"  prefix  first perform a cursor movement using
+       Functions with a "mv" prefix first  perform  a  cursor  movement  using
        wmove, and return an error if the position is outside the window, or if
        the window pointer is null.
 
@@ -186,71 +197,71 @@

PORTABILITY

-       All  of these functions are described in the XSI Curses standard, Issue
-       4.  The defaults specified for line-drawing  characters  apply  in  the
+       All of these functions are described in the XSI Curses standard,  Issue
+       4.   The  defaults  specified  for line-drawing characters apply in the
        POSIX locale.
 
-       X/Open  Curses  makes it clear that the WACS_ symbols should be defined
+       X/Open Curses makes it clear that the WACS_ symbols should  be  defined
        as a pointer to cchar_t data, e.g., in the discussion of border_set.  A
        few implementations are problematic:
 
        o   NetBSD curses defines the symbols as a wchar_t within a cchar_t.
 
        o   HPUX curses equates some of the ACS_ symbols to the analogous WACS_
-           symbols as if the ACS_ symbols were wide  characters.   The  misde-
-           fined  symbols  are the arrows and other symbols which are not used
+           symbols  as  if  the ACS_ symbols were wide characters.  The misde-
+           fined symbols are the arrows and other symbols which are  not  used
            for line-drawing.
 
        X/Open Curses does not define symbols for thick- or double-lines.  SVr4
-       curses  implementations  defined their line-drawing symbols in terms of
-       intermediate symbols.  This implementation extends those symbols,  pro-
+       curses implementations defined their line-drawing symbols in  terms  of
+       intermediate  symbols.  This implementation extends those symbols, pro-
        viding new definitions which are not in the SVr4 implementations.
 
-       Not  all  Unicode-capable  terminals  provide  support  for VT100-style
+       Not all  Unicode-capable  terminals  provide  support  for  VT100-style
        alternate character sets (i.e., the acsc capability), with their corre-
-       sponding  line-drawing  characters.   X/Open Curses did not address the
-       aspect of integrating Unicode with line-drawing  characters.   Existing
-       implementations  of  Unix curses (AIX, HPUX, Solaris) use only the acsc
-       character-mapping to provide this feature.  As a result,  those  imple-
-       mentations  can  only use single-byte line-drawing characters.  Ncurses
-       5.3 (2002) provided a table of Unicode values to solve these  problems.
+       sponding line-drawing characters.  X/Open Curses did  not  address  the
+       aspect  of  integrating Unicode with line-drawing characters.  Existing
+       implementations of Unix curses (AIX, HPUX, Solaris) use only  the  acsc
+       character-mapping  to  provide this feature.  As a result, those imple-
+       mentations can only use single-byte line-drawing  characters.   Ncurses
+       5.3  (2002) provided a table of Unicode values to solve these problems.
        NetBSD curses incorporated that table in 2010.
 
        In this implementation, the Unicode values are used instead of the ter-
-       minal description's acsc mapping as discussed in  ncurses(3x)  for  the
-       environment  variable  NCURSES_NO_UTF8_ACS.   In contrast, for the same
+       minal  description's  acsc  mapping as discussed in ncurses(3x) for the
+       environment variable NCURSES_NO_UTF8_ACS.  In contrast,  for  the  same
        cases, the line-drawing characters described in curs_addch(3x) will use
        only the ASCII default values.
 
-       Having  Unicode available does not solve all of the problems with line-
+       Having Unicode available does not solve all of the problems with  line-
        drawing for curses:
 
-       o   The closest Unicode equivalents to the VT100 graphics  S1,  S3,  S7
-           and  S9 frequently are not displayed at the regular intervals which
+       o   The  closest  Unicode  equivalents to the VT100 graphics S1, S3, S7
+           and S9 frequently are not displayed at the regular intervals  which
            the terminal used.
 
-       o   The lantern is a special case.  It originated with  the  AT&T  4410
-           terminal  in the early 1980s.  There is no accessible documentation
+       o   The  lantern  is  a special case.  It originated with the AT&T 4410
+           terminal in the early 1980s.  There is no accessible  documentation
            depicting the lantern symbol on the AT&T terminal.
 
            Lacking documentation, most readers assume that a storm lantern was
            intended.  But there are several possibilities, all with problems.
 
-           Unicode  6.0  (2010)  does provide two lantern symbols: U+1F383 and
-           U+1F3EE.  Those were not available  in  2002,  and  are  irrelevant
-           since  they  lie  outside the BMP and as a result are not generally
+           Unicode 6.0 (2010) does provide two lantern  symbols:  U+1F383  and
+           U+1F3EE.   Those  were  not  available  in 2002, and are irrelevant
+           since they lie outside the BMP and as a result  are  not  generally
            available in terminals.  They are not storm lanterns, in any case.
 
            Most storm lanterns have a tapering glass chimney (to guard against
            tipping); some have a wire grid protecting the chimney.
 
-           For  the  tapering  appearance,   U+2603 was adequate.  In use on a
+           For the tapering appearance,  U+2603 was adequate.   In  use  on  a
            terminal, no one can tell what the image represents.  Unicode calls
            it a snowman.
 
-           Others  have suggested these alternatives: S U+00A7 (section mark),
+           Others have suggested these alternatives: S U+00A7 (section  mark),
            O U+0398 (theta), O U+03A6 (phi), d U+03B4 (delta),  U+2327 (x in a
-           rectangle),   U+256C  (forms  double  vertical and horizontal), and
+           rectangle),  U+256C (forms double  vertical  and  horizontal),  and
            U+2612 (ballot box with x).
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 718e72ef..07dd3565 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -246,7 +246,7 @@
        curses(3x)  and  related  pages  whose names begin "form_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index f85a01c4..9650c426 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -512,7 +512,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index dead6b14..af3603fc 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -90,7 +90,7 @@

SEE ALSO

        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).

AUTHOR

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index aac331f5..2281aa7c 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -221,7 +221,7 @@
        curses(3x)  and  related  pages  whose names begin "menu_" for detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index cc340b4c..e335a0c7 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -59,7 +59,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index e0adc9b7..6866495e 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -112,7 +112,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index 3396ecb7..edda0d01 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -204,7 +204,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).

AUTHOR

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 7f8e59c2..ccdf6d56 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -205,7 +205,7 @@

SEE ALSO

        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index e4c37dd0..21c70fdc 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -103,7 +103,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes ncurses version 6.1 (patch 20191012).
+       This manual describes ncurses version 6.1 (patch 20191026).

Terminfo Entry Syntax

diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index e003be0a..9923a5c0 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -460,7 +460,7 @@
        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
        term(5).  terminfo(5).  user_caps(5).
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 915216da..5ed97256 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -170,7 +170,7 @@
        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
        minfo(5).
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 36553080..c720b207 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -522,7 +522,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), tset(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index f3d0983c..ed6d6d16 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -389,7 +389,7 @@
        csh(1),  sh(1),  stty(1),   curs_terminfo(3x),   tty(4),   terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.1 (patch 20191012).
+       This describes ncurses version 6.1 (patch 20191026).
 
 
 
diff --git a/man/curs_add_wch.3x b/man/curs_add_wch.3x
index 1c50b2cd..245cc17e 100644
--- a/man/curs_add_wch.3x
+++ b/man/curs_add_wch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2001-2015,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2001-2017,2019 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_add_wch.3x,v 1.24 2017/11/18 23:47:37 tom Exp $
+.\" $Id: curs_add_wch.3x,v 1.25 2019/10/27 00:07:13 tom Exp $
 .TH curs_add_wch 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -155,7 +155,28 @@ WACS_VLINE	0x2502 	|	x	vertical line
 .TE
 .PP
 The wide-character configuration of ncurses also defines symbols
-for double-lines:
+for thick lines (\fBacsc\fP \*(``J\*('' to \*(``V\*(''):
+.TS
+l l l l l
+l l l l l
+_ _ _ _ _
+lw(1.5i) lw5 lw5 lw5 lw20.
+\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
+\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
+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
+.TE
+.PP
+and for double-lines (\fBacsc\fP \*(``A\*('' to \*(``I\*(''):
 .PP
 .TS
 l l l l l
@@ -177,26 +198,15 @@ WACS_D_URCORNER	0x2557	+	B	double upper right corner
 WACS_D_VLINE	0x2551	|	Y	double vertical line
 .TE
 .PP
-and for thick lines:
-.TS
-l l l l l
-l l l l l
-_ _ _ _ _
-lw(1.5i) lw5 lw5 lw5 lw20.
-\fBACS\fR	\fBUnicode\fP	\fBASCII\fR	\fBacsc\fP	\fBGlyph\fR
-\fBName\fR	\fBDefault\fP	\fBDefault\fR	\fBchar\fP	\fBName\fR
-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
-.TE
+Unicode's descriptions for these characters differs slightly from ncurses,
+by introducing the term \*(``light\*('' (along with less important details).
+Here are its descriptions for the normal, thick, and double horizontal lines:
+.bP
+U+2500 BOX DRAWINGS LIGHT HORIZONTAL
+.bP
+U+2501 BOX DRAWINGS HEAVY HORIZONTAL
+.bP
+U+2550 BOX DRAWINGS DOUBLE HORIZONTAL
 .SH RETURN VALUE
 .PP
 All routines return the integer \fBERR\fR upon failure and \fBOK\fR on success.
diff --git a/misc/terminfo.src b/misc/terminfo.src
index cd72ee47..571f7f54 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
 #
-#	$Revision: 1.765 $
-#	$Date: 2019/09/22 18:48:45 $
+#	$Revision: 1.766 $
+#	$Date: 2019/10/26 17:00:56 $
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
@@ -1126,10 +1126,16 @@ fbterm|FbTerm for Linux with framebuffer,
 # console font but bright background colors turn into dim ones when
 # you use a 512-character console font. This uses bold for bright
 # foreground colors and blink for bright background colors.
+#
+# Interestingly, the original version of this entry in 2009 used a documented
+# (but nonstandard) SGR 21, which was supported in the Linux console since 1992
+# as an equivalent for SGR 22.  Long after (early 2018), someone modified the
+# console driver to make it ignore SGR 21 because the ECMA-48 standard
+# suggested a different use for that particular code.
 linux-16color|linux console with 16 colors,
 	colors#16, ncv#42, pairs#0x100,
 	setab=\E[4%p1%{8}%m%d%?%p1%{7}%>%t;5%e;25%;m,
-	setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;21%;m,
+	setaf=\E[3%p1%{8}%m%d%?%p1%{7}%>%t;1%e;22%;m,
 	use=linux,
 
 # bterm (bogl 0.1.18)
@@ -26375,4 +26381,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 # 2019-09-22
 #	+ correct a comment -TD
 #
+# 2019-10-26
+#	+ modify linux-16color to accommodate Linux console driver change in
+#	  early 2018 (report by Dino Petrucci).
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/ncurses/tinfo/lib_tgoto.c b/ncurses/tinfo/lib_tgoto.c
index 292b2eb2..4173d74e 100644
--- a/ncurses/tinfo/lib_tgoto.c
+++ b/ncurses/tinfo/lib_tgoto.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2000-2012,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 2000-2018,2019 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -35,7 +35,7 @@
 #include 
 #include 
 
-MODULE_ID("$Id: lib_tgoto.c,v 1.17 2018/04/07 21:11:48 tom Exp $")
+MODULE_ID("$Id: lib_tgoto.c,v 1.18 2019/10/26 22:43:48 tom Exp $")
 
 #if !PURE_TERMINFO
 static bool
@@ -125,7 +125,14 @@ tgoto_internal(const char *string, int x, int y)
 			*value += 1;
 			need_BC = TRUE;
 		    } else {
-			*value = 0200;	/* tputs will treat this as \0 */
+			/* tputs will pretend this is \0, which will almost
+			 * always work since ANSI-compatible terminals ignore
+			 * the character.  ECMA-48 does not document a C1
+			 * control for this value.  A few (obsolete) terminals
+			 * can use this value in special cases, such as cursor
+			 * addressing using single-byte coordinates.
+			 */
+			*value = 0200;
 		    }
 		}
 		result[used++] = (char) *value++;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index d989a882..738d038a 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191019) unstable; urgency=low
+ncurses6 (6.1+20191026) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
+ -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index d989a882..738d038a 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191019) unstable; urgency=low
+ncurses6 (6.1+20191026) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
+ -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 5d9407be..0ac55881 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20191019) unstable; urgency=low
+ncurses6 (6.1+20191026) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 19 Oct 2019 08:47:53 -0400
+ -- Thomas E. Dickey   Sat, 26 Oct 2019 04:56:47 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 477c8e63..62e9d41b 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.357 2019/10/19 12:47:53 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.358 2019/10/26 08:56:47 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "1"
 !define VERSION_YYYY  "2019"
-!define VERSION_MMDD  "1019"
+!define VERSION_MMDD  "1026"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 0a21e211..2e876e29 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1
-Release: 20191019
+Release: 20191026
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index f8e10072..e7a04ce5 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
-Release: 20191019
+Release: 20191026
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index dc2a7cda..d9477a32 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1
-Release: 20191019
+Release: 20191026
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz