From: Thomas E. Dickey Date: Sun, 19 May 2019 00:40:25 +0000 (+0000) Subject: ncurses 6.1 - patch 20190518 X-Git-Tag: v6.2~38 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=8f6d94b8d6211a2323caef53fa4c96c475ec9a62 ncurses 6.1 - patch 20190518 + update xterm-new to xterm patch #345 -TD + add/use xterm+keypad in xterm-new (report by Alain D D Williams) -TD + update terminator entry -TD + remove hard-tabs from ti703 (report by Robert Clausecker) + mention meml/memu/box1 in user_caps manual page. + mention user_caps.5 in tic and infocmp manual pages. --- diff --git a/NEWS b/NEWS index 50bc9c48..ee18e84f 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.3317 2019/05/11 21:20:49 tom Exp $ +-- $Id: NEWS,v 1.3320 2019/05/19 00:12:03 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. +20190518 + + update xterm-new to xterm patch #345 -TD + + add/use xterm+keypad in xterm-new (report by Alain D D Williams) -TD + + update terminator entry -TD + + remove hard-tabs from ti703 (report by Robert Clausecker) + + mention meml/memu/box1 in user_caps manual page. + + mention user_caps.5 in tic and infocmp manual pages. + 20190511 + fix a spurious blank line seen with "infocmp -1fx xterm+x11mouse" + add checks in repair_subwindows() to keep the current position and diff --git a/VERSION b/VERSION index b529c225..0a9b1d8f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20190511 +5:0:10 6.1 20190518 diff --git a/dist.mk b/dist.mk index f6e7d5c3..dfb0b249 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.1282 2019/05/10 20:55:16 tom Exp $ +# $Id: dist.mk,v 1.1283 2019/05/18 10:29:53 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 = 20190511 +NCURSES_PATCH = 20190518 # 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 b49bded6..cf21a4ef 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index ed7f186c..1b764725 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -190,7 +190,7 @@

SEE ALSO

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

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 2fcfef5b..eb1ccb05 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/curs_getcchar.3x.html b/doc/html/man/curs_getcchar.3x.html
index b3e87044..ecc6ba7c 100644
--- a/doc/html/man/curs_getcchar.3x.html
+++ b/doc/html/man/curs_getcchar.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getcchar.3x,v 1.20 2019/03/23 21:51:51 tom Exp @
+  * @Id: curs_getcchar.3x,v 1.21 2019/03/24 00:59:45 tom Exp @
 -->
 
 
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 2a05fe5e..bcd077b4 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_sp_funcs.3x,v 1.13 2019/03/23 23:04:13 tom Exp @
+  * @Id: curs_sp_funcs.3x,v 1.16 2019/04/13 16:41:08 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -53,7 +53,7 @@

SYNOPSIS

-       #include <curses.h>
+       #include <curses.h> #include <term.h>
 
        int alloc_pair_sp(SCREEN*, int, int);
        int assume_default_colors_sp(SCREEN*, int, int);
@@ -142,7 +142,7 @@
        int slk_clear_sp(SCREEN*);
        int slk_color_sp(SCREEN*, short);
        int slk_init_sp(SCREEN*, int);
-       char * slk_label_sp(SCREEN*, int);
+       char* slk_label_sp(SCREEN*, int);
        int slk_noutrefresh_sp(SCREEN*);
        int slk_refresh_sp(SCREEN*);
        int slk_restore_sp(SCREEN*);
@@ -159,7 +159,7 @@
        int unget_wch_sp(SCREEN*, const wchar_t);
        int use_default_colors_sp(SCREEN*);
        void use_env_sp(SCREEN*, bool);
-       void use_tioctl_sp (SCREEN *, bool);
+       void use_tioctl_sp(SCREEN *, bool);
        int use_legacy_coding_sp(SCREEN*, int);
        int vid_attr_sp(SCREEN*, attr_t, short, void *);
        int vidattr_sp(SCREEN*, chtype);
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 9882803a..6e4bb87a 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 170819a0..20ee73ec 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -1,7 +1,7 @@
 
 
 
@@ -448,9 +448,9 @@
        -w width
             changes the output to width characters.
 
-       -x   print information for user-defined capabilities.  These are exten-
-            sions to the terminfo repertoire which can be loaded using the  -x
-            option of tic.
+       -x   print information for user-defined capabilities (see user_caps(5).
+            These are extensions to  the  terminfo  repertoire  which  can  be
+            loaded using the -x option of tic.

FILES

@@ -477,11 +477,11 @@

SEE ALSO

        captoinfo(1m),   infotocap(1m),   tic(1m),  toe(1m),  curses(3x),  ter-
-       minfo(5).
+       minfo(5).  user_caps(5).
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.1 (patch 20190323).
+       This describes ncurses version 6.1 (patch 20190518).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 9227b1f9..7e647d8d 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -85,7 +85,7 @@

SEE ALSO

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

AUTHOR

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index f02b450f..30cce931 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 8ec662d6..5a8d917a 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
        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 d89bedbc..7345d2bf 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index d541bd51..0a199d10 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).

AUTHOR

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 8f50d22d..bdd8f6ac 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -170,7 +170,7 @@

SEE ALSO

        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.1 (patch 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 89ced522..09ba56ca 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -74,7 +74,7 @@
        Terminfo describes terminals by giving a set of capabilities which they
        have, by specifying how to perform screen operations, and by specifying
        padding  requirements  and  initialization  sequences.   This describes
-       ncurses version 6.1 (patch 20190323).
+       ncurses version 6.1 (patch 20190518).

Terminfo Entry Syntax

diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 7d26a1b0..9b0b6212 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -1,6 +1,6 @@
 
 
 
@@ -284,74 +284,75 @@
        -wn  specifies the width of the output.  The parameter is optional.  If
             it is omitted, it defaults to 60.
 
-       -x   Treat  unknown capabilities as user-defined.  That is, if you sup-
-            ply a capability name which tic does not recognize, it will  infer
-            its  type  (boolean, number or string) from the syntax and make an
-            extended table entry for that.   User-defined  capability  strings
-            whose name begins with "k" are treated as function keys.
+       -x   Treat  unknown  capabilities  as  user-defined (see user_caps(5)).
+            That is, if you supply a capability name which tic does not recog-
+            nize,  it will infer its type (boolean, number or string) from the
+            syntax and make an extended table entry  for  that.   User-defined
+            capability strings whose name begins with "k" are treated as func-
+            tion keys.

PARAMETERS

-       file   contains  one  or  more terminfo terminal descriptions in source
-              format  [see  terminfo(5)].   Each  description  in   the   file
+       file   contains one or more terminfo terminal  descriptions  in  source
+              format   [see   terminfo(5)].   Each  description  in  the  file
               describes the capabilities of a particular terminal.
 
-              If  file  is "-", then the data is read from the standard input.
+              If file is "-", then the data is read from the  standard  input.
               The file parameter may also be the path of a character-device.

PROCESSING

-       All but one of the capabilities recognized by  tic  are  documented  in
+       All  but  one  of  the capabilities recognized by tic are documented in
        terminfo(5).  The exception is the use capability.
 
        When a use=entry-name field is discovered in a terminal entry currently
-       being compiled, tic reads in the  binary  from  /usr/share/terminfo  to
-       complete  the  entry.   (Entries  created from file will be used first.
-       tic duplicates the capabilities in entry-name for  the  current  entry,
+       being  compiled,  tic  reads  in the binary from /usr/share/terminfo to
+       complete the entry.  (Entries created from file  will  be  used  first.
+       tic  duplicates  the  capabilities in entry-name for the current entry,
        with the exception of those capabilities that explicitly are defined in
        the current entry.
 
-       When an entry, e.g., entry_name_1, contains a  use=entry_name_2  field,
-       any   canceled   capabilities  in  entry_name_2  must  also  appear  in
-       entry_name_1 before use= for  these  capabilities  to  be  canceled  in
+       When  an  entry, e.g., entry_name_1, contains a use=entry_name_2 field,
+       any  canceled  capabilities  in  entry_name_2  must  also   appear   in
+       entry_name_1  before  use=  for  these  capabilities  to be canceled in
        entry_name_1.
 
        Total compiled entries cannot exceed 4096 bytes.  The name field cannot
-       exceed 512 bytes.  Terminal names exceeding the  maximum  alias  length
+       exceed  512  bytes.   Terminal names exceeding the maximum alias length
        (32 characters on systems with long filenames, 14 characters otherwise)
-       will be truncated to the maximum alias length  and  a  warning  message
+       will  be  truncated  to  the maximum alias length and a warning message
        will be printed.

COMPATIBILITY

-       There  is  some  evidence  that  historic  tic  implementations treated
-       description fields with no whitespace in them as additional aliases  or
+       There is  some  evidence  that  historic  tic  implementations  treated
+       description  fields with no whitespace in them as additional aliases or
        short names.  This tic does not do that, but it does warn when descrip-
-       tion fields may be treated that way and check them for dangerous  char-
+       tion  fields may be treated that way and check them for dangerous char-
        acters.

EXTENSIONS

-       Unlike  the  SVr4 tic command, this implementation can actually compile
-       termcap sources.  In fact, entries in terminfo and termcap  syntax  can
-       be  mixed  in  a  single  source file.  See terminfo(5) for the list of
+       Unlike the SVr4 tic command, this implementation can  actually  compile
+       termcap  sources.   In fact, entries in terminfo and termcap syntax can
+       be mixed in a single source file.  See  terminfo(5)  for  the  list  of
        termcap names taken to be equivalent to terminfo names.
 
-       The SVr4 manual pages are not clear on the  resolution  rules  for  use
-       capabilities.   This  implementation  of tic will find use targets any-
-       where in the source file, or anywhere in the file tree rooted  at  TER-
-       MINFO  (if TERMINFO is defined), or in the user's $HOME/.terminfo data-
+       The  SVr4  manual  pages  are not clear on the resolution rules for use
+       capabilities.  This implementation of tic will find  use  targets  any-
+       where  in  the source file, or anywhere in the file tree rooted at TER-
+       MINFO (if TERMINFO is defined), or in the user's $HOME/.terminfo  data-
        base (if it exists), or (finally) anywhere in the system's file tree of
        compiled entries.
 
-       The  error  messages  from this tic have the same format as GNU C error
+       The error messages from this tic have the same format as  GNU  C  error
        messages, and can be parsed by GNU Emacs's compile facility.
 
-       The -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s,  -t
+       The  -0, -1, -C, -G, -I, -N, -R, -T, -V, -a, -e, -f, -g, -o, -r, -s, -t
        and -x options are not supported under SVr4.  The SVr4 -c mode does not
        report bad use links.
 
-       System V does  not  compile  entries  to  or  read  entries  from  your
+       System  V  does  not  compile  entries  to  or  read  entries from your
        $HOME/.terminfo database unless TERMINFO is explicitly set to it.
 
 
@@ -362,9 +363,9 @@

SEE ALSO

        infocmp(1m),   captoinfo(1m),   infotocap(1m),   toe(1m),   curses(3x),
-       term(5).  terminfo(5).
+       term(5).  terminfo(5).  user_caps(5).
 
-       This describes ncurses version 6.1 (patch 20190323).
+       This describes ncurses version 6.1 (patch 20190518).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 8e750e6a..2d4a174c 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -113,7 +113,7 @@
        tic(1m), infocmp(1m), captoinfo(1m),  infotocap(1m),  curses(3x),  ter-
        minfo(5).
 
-       This describes ncurses version 6.1 (patch 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 3241e5b3..996bf11e 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index ed8f849b..4131977a 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 20190323).
+       This describes ncurses version 6.1 (patch 20190518).
 
 
 
diff --git a/doc/html/man/user_caps.5.html b/doc/html/man/user_caps.5.html
index 489c0d25..6d6e9126 100644
--- a/doc/html/man/user_caps.5.html
+++ b/doc/html/man/user_caps.5.html
@@ -90,7 +90,33 @@
 
            While  ncurses' repertoire of predefined capabilities is closest to
            Solaris, Solaris's terminfo database has a few differences from the
-           list published by X/Open Curses.
+           list  published by X/Open Curses.  For example, ncurses can be con-
+           figured with tables which match the terminal databases for AIX, HP-
+           UX or OSF/1, rather than the default Solaris-like configuration.
+
+       o   In  SVr4  curses  and  ncurses, the terminal database is defined at
+           compile-time using a text file which lists the  different  terminal
+           capabilities.
+
+           In  principle,  the  text-file  can  be  extended,  but  doing this
+           requires recompiling and reinstalling the library.   The  text-file
+           used in ncurses for terminal capabilities includes details for var-
+           ious systems past the documented X/Open Curses features.  For exam-
+           ple, ncurses supports these capabilities in each configuration:
+
+               memory_lock
+                    (meml) lock memory above cursor
+
+               memory_unlock
+                    (memu) unlock memory
+
+               box_chars_1
+                    (box1) box characters primary set
+
+           The memory lock/unlock capabilities were included because they were
+           used in the X11R6 terminal description for xterm.  The  box1  capa-
+           bility  is  used  in tic to help with terminal descriptions written
+           for AIX.
 
        During the 1990s, some users were reluctant to use terminfo in spite of
        its performance advantages over termcap:
@@ -99,111 +125,111 @@
            ticipated terminal improvements (or required them to reuse existing
            capabilities as a workaround).
 
-       o   The limitation  to  16-bit  signed  integers  was  also  mentioned.
-           Because  termcap  stores everything as a string, it could represent
+       o   The  limitation  to  16-bit  signed  integers  was  also mentioned.
+           Because termcap stores everything as a string, it  could  represent
            larger numbers.
 
-       Although termcap's extensibility was rarely  used  (it  was  never  the
-       speaker  who had actually used the feature), the criticism had a point.
-       ncurses 5.0 provided a way to detect nonstandard  capabilities,  deter-
-       mine  their  type and optionally store and retrieve them in a way which
-       did not interfere with other applications.  These are  referred  to  as
-       user-defined  capabilities  because  no  modifications to the toolset's
+       Although  termcap's  extensibility  was  rarely  used (it was never the
+       speaker who had actually used the feature), the criticism had a  point.
+       ncurses  5.0  provided a way to detect nonstandard capabilities, deter-
+       mine their type and optionally store and retrieve them in a  way  which
+       did  not  interfere  with other applications.  These are referred to as
+       user-defined capabilities because no  modifications  to  the  toolset's
        predefined capability names are needed.
 
-       The ncurses utilities tic and infocmp have a command-line  option  "-x"
-       to   control   whether  the  nonstandard  capabilities  are  stored  or
-       retrieved.  A library function use_extended_names is provided  for  the
+       The  ncurses  utilities tic and infocmp have a command-line option "-x"
+       to  control  whether  the  nonstandard  capabilities  are   stored   or
+       retrieved.   A  library function use_extended_names is provided for the
        same purpose.
 
-       When  compiling  a  terminal database, if "-x" is set, tic will store a
+       When compiling a terminal database, if "-x" is set, tic  will  store  a
        user-defined capability if the capability name is not one of the prede-
        fined names.
 
-       Because  ncurses  provides  a  termcap  library  interface, these user-
+       Because ncurses provides  a  termcap  library  interface,  these  user-
        defined capabilities may be visible to termcap applications:
 
-       o   The  termcap  interface  (like  all  implementations  of   termcap)
+       o   The   termcap  interface  (like  all  implementations  of  termcap)
            requires that the capability names are 2-characters.
 
-           When  the capability is simple enough for use in a termcap applica-
+           When the capability is simple enough for use in a termcap  applica-
            tion, it is provided as a 2-character name.
 
-       o   There are other user-defined capabilities which refer  to  features
-           not  usable  in  termcap, e.g., parameterized strings that use more
+       o   There  are  other user-defined capabilities which refer to features
+           not usable in termcap, e.g., parameterized strings  that  use  more
            than two parameters or use more than the trivial expression support
-           provided  by termcap.  For these, the terminfo database should have
+           provided by termcap.  For these, the terminfo database should  have
            only capability names with 3 or more characters.
 
        o   Some terminals can send distinct strings for special keys (cursor-,
-           keypad-  or  function-keys) depending on modifier keys (shift, con-
-           trol, etc.).  While terminfo and termcap have a set  of  60  prede-
-           fined  function-key  names,  to  which  a  series  of  keys  can be
-           assigned, that is insufficient for more than a  dozen  keys  multi-
-           plied  by more than a couple of modifier combinations.  The ncurses
-           database uses a convention based on xterm to provide extended  spe-
+           keypad- or function-keys) depending on modifier keys  (shift,  con-
+           trol,  etc.).   While  terminfo and termcap have a set of 60 prede-
+           fined function-key  names,  to  which  a  series  of  keys  can  be
+           assigned,  that  is  insufficient for more than a dozen keys multi-
+           plied by more than a couple of modifier combinations.  The  ncurses
+           database  uses a convention based on xterm to provide extended spe-
            cial-key names.
 
-           Fitting  that  into termcap's limitation of 2-character names would
-           be pointless.  These extended keys are  available  only  with  ter-
+           Fitting that into termcap's limitation of 2-character  names  would
+           be  pointless.   These  extended  keys are available only with ter-
            minfo.

Recognized capabilities

-       The  ncurses  library  uses the user-definable capabilities.  While the
-       terminfo database may have other  extensions,  ncurses  makes  explicit
+       The ncurses library uses the user-definable  capabilities.   While  the
+       terminfo  database  may  have  other extensions, ncurses makes explicit
        checks for these:
 
-          AX boolean,  asserts  that the terminal interprets SGR 39 and SGR 49
-             by resetting the foreground and background  color,  respectively,
+          AX boolean, asserts that the terminal interprets SGR 39 and  SGR  49
+             by  resetting  the foreground and background color, respectively,
              to the default.
 
              This is a feature recognized by the screen program as well.
 
-          E3 string,  tells  how  to  clear  the terminal's scrollback buffer.
+          E3 string, tells how to  clear  the  terminal's  scrollback  buffer.
              When present, the clear(1) program sends this before clearing the
              terminal.
 
              The command "tput clear" does the same thing.
 
           RGB
-             boolean,  number  or  string, to assert that the set_a_foreground
-             and set_a_background capabilities correspond  to  direct  colors,
+             boolean, number or string, to assert  that  the  set_a_foreground
+             and  set_a_background  capabilities  correspond to direct colors,
              using an RGB (red/green/blue) convention.  This capability allows
-             the color_content function to return appropriate  values  without
+             the  color_content  function to return appropriate values without
              requiring the application to initialize colors using init_color.
 
              The capability type determines the values which ncurses sees:
 
              boolean
-                implies  that  the  number of bits for red, green and blue are
-                the same.  Using the maximum number of  colors,  ncurses  adds
+                implies that the number of bits for red, green  and  blue  are
+                the  same.   Using  the maximum number of colors, ncurses adds
                 two, divides that sum by three, and assigns the result to red,
                 green and blue in that order.
 
                 If the number of bits needed for the number of colors is not a
-                multiple  of  three,  the  blue (and green) components lose in
+                multiple of three, the blue (and  green)  components  lose  in
                 comparison to red.
 
              number
-                tells ncurses what result to add to red, green and  blue.   If
+                tells  ncurses  what result to add to red, green and blue.  If
                 ncurses runs out of bits, blue (and green) lose just as in the
                 boolean case.
 
              string
-                explicitly list the number of bits used  for  red,  green  and
+                explicitly  list  the  number  of bits used for red, green and
                 blue components as a slash-separated list of decimal integers.
 
-             Because  there  are  several  RGB  encodings in use, applications
-             which make assumptions about the number of  bits  per  color  are
-             unlikely  to  work reliably.  As a trivial case, for example, one
-             could define RGB#1 to represent the standard eight  ANSI  colors,
+             Because there are several  RGB  encodings  in  use,  applications
+             which  make  assumptions  about  the number of bits per color are
+             unlikely to work reliably.  As a trivial case, for  example,  one
+             could  define  RGB#1 to represent the standard eight ANSI colors,
              i.e., one bit per color.
 
-          U8 number,  asserts  that  ncurses must use Unicode values for line-
+          U8 number, asserts that ncurses must use Unicode  values  for  line-
              drawing characters, and that it should ignore the alternate char-
-             acter  set capabilities when the locale uses UTF-8 encoding.  For
-             more information, see the discussion  of  NCURSES_NO_UTF8_ACS  in
+             acter set capabilities when the locale uses UTF-8 encoding.   For
+             more  information,  see  the discussion of NCURSES_NO_UTF8_ACS in
              ncurses(3x).
 
              Set this capability to a nonzero value to enable it.
@@ -214,17 +240,17 @@

Extended key-definitions

        Several terminals provide the ability to send distinct strings for com-
-       binations  of  modified  special  keys.   There is no standard for what
+       binations of modified special keys.  There  is  no  standard  for  what
        those keys can send.
 
        Since 1999, xterm has supported shift, control, alt, and meta modifiers
        which produce distinct special-key strings.  In a terminal description,
-       ncurses has no special knowledge of the modifiers  used.   Applications
-       can  use the naming convention established for xterm to find these spe-
+       ncurses  has  no special knowledge of the modifiers used.  Applications
+       can use the naming convention established for xterm to find these  spe-
        cial keys in the terminal description.
 
-       Starting with the curses convention that key names begin with  "k"  and
-       that  shifted  special  keys  are  an uppercase name, ncurses' terminal
+       Starting  with  the curses convention that key names begin with "k" and
+       that shifted special keys are  an  uppercase  name,  ncurses'  terminal
        database defines these names to which a suffix is added:
 
             Name   Description
@@ -245,7 +271,6 @@
             ----------------------------------
             2       Shift
             3       Alt
-
             4       Shift + Alt
             5       Control
             6       Shift + Control
@@ -260,25 +285,25 @@
             15      Meta + Ctrl + Alt
             16      Meta + Ctrl + Alt + Shift
 
-       None of these are predefined; terminal descriptions can refer to  names
+       None  of these are predefined; terminal descriptions can refer to names
        which ncurses will allocate at runtime to key-codes.  To use these keys
        in an ncurses program, an application could do this:
 
        o   using a list of extended key names, ask tigetstr(3x) for their val-
            ues, and
 
-       o   given  the  list  of  values,  ask key_defined(3x) for the key-code
+       o   given the list of values,  ask  key_defined(3x)  for  the  key-code
            which would be returned for those keys by wgetch(3x).

PORTABILITY

-       The "-x" extension feature of tic and infocmp has been adopted in  Net-
-       BSD  curses.  That implementation stores user-defined capabilities, but
+       The  "-x" extension feature of tic and infocmp has been adopted in Net-
+       BSD curses.  That implementation stores user-defined capabilities,  but
        makes no use of these capabilities itself.

SEE ALSO

-       tic(1), infocmp(1).
+       tic(1m), infocmp(1m).

AUTHORS

diff --git a/man/infocmp.1m b/man/infocmp.1m
index 9b187e29..d12df261 100644
--- a/man/infocmp.1m
+++ b/man/infocmp.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-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            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infocmp.1m,v 1.73 2018/07/28 22:08:59 tom Exp $
+.\" $Id: infocmp.1m,v 1.74 2019/05/18 22:00:55 tom Exp $
 .TH @INFOCMP@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -553,7 +553,7 @@ Use the \fB\-W\fP option to do this.
 changes the output to \fIwidth\fR characters.
 .TP
 \fB\-x\fR
-print information for user-defined capabilities.
+print information for user-defined capabilities (see \fBuser_caps(\*n)\fP.
 These are extensions to the terminfo repertoire which can be loaded
 using the \fB\-x\fR option of \fB@TIC@\fP.
 .SH FILES
@@ -602,6 +602,7 @@ The \fB\-F\fR option of \fB@INFOCMP@\fR(1M) should be a \fB@TOE@\fR(1M) mode.
 \fB@TOE@\fR(1M),
 \fBcurses\fR(3X),
 \fBterminfo\fR(\*n).
+\fBuser_caps\fR(\*n).
 .sp
 https://invisible-island.net/ncurses/tctest.html
 .PP
diff --git a/man/tic.1m b/man/tic.1m
index e0bf36fd..a3b16917 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-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            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tic.1m,v 1.67 2018/05/19 21:07:46 tom Exp $
+.\" $Id: tic.1m,v 1.68 2019/05/18 21:59:56 tom Exp $
 .TH @TIC@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -205,7 +205,7 @@ the list, the entry will be written or translated as normal.
 Otherwise no output will be generated for it.
 The option value is interpreted as a file containing the list if it
 contains a '/'.
-(Note: depending on how tic was compiled,
+(Note: depending on how @TIC@ was compiled,
 this option may require \fB\-I\fR or \fB\-C\fR.)
 .TP
 \fB\-f\fR
@@ -358,7 +358,7 @@ The parameter is optional.
 If it is omitted, it defaults to 60.
 .TP
 \fB\-x\fR
-Treat unknown capabilities as user-defined.
+Treat unknown capabilities as user-defined (see \fBuser_caps(\*n)\fP).
 That is, if you supply a capability name which \fB@TIC@\fP does not recognize,
 it will infer its type (boolean, number or string) from the syntax and
 make an extended table entry for that.
@@ -467,6 +467,7 @@ Compiled terminal description database.
 \fBcurses\fR(3X),
 \fBterm\fR(\*n).
 \fBterminfo\fR(\*n).
+\fBuser_caps\fR(\*n).
 .PP
 This describes \fBncurses\fR
 version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
diff --git a/man/user_caps.5 b/man/user_caps.5
index 032ae7e0..c90aee54 100644
--- a/man/user_caps.5
+++ b/man/user_caps.5
@@ -53,7 +53,7 @@
 .SH NAME
 user_caps \- user-defined terminfo capabilities
 .SH SYNOPSIS
-.B tic -x, infocmp -x
+.B @TIC@ -x, @INFOCMP@ -x
 .SH DESCRIPTION
 .SS Background
 .PP
@@ -94,6 +94,38 @@ while others were added (out of order) to comply with X/Open Curses.
 While ncurses' repertoire of predefined capabilities is closest to Solaris,
 Solaris's terminfo database has a few differences from
 the list published by X/Open Curses.
+For example, ncurses can be configured with tables which match the
+terminal databases for AIX, HP-UX or OSF/1,
+rather than the default Solaris-like configuration.
+.bP
+In SVr4 curses and ncurses,
+the terminal database is defined at compile-time using a text file
+which lists the different terminal capabilities.
+.IP
+In principle, the text-file can be extended,
+but doing this requires recompiling and reinstalling the library.
+The text-file used in ncurses for terminal capabilities includes
+details for various systems past the documented X/Open Curses features.
+For example, ncurses supports these capabilities in each configuration:
+.RS 8
+.TP 5
+memory_lock
+(meml)
+lock memory above cursor
+.TP 5
+memory_unlock
+(memu)
+unlock memory
+.TP 5
+box_chars_1
+(box1)
+box characters primary set
+.RE
+.IP
+The memory lock/unlock capabilities were included because they were used
+in the X11R6 terminal description for \fBxterm\fP.
+The \fIbox1\fP capability is used in @TIC@ to help with terminal descriptions
+written for AIX. 
 .PP
 During the 1990s, some users were reluctant to use terminfo
 in spite of its performance advantages over termcap:
@@ -116,14 +148,14 @@ with other applications.
 These are referred to as \fIuser-defined capabilities\fP because no
 modifications to the toolset's predefined capability names are needed.
 .PP
-The ncurses utilities \fBtic\fP and \fBinfocmp\fP have a command-line
+The ncurses utilities \fB@TIC@\fP and \fB@INFOCMP@\fP have a command-line
 option \*(``\-x\*('' to control whether the nonstandard capabilities
 are stored or retrieved.
 A library function \fBuse_extended_names\fP
 is provided for the same purpose.
 .PP
 When compiling a terminal database, if \*(``\-x\*('' is set,
-\fBtic\fP will store a user-defined capability if the capability name is not
+\fB@TIC@\fP will store a user-defined capability if the capability name is not
 one of the predefined names.
 .PP
 Because ncurses provides a termcap library interface,
@@ -300,14 +332,14 @@ would be returned for those keys by \fBwgetch\fP(3X).
 .PP
 .SH PORTABILITY
 .PP
-The \*(``\-x\*('' extension feature of \fBtic\fP and \fBinfocmp\fP
+The \*(``\-x\*('' extension feature of \fB@TIC@\fP and \fB@INFOCMP@\fP
 has been adopted in NetBSD curses.
 That implementation stores user-defined capabilities,
 but makes no use of these capabilities itself.
 .SH SEE ALSO
 .PP
-\fBtic\fR(1),
-\fBinfocmp\fR(1).
+\fB@TIC@\fR(1M),
+\fB@INFOCMP@\fR(1M).
 .SH AUTHORS
 .PP
 Thomas E. Dickey
diff --git a/misc/terminfo.src b/misc/terminfo.src
index c37faae8..e42a7741 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.729 $
-#	$Date: 2019/03/30 22:59:53 $
+#	$Revision: 1.738 $
+#	$Date: 2019/05/18 23:53:50 $
 #
 # 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
@@ -2737,6 +2737,10 @@ vt340|dec-vt340|vt330|dec-vt330|dec vt340 graphics terminal with 24 line page,
 	smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
 	tsl=\E[2$~\E[1$}\E[1;%dH,
 
+# Left/right margins are supported in xterm since patch #279 (2012/05/10)
+vt420+lrmm|VT420 left/right margins,
+	mgc=\E[?69l, smglr=\E[?69h\E[%i%p1%d;%p2%ds,
+
 # DEC doesn't supply a vt400 description, so we add Daniel Glasser's
 # (originally written with vt420 as its primary name, and usable for it).
 #
@@ -4337,10 +4341,10 @@ xterm-xfree86|xterm terminal emulator (XFree86),
 # This version reflects the current xterm features.
 xterm-new|modern xterm terminal emulator,
 	npc,
-	indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
-	rin=\E[%p1%dT, use=ansi+rep, use=ecma+strikeout,
-	use=xterm+sm+1006, use=xterm+pcfkeys, use=xterm+tmux,
-	use=xterm-basic,
+	indn=\E[%p1%dS, kcbt=\E[Z, kent=\EOM, rin=\E[%p1%dT,
+	use=ansi+rep, use=ecma+strikeout, use=xterm+keypad,
+	use=vt420+lrmm, use=xterm+sm+1006, use=xterm+pcfkeys,
+	use=xterm+tmux, use=xterm-basic,
 
 # This fragment is for people who cannot agree on what the backspace key
 # should send.
@@ -4521,6 +4525,38 @@ xterm+titlestack|xterm 251 feature,
 
 xterm+alt+title|xterm 90 and 251 features combined,
 	rmcup=\E[?1049l\E[23;0;0t, smcup=\E[?1049h\E[22;0;0t,
+
+# https://invisible-island.net/xterm/xterm.faq.html#xterm_keypad
+#
+# Xterm's emulation of the VT100 numeric keypad on a PC-keyboard runs into the
+# problem that the keypad layout is different, and that the natural choice for
+# PF1 is NumLock (which happens to be reserved for other use).  To work around
+# that, PF1-PF4 are emulated via F1-F4, which leaves the "/", "*" and "+" not
+# directly related to VT100.
+#
+# With the VT220 keypad block that uses the 1-9 keys as suggested in
+# terminfo(5), the other keys can be handled with user-defined capabilities:
+#
+#   _______________________________________
+#  | NumLock |    /    |    *    |    -    |
+#  |         |   $Oo   |   $Oj   |   $OS   |
+#  |_________|__kpDIV__|__kpMUL__|__kpSUB__|
+#  |    7         8         9    |         |
+#  |   $Ow   |   $Ox   |   $Oy   |    +    |
+#  |_ka1__K1_|_________|_ka3__K3_|   $Ok   |
+#  |    4    |    5    |    6    |  kpADD  |
+#  |   $Ot   |   $Ou   |   $Ov   |         |
+#  |_________|_kb2__K2_|_________|_________|
+#  |    1    |    2    |    3    |         |
+#  |   $Oq   |   $Or   |   $Os   |         |
+#  |_kc1__K4_|_________|_kc3__K5_|  enter  |
+#  |         0         |   .     |   $OM   |
+#  |        $Op        |  $On    |         |
+#  |___________________|_________|_kent_@8_|
+#
+xterm+keypad|xterm emulating VT100/VT220 numeric keypad,
+	kp5=\EOE, kpADD=\EOk, kpCMA=\EOl, kpDIV=\EOo, kpDOT=\EOn,
+	kpMUL=\EOj, kpSUB=\EOm, kpZRO=\EOp, use=vt220+keypad,
 #
 # Those chunks use the new-style (the xterm oldFunctionKeys resource is false).
 # Alternatively, the same scheme with old-style function keys as in xterm-r6
@@ -4583,8 +4619,7 @@ xterm-16color|xterm with 16 colors like aixterm,
 	ccc,
 	initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*
 	      %{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\,
-	oc=\E]104\007, rs1=\Ec\E]104\007, use=ibm+16color,
-	use=xterm-new,
+	use=xterm+osc104, use=ibm+16color, use=xterm-new,
 
 # 256-colors is a compile-time feature of XFree86 xterm beginning with
 # xterm patch #111 (1999/7/10) -TD
@@ -4600,6 +4635,12 @@ xterm+256color|xterm 256-color feature,
 	      ;%p1%d%;m,
 	setb@, setf@,
 
+# xterm OSC 104 resets the color palette.  Using it as part of xterm+256color
+# has the drawback that some of the xterm-alikes which use that building block
+# require a different approach to rs1 -TD
+xterm+osc104|reset color palette,
+	oc=\E]104\007, rs1=\Ec\E]104\007,
+
 # palette is hardcoded...
 xterm+256setaf|xterm 256-color (set-only),
 	ccc@,
@@ -4632,9 +4673,9 @@ xterm+88color|xterm 88-color feature,
 
 # These variants of XFree86 3.9.16 xterm are built as a configure option.
 xterm-256color|xterm with 256 colors,
-	rs1=\Ec\E]104\007, use=xterm+256color, use=xterm-new,
+	use=xterm+osc104, use=xterm+256color, use=xterm-new,
 xterm-88color|xterm with 88 colors,
-	rs1=\Ec\E]104\007, use=xterm+88color,
+	use=xterm+osc104, use=xterm+88color,
 	use=xterm-256color,
 
 # Emacs 26.1 and later support direct color mode in terminals, using a
@@ -6457,10 +6498,10 @@ st-256color|stterm-256color|simpleterm with 256 colors,
 #### TERMINATOR
 # https://github.com/software-jessies-org/jessies/wiki/Terminator
 #
-# Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit
+# Tested using the Debian package org.jessies.terminator 6.104.3256 on 64-bit
 # Debian/current -TD (2011/8/20)
 #
-# There are some packaging problems:
+# There were some packaging problems:
 # a) using Java, the program starts off using 50Mb, and climbs from there,
 #    up to 114Mb after testing (no scrollback).
 # b) it insists on reinstalling its terminal description in $HOME/.terminfo
@@ -6494,8 +6535,40 @@ st-256color|stterm-256color|simpleterm with 256 colors,
 # c) modified smacs/rmacs to use SCS rather than SI/SO
 # d) removed bce
 # e) removed km
+#
+# Revisiting in May 2019, the Debian package was no longer available, and a
+# developer-provided ".deb" does not work.  However, a usable Windows ".msi"
+# (which relies upon Cygwin) can be tested.  The developers provide a terminfo,
+# but some of the features it lists do not work reliably (bce, italics, invis).
+#
+# tack:
+#	tbc fails
+#	invis attribute fails
+#	key-definitions could be expanded, with some work:
+#	+ supports xterm-style cursor key-modifiers for shift
+#	+ supports xterm-style function key-modifiers for shift,control,alt
+#	+ supports xterm-style editing key-modifiers for shift,control,alt
+#	(kbs=^?)
+# ncurses test-program:
+#	"C" menu shows that bce implementation is incomplete
+#	italics did not work
+#	dim worked once in tack, but not in ncurses test-program
+#	"F" thick-line characters do not display
+# vttest:
+#	terminal does not respond to 80/132-column switching
+#	wrapping at the right margin is erratic
+#	there are several problems in the cursor-movements and screen-features
+#	no vt52, no double-sized characters
+#	Device attributes response says it is a vanilla VT100
+#	does not respond to xterm mouse controls
+#	alternate screen tests do not fill the screen, return wrong position
+#	window modify/report operations do not work
+#	miscellaneous ISO-6429 tests, e.g., REP, do not work
+#	CBT, CHT, HPR, CNL,CPL, VPR do not work
+#
+# removed the cancel for "hs", removed cbt, invis, corrected sgr -TD
 terminator|Terminator no line wrap,
-	eo, mir, msgr, xenl, xon,
+	bce, eo, mir, msgr, xenl, xon,
 	colors#0x100, cols#80, it#8, lines#24, lm#0, pairs#0x10000,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
@@ -6503,28 +6576,27 @@ terminator|Terminator no line wrap,
 	cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=\n,
 	cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
 	cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
-	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
-	enacs=\E(B\E)0, flash=^G, home=\E[H, hpa=\E[%i%p1%dG,
-	ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=\n,
-	is1=\E[?47l\E=\E[?1l,
-	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
+	dim=\E[2m, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
+	el1=\E[1K, enacs=\E(B\E)0, flash=^G, home=\E[H,
+	hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
+	ind=\n, indn=\E[%p1%dS, is1=\E[?47l\E=\E[?1l,
+	is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^?,
 	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
 	kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
 	kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
 	khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
-	rmcup=\E[?47l\E8, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
-	rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
-	rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
-	s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm,
-	setaf=\E[38;5;%p1%dm,
-	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t
-	    \E(0%e\E(B%;,
-	sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h,
-	smso=\E[7m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
-	use=xterm+sl-twm,
+	op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rin=\E[%p1%dT,
+	ritm=\E[23m, rmacs=\E(B, rmcup=\E[?1049l, rmir=\E[4l,
+	rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
+	rs2=\E[!p\E[?3;4l\E[4l\E>, s0ds=\E(B, s1ds=\E(0, sc=\E7,
+	setab=\E[48;5;%p1%dm, setaf=\E[38;5;%p1%dm,
+	sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p5%t;2%;%?%p1%p3%|%t;7
+	    %;m%?%p9%t\E(0%e\E(B%;,
+	sgr0=\E[m\E(B, sitm=\E[3m, smacs=\E(0, smcup=\E[?1049h,
+	smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+	tsl=\E]2;%p1, vpa=\E[%i%p1%dd, use=xterm+sl-twm,
 
 #### TERMINOLOGY
 # https://www.enlightenment.org/about-terminology
@@ -22337,7 +22409,7 @@ ti700|ti733|ti735|ti745|ti800|ti silent 700/733/735/745 or omni 800,
 ti703|ti707|Texas Instruments Silent 703/707,
 	am, hc, os, xenl,
 	cols#80, it#8,
-	bel=^G, cr=\r$<162>, cub1=^H, cud1=\n, cuf1=\s, ht=^I, ind=\n,
+	bel=^G, cr=\r$<162>, cub1=^H, cud1=\n, cuf1=\s, ind=\n,
 	is2=\EPC\\, nel=\r\n,
 ti703-w|ti707-w|Texas Instruments Silent 703/707,
 	cols#132,
@@ -26041,4 +26113,10 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #	+ add "screen5", to mention italics (report by Stefan Assmann)
 #	+ modify description of xterm+x11hilite to eliminate unused p5 -TD
 #
+# 2019-05-18
+#	+ update xterm-new to xterm patch #345 -TD
+#	+ add/use xterm+keypad in xterm-new (report by Alain D D Williams) -TD
+#	+ update terminator entry -TD
+#	+ remove hard-tabs from ti703 (report by Robert Clausecker)
+#
 ######## SHANTIH!  SHANTIH!  SHANTIH!
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index dcc0002d..c91deceb 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190511) unstable; urgency=low
+ncurses6 (6.1+20190518) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 10 May 2019 16:55:16 -0400
+ -- Thomas E. Dickey   Sat, 18 May 2019 06:29:53 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index dcc0002d..c91deceb 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190511) unstable; urgency=low
+ncurses6 (6.1+20190518) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 10 May 2019 16:55:16 -0400
+ -- Thomas E. Dickey   Sat, 18 May 2019 06:29:53 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index bae1d1b6..159f0079 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190511) unstable; urgency=low
+ncurses6 (6.1+20190518) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Fri, 10 May 2019 16:55:16 -0400
+ -- Thomas E. Dickey   Sat, 18 May 2019 06:29:53 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index a191ee9a..859c32e5 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.328 2019/05/10 20:55:16 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.329 2019/05/18 10:29:53 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  "0511"
+!define VERSION_MMDD  "0518"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 8751d636..c0fce342 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: 20190511
+Release: 20190518
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 034c4c96..fbb47bef 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: 20190511
+Release: 20190518
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 49ee05a6..12011909 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: 20190511
+Release: 20190518
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz