From dcfe712cb3492636e8d50c9867cf05aec089a576 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 5 Mar 2017 02:40:12 +0000 Subject: [PATCH] ncurses 6.0 - patch 20170304 + improve terminfo manual description of terminfo syntax. + clarify the use of wint_t vs wchar_t in curs_get_wstr.3x + improve description of endwin() in manual. + modify setcchar() and getcchar() to treat negative color-pair as an error. + fix a typo in include/hashed_db.h (Andre Sa). --- NEWS | 10 +- VERSION | 2 +- dist.mk | 4 +- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_get_wstr.3x.html | 17 +- doc/html/man/curs_initscr.3x.html | 29 +- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 1427 +++++++++++++------------ doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- include/hashed_db.h | 6 +- man/curs_get_wstr.3x | 16 +- man/curs_initscr.3x | 19 +- man/manhtml.aliases | 6 +- man/terminfo.head | 120 ++- man/terminfo.tail | 48 +- ncurses/widechar/lib_cchar.c | 10 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- progs/dump_entry.c | 4 +- 35 files changed, 968 insertions(+), 800 deletions(-) diff --git a/NEWS b/NEWS index 42c34c18..48882f1a 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.2762 2017/02/26 00:35:38 tom Exp $ +-- $Id: NEWS,v 1.2767 2017/03/05 00:05:28 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. +20170304 + + improve terminfo manual description of terminfo syntax. + + clarify the use of wint_t vs wchar_t in curs_get_wstr.3x + + improve description of endwin() in manual. + + modify setcchar() and getcchar() to treat negative color-pair as an + error. + + fix a typo in include/hashed_db.h (Andre Sa). + 20170225 + fixes for CF_CC_ENV_FLAGS (report by Ross Burton). diff --git a/VERSION b/VERSION index 2a4e27bb..b613f680 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20170225 +5:0:9 6.0 20170304 diff --git a/dist.mk b/dist.mk index be764fc9..7df027ab 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.1149 2017/02/25 13:32:34 tom Exp $ +# $Id: dist.mk,v 1.1150 2017/02/26 16:41:23 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 = 0 -NCURSES_PATCH = 20170225 +NCURSES_PATCH = 20170304 # 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 40c72f6d..e92fba9a 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -131,7 +131,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.0 (patch 20170218).
+       This describes ncurses version 6.0 (patch 20170304).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index c6add38e..0ce8816a 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.0 (patch 20170218).
+       This describes ncurses version 6.0 (patch 20170304).
 
 
 

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index 1b26e0c2..6cab236a 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -147,7 +147,7 @@
 

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20170218).
+       This describes ncurses version 6.0 (patch 20170304).
 
 
 
diff --git a/doc/html/man/curs_get_wstr.3x.html b/doc/html/man/curs_get_wstr.3x.html
index b24f1656..853075a8 100644
--- a/doc/html/man/curs_get_wstr.3x.html
+++ b/doc/html/man/curs_get_wstr.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_get_wstr.3x,v 1.10 2017/01/07 19:25:15 tom Exp @
+  * @Id: curs_get_wstr.3x,v 1.11 2017/03/04 21:24:04 tom Exp @
 -->
 
 
@@ -138,9 +138,18 @@
        treated as an end-of-file condition, and the returned  ar-
        ray contains a WEOF followed by a null wchar_t.
 
-       X/Open  curses  documents these functions to pass an array
-       of wchar_t, but all of the vendors  implement  this  using
-       wint_t.
+       X/Open  curses documented these functions to pass an array
+       of wchar_t in 1997, but that was an error because of  this
+       part of the description:
+
+              The  effect  of get_wstr() is as though a series of
+              calls to get_wch() were made, until a newline char-
+              acter,  end-of-line character, or end-of-file char-
+              acter is processed.
+
+       The latter function get_wch() can return a negative value,
+       while  wchar_t is a unsigned type.  All of the vendors im-
+       plement this using wint_t, following the standard.
 
 
 

SEE ALSO

diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 7f398881..d487e933 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_initscr.3x,v 1.26 2017/01/07 19:25:15 tom Exp @
+  * @Id: curs_initscr.3x,v 1.27 2017/03/04 20:59:02 tom Exp @
 -->
 
 
@@ -108,15 +108,25 @@
        A  program should always call endwin before exiting or es-
        caping from curses mode temporarily.  This routine
 
-       o   restores tty modes,
+       o   resets colors to correspond  with  the  default  color
+           pair 0,
 
-       o   moves the cursor to the lower left-hand corner of  the
-           screen and
+       o   moves  the cursor to the lower left-hand corner of the
+           screen,
 
-       o   resets the terminal into the proper non-visual mode.
+       o   clears the remainder of the line so that it  uses  the
+           default colors,
 
-       Calling  refresh(3x)  or doupdate after a temporary escape
-       causes the program to resume visual mode.
+       o   sets    the   cursor   to   normal   visibility   (see
+           curs_set(3x)),
+
+       o   stops cursor-addressing mode  using  the  exit_ca_mode
+           terminal capability,
+
+       o   restores tty modes (see reset_shell_mode(3x)).
+
+       Calling  refresh(3x) or doupdate(3x) after a temporary es-
+       cape causes the program to resume visual mode.
 
 
 

isendwin

@@ -161,10 +171,6 @@
        o   set_term returns no error.
 
 
-

NOTES

-       Note that initscr and newterm may be macros.
-
-
 

PORTABILITY

        These functions were described in the XSI Curses standard,
        Issue 4.  As of 2015, the current document is X/Open Curs-
@@ -283,7 +289,6 @@
 
 
 
  • RETURN VALUE
  • -
  • NOTES
  • PORTABILITY
    • Differences
    • diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html index 528ba797..c4942bfe 100644 --- a/doc/html/man/form.3x.html +++ b/doc/html/man/form.3x.html @@ -239,7 +239,7 @@ curses(3x) and related pages whose names begin "form_" for detailed descriptions of the entry points. - This describes ncurses version 6.0 (patch 20170218). + This describes ncurses version 6.0 (patch 20170304). diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html index 3f4d43f0..6442c1a6 100644 --- a/doc/html/man/infocmp.1m.html +++ b/doc/html/man/infocmp.1m.html @@ -514,7 +514,7 @@ http://invisible-island.net/ncurses/tctest.html - This describes ncurses version 6.0 (patch 20170218). + This describes ncurses version 6.0 (patch 20170304).
  • AUTHOR

    diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
    index 22d5c1f5..afa4ec1a 100644
    --- a/doc/html/man/infotocap.1m.html
    +++ b/doc/html/man/infotocap.1m.html
    @@ -88,7 +88,7 @@
     

    SEE ALSO

            curses(3x), tic(1m), infocmp(1m), terminfo(5)
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     

    AUTHOR

    diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
    index d6f2f908..1c07f627 100644
    --- a/doc/html/man/menu.3x.html
    +++ b/doc/html/man/menu.3x.html
    @@ -217,7 +217,7 @@
            curses(3x) and related pages whose names begin "menu_" for
            detailed descriptions of the entry points.
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     
    diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
    index 504ac48a..d280efe5 100644
    --- a/doc/html/man/ncurses.3x.html
    +++ b/doc/html/man/ncurses.3x.html
    @@ -60,7 +60,7 @@
            sonable optimization.  This implementation is "new curses"
            (ncurses) and is the approved replacement for 4.4BSD clas-
            sic  curses,  which has been discontinued.  This describes
    -       ncurses version 6.0 (patch 20170218).
    +       ncurses version 6.0 (patch 20170304).
     
            The ncurses library emulates the curses library of  System
            V  Release  4  UNIX,  and  XPG4 (X/Open Portability Guide)
    diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
    index 6c80ea87..51adb9ab 100644
    --- a/doc/html/man/ncurses6-config.1.html
    +++ b/doc/html/man/ncurses6-config.1.html
    @@ -114,7 +114,7 @@
     

    SEE ALSO

            curses(3x)
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     
    diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
    index 5867e501..80cc830f 100644
    --- a/doc/html/man/panel.3x.html
    +++ b/doc/html/man/panel.3x.html
    @@ -208,7 +208,7 @@
     

    SEE ALSO

            curses(3x), curs_variables(3x),
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     

    AUTHOR

    diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
    index 0869f80b..f86713d0 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.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     
    diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
    index 2c8d8b66..7ce1a222 100644
    --- a/doc/html/man/terminfo.5.html
    +++ b/doc/html/man/terminfo.5.html
    @@ -31,9 +31,9 @@
       * sale, use or other dealings in this Software without prior written       *
       * authorization.                                                           *
       ****************************************************************************
    -  * @Id: terminfo.head,v 1.23 2017/02/18 17:04:53 tom Exp @
    +  * @Id: terminfo.head,v 1.30 2017/03/05 00:24:35 tom Exp @
       * Head of terminfo man page ends here
    -  * @Id: terminfo.tail,v 1.76 2017/01/07 18:32:49 tom Exp @
    +  * @Id: terminfo.tail,v 1.78 2017/03/04 23:52:35 tom Exp @
       * Beginning of terminfo.tail file
       * This file is part of ncurses.
       * See "terminfo.head" for copyright.
    @@ -75,30 +75,56 @@
            nals by giving a set of capabilities which they  have,  by
            specifying how to perform screen operations, and by speci-
            fying padding requirements and  initialization  sequences.
    -       This describes ncurses version 6.0 (patch 20170218).
    -
    -       Entries in terminfo consist of a sequence of "," separated
    -       fields (embedded commas may be escaped with a backslash or
    -       notated  as \054).  White space after the "," separator is
    -       ignored.  The first entry  for  each  terminal  gives  the
    -       names  which  are known for the terminal, separated by "|"
    -       characters.  The first  name  given  is  the  most  common
    -       abbreviation  for the terminal, the last name given should
    -       be a long name fully identifying  the  terminal,  and  all
    -       others  are  understood as synonyms for the terminal name.
    -       All names but the last should be in lower case and contain
    -       no  blanks;  the last name may well contain upper case and
    -       blanks for readability.
    -
    -       Lines beginning with a "#" in the first column are treated
    -       as  comments.  While comment lines are legal at any point,
    -       the output of captoinfo and infotocap  (aliases  for  tic)
    -       will move comments so they occur only between entries.
    -
    -       Newlines  and  leading  tabs  may  be  used for formatting
    -       entries for readability.  These are  removed  from  parsed
    -       entries.   The  infocmp -f option relies on this to format
    -       if-then-else expressions: the result can be read by tic.
    +       This describes ncurses version 6.0 (patch 20170304).
    +
    +
    +

    Terminfo Entry Syntax

    +       Entries in terminfo consist of a sequence of fields:
    +
    +       o   Each  field ends with a comma "," (embedded commas may
    +           be escaped with a backslash or written as "\054").
    +
    +       o   White space between fields is ignored.
    +
    +       o   The first field in a  terminfo  entry  begins  in  the
    +           first column.
    +
    +       o   Newlines  and  leading whitespace (spaces or tabs) may
    +           be used for formatting entries for readability.  These
    +           are removed from parsed entries.
    +
    +           The infocmp -f and -W options relies on this to format
    +           if-then-else expressions, or to enforce maximum  line-
    +           width.   The  resulting formatted terminal description
    +           can be read by tic.
    +
    +       o   The first field for  each  terminal  gives  the  names
    +           which  are  known  for  the terminal, separated by "|"
    +           characters.
    +
    +           The first name given is the most  common  abbreviation
    +           for  the  terminal  (its  primary name), the last name
    +           given should be a long name fully identifying the ter-
    +           minal  (see  longname(3x)), and all others are treated
    +           as synonyms (aliases) for the primary terminal name.
    +
    +           X/Open Curses advises that  all  names  but  the  last
    +           should  be  in  lower  case and contain no blanks; the
    +           last name may well contain upper case and  blanks  for
    +           readability.
    +
    +           This  implementation is not so strict; it allows mixed
    +           case in the primary name and  aliases.   If  the  last
    +           name has no embedded blanks, it allows that to be both
    +           an alias and a verbose name (but will warn about  this
    +           ambiguity).
    +
    +       o   Lines  beginning  with  a  "#" in the first column are
    +           treated as comments.
    +
    +           While comment lines are legal at any point, the output
    +           of captoinfo and infotocap (aliases for tic) will move
    +           comments so they occur only between entries.
     
            Terminal names (except for the last, verbose entry) should
            be chosen using the following conventions.  The particular
    @@ -123,48 +149,114 @@
           -rv      Reverse video                            c100-rv
           -s       Enable status line                       vt100-s
           -vb      Use visible bell instead of beep         wy370-vb
    -
           -w       Wide mode (> 80 columns, usually 132)    vt100-w
     
            For more on terminal naming conventions, see  the  term(7)
            manual page.
     
     
    +

    Terminfo Capabilities Syntax

    +       The terminfo entry consists of several capabilities, i.e.,
    +       features that the terminal has, or methods for  exercising
    +       the terminal's features.
    +
    +       After  the first field (giving the name(s) of the terminal
    +       entry), there should be one  or  more  capability  fields.
    +       These  are  boolean,  numeric  or string names with corre-
    +       sponding values:
    +
    +       o   Boolean capabilities are true when present, false when
    +           absent.   There is no explicit value for boolean capa-
    +           bilities.
    +
    +       o   Numeric capabilities have a "#"  following  the  name,
    +           then an unsigned decimal integer value.
    +
    +       o   String  capabilities  have  a  "=" following the name,
    +           then an string of characters making up the  capability
    +           value.
    +
    +           String  capabilities can be split into multiple lines,
    +           just as the fields comprising a terminal entry can  be
    +           split  into  multiple  lines.   While  blanks  between
    +           fields are ignored, blanks embedded  within  a  string
    +           value  are  retained,  except  for leading blanks on a
    +           line.
    +
    +       Any capability can be canceled, i.e., suppressed from  the
    +       terminal entry, by following its name with "@" rather than
    +       a capability value.
    +
    +
    +

    Similar Terminals

    +       If there are two very similar terminals, one (the variant)
    +       can  be  defined  as  being just like the other (the base)
    +       with certain exceptions.  In the definition of  the  vari-
    +       ant,  the string capability use can be given with the name
    +       of the base terminal:
    +
    +       o   The capabilities given before use  override  those  in
    +           the base type named by use.
    +
    +       o   If  there  are  multiple  use  capabilities,  they are
    +           merged in reverse order.  That is, the  rightmost  use
    +           reference  is  processed  first,  then  the one to its
    +           left, and so forth.
    +
    +       o   Capabilities given explicitly in  the  entry  override
    +           those brought in by use references.
    +
    +       A capability can be canceled by placing xx@ to the left of
    +       the use reference that imports it, where xx is  the  capa-
    +       bility.  For example, the entry
    +
    +              2621-nl, smkx@, rmkx@, use=2621,
    +
    +       defines  a  2621-nl  that  does  not have the smkx or rmkx
    +       capabilities, and hence does not turn on the function  key
    +       labels  when in visual mode.  This is useful for different
    +       modes for a terminal, or for different user preferences.
    +
    +       An entry included via use can contain  canceled  capabili-
    +       ties,  which have the same effect as if those cancels were
    +       inline in the using terminal entry.
    +
    +
     

    Predefined Capabilities

    -       The  following  is  a  complete  table of the capabilities
    -       included in a terminfo description block and available  to
    +       The following is a  complete  table  of  the  capabilities
    +       included  in a terminfo description block and available to
            terminfo-using code.  In each line of the table,
     
    -       The  variable  is the name by which the programmer (at the
    +       The variable is the name by which the programmer  (at  the
            terminfo level) accesses the capability.
     
    -       The capname is the short name used  in  the  text  of  the
    -       database,  and  is used by a person updating the database.
    -       Whenever possible, capnames are chosen to be the  same  as
    +       The  capname  is  the  short  name used in the text of the
    +       database, and is used by a person updating  the  database.
    +       Whenever  possible,  capnames are chosen to be the same as
            or similar to the ANSI X3.64-1979 standard (now superseded
    -       by ECMA-48, which uses identical or very  similar  names).
    +       by  ECMA-48,  which uses identical or very similar names).
            Semantics are also intended to match those of the specifi-
            cation.
     
    -       The termcap code is the old termcap capability name  (some
    +       The  termcap code is the old termcap capability name (some
            capabilities are new, and have names which termcap did not
            originate).
     
    -       Capability names have no hard length limit, but an  infor-
    -       mal  limit  of  5 characters has been adopted to keep them
    -       short and to allow the tabs in the  source  file  Caps  to
    +       Capability  names have no hard length limit, but an infor-
    +       mal limit of 5 characters has been adopted  to  keep  them
    +       short  and  to  allow  the tabs in the source file Caps to
            line up nicely.
     
    -       Finally,  the  description  field  attempts  to convey the
    -       semantics of the capability.  You may find some  codes  in
    +       Finally, the description  field  attempts  to  convey  the
    +       semantics  of  the capability.  You may find some codes in
            the description field:
     
            (P)    indicates that padding may be specified
     
    -       #[1-9] in  the description field indicates that the string
    +       #[1-9] in the description field indicates that the  string
                   is passed through tparm with parms as given (#i).
     
    -       (P*)   indicates that padding may vary  in  proportion  to
    +       (P*)   indicates  that  padding  may vary in proportion to
                   the number of lines affected
     
            (#i)   indicates the ith parameter.
    @@ -188,9 +280,6 @@
                                                  by overwriting (hp)
            col_addr_glitch           xhpa   YA   only positive motion
                                                  for hpa/mhpa caps
    -
    -
    -
            cpi_changes_res           cpix   YF   changing character
                                                  pitch changes reso-
                                                  lution
    @@ -237,6 +326,8 @@
                                                  required
            no_esc_ctlc               xsb    xb   beehive (f1=escape,
                                                  f2=ctrl C)
    +
    +
            no_pad_char               npc    NP   pad character does
                                                  not exist
            non_dest_scroll_region    ndscr  ND   scrolling region is
    @@ -255,8 +346,6 @@
                                                  on the status line
            tilde_glitch              hz     hz   cannot print ~'s
                                                  (Hazeltine)
    -
    -
            transparent_underline     ul     ul   underline character
                                                  overstrikes
            xon_xoff                  xon    xo   terminal uses
    @@ -303,8 +392,8 @@
            width_status_line         wsl    ws   number of columns in
                                                  status line
     
    -       The following numeric  capabilities  are  present  in  the
    -       SVr4.0  term  structure, but are not yet documented in the
    +       The  following  numeric  capabilities  are  present in the
    +       SVr4.0 term structure, but are not yet documented  in  the
            man page.  They came in with SVr4's printer support.
     
     
    @@ -322,7 +411,6 @@
            dot_horz_spacing          spinh  Yc   spacing of dots hor-
                                                  izontally in dots
                                                  per inch
    -
            dot_vert_spacing          spinv  Yb   spacing of pins ver-
                                                  tically in pins per
                                                  inch
    @@ -370,8 +458,11 @@
                                                  to #1
            change_line_pitch         lpi    ZB   Change number of
                                                  lines per inch to #1
    +
            change_res_horz           chr    ZC   Change horizontal
                                                  resolution to #1
    +
    +
            change_res_vert           cvr    ZD   Change vertical res-
                                                  olution to #1
            change_scroll_region      csr    cs   change region to
    @@ -387,8 +478,6 @@
                                                  home cursor (P*)
            clr_bol                   el1    cb   Clear to beginning
                                                  of line
    -
    -
            clr_eol                   el     ce   clear to end of line
                                                  (P)
            clr_eos                   ed     cd   clear to end of
    @@ -436,9 +525,12 @@
                                                  char set
            enter_alt_charset_mode    smacs  as   start alternate
                                                  character set (P)
    +
            enter_am_mode             smam   SA   turn on automatic
                                                  margins
            enter_blink_mode          blink  mb   turn on blinking
    +
    +
            enter_bold_mode           bold   md   turn on bold (extra
                                                  bright) mode
            enter_ca_mode             smcup  ti   string to start pro-
    @@ -454,7 +546,6 @@
            enter_italics_mode        sitm   ZH   Enter italic mode
            enter_leftward_mode       slm    ZI   Start leftward car-
                                                  riage motion
    -
            enter_micro_mode          smicm  ZJ   Start micro-motion
                                                  mode
            enter_near_letter_quality snlq   ZK   Enter NLQ mode
    @@ -505,6 +596,8 @@
                                                  ter motion
            exit_xon_mode             rmxon  RX   turn off xon/xoff
                                                  handshaking
    +
    +
            fixed_pause               pause  PA   pause for 2-3 sec-
                                                  onds
            flash_hook                hook   fh   flash switch hook
    @@ -520,7 +613,6 @@
                                                  string
            init_2string              is2    is   initialization
                                                  string
    -
            init_3string              is3    i3   initialization
                                                  string
            init_file                 if     if   name of initializa-
    @@ -572,6 +664,7 @@
            key_f1                    kf1    k1   F1 function key
            key_f10                   kf10   k;   F10 function key
            key_f11                   kf11   F1   F11 function key
    +
            key_f12                   kf12   F2   F12 function key
            key_f13                   kf13   F3   F13 function key
            key_f14                   kf14   F4   F14 function key
    @@ -586,7 +679,6 @@
            key_f22                   kf22   FC   F22 function key
            key_f23                   kf23   FD   F23 function key
            key_f24                   kf24   FE   F24 function key
    -
            key_f25                   kf25   FF   F25 function key
            key_f26                   kf26   FG   F26 function key
            key_f27                   kf27   FH   F27 function key
    @@ -639,6 +731,7 @@
            key_ic                    kich1  kI   insert-character key
            key_il                    kil1   kA   insert-line key
            key_left                  kcub1  kl   left-arrow key
    +
            key_ll                    kll    kH   lower-left key (home
                                                  down)
            key_mark                  kmrk   %2   mark key
    @@ -652,7 +745,6 @@
            key_previous              kprv   %8   previous key
            key_print                 kprt   %9   print key
            key_redo                  krdo   %0   redo key
    -
            key_reference             kref   &1   reference key
            key_refresh               krfr   &2   refresh key
            key_replace               krpl   &3   replace key
    @@ -705,6 +797,8 @@
                                                  board_transmit' mode
            keypad_xmit               smkx   ks   enter 'key-
                                                  board_transmit' mode
    +
    +
            lab_f0                    lf0    l0   label on function
                                                  key f0 if not f0
            lab_f1                    lf1    l1   label on function
    @@ -717,8 +811,6 @@
                                                  key f3 if not f3
            lab_f4                    lf4    l4   label on function
                                                  key f4 if not f4
    -
    -
            lab_f5                    lf5    l5   label on function
                                                  key f5 if not f5
            lab_f6                    lf6    l6   label on function
    @@ -772,6 +864,8 @@
                                                  to the left (P)
            parm_left_micro           mcub   Zg   Like parm_left_cur-
                                                  sor in micro mode
    +
    +
            parm_right_cursor         cuf    RI   move #1 characters
                                                  to the right (P*)
            parm_right_micro          mcuf   Zh   Like parm_right_cur-
    @@ -783,8 +877,6 @@
                                                  in micro mode
            pkey_key                  pfkey  pk   program function key
                                                  #1 to type string #2
    -
    -
            pkey_local                pfloc  pl   program function key
                                                  #1 to execute string
                                                  #2
    @@ -839,6 +931,8 @@
                                                  pair to #1
            set_foreground            setf   Sf   Set foreground color
                                                  #1
    +
    +
            set_left_margin           smgl   ML   set left soft margin
                                                  at current column.
                                                  See smgl. (ML is not
    @@ -850,7 +944,6 @@
                                                  umn
            set_right_margin_parm     smgrp  Zn   Set right margin at
                                                  column #1
    -
            set_tab                   hts    st   set a tab in every
                                                  row, current columns
            set_top_margin            smgt   Zo   Set top margin at
    @@ -902,8 +995,8 @@
            zero_motion               zerom  Zx   No motion for subse-
                                                  quent character
     
    -       The following  string  capabilities  are  present  in  the
    -       SVr4.0  term structure, but were originally not documented
    +       The  following  string  capabilities  are  present  in the
    +       SVr4.0 term structure, but were originally not  documented
            in the man page.
     
     
    @@ -916,7 +1009,6 @@
                                                    of same row
            bit_image_newline         binel    Zz   Move to next row
                                                    of the bit image
    -
            bit_image_repeat          birep    Xy   Repeat bit image
                                                    cell #1 #2 times
            char_set_names            csnm     Zy   Produce #1'th item
    @@ -974,6 +1066,7 @@
                                                    ANSI escape
            set_color_band            setcolor Yz   Change to ribbon
                                                    color #1
    +
            set_lr_margin             smglr    ML   Set both left and
                                                    right margins to
                                                    #1, #2.  (ML is
    @@ -981,19 +1074,17 @@
                                                    cap).
            set_page_length           slines   YZ   Set page length to
                                                    #1 lines
    -
    -
            set_tb_margin             smgtb    MT   Sets both top and
                                                    bottom margins to
                                                    #1, #2
     
    -        The XSI Curses standard added  these  hardcopy  capabili-
    +        The  XSI  Curses  standard added these hardcopy capabili-
             ties.  They were used in some post-4.1 versions of System
             V curses, e.g., Solaris 2.5 and IRIX 6.x.  Except for YI,
             the ncurses termcap names for them are invented.  Accord-
    -        ing to the XSI Curses  standard,  they  have  no  termcap
    +        ing  to  the  XSI  Curses  standard, they have no termcap
             names.  If your compiled terminfo entries use these, they
    -        may not  be  binary-compatible  with  System  V  terminfo
    +        may  not  be  binary-compatible  with  System  V terminfo
             entries after SVr4.1; beware!
     
     
    @@ -1022,51 +1113,51 @@
     
     
     

    User-Defined Capabilities

    -       The  preceding section listed the predefined capabilities.
    -       They deal with some  special  features  for  terminals  no
    -       longer  (or  possibly never) produced.  Occasionally there
    -       are special features of newer terminals which are  awkward
    +       The preceding section listed the predefined  capabilities.
    +       They  deal  with  some  special  features for terminals no
    +       longer (or possibly never) produced.   Occasionally  there
    +       are  special features of newer terminals which are awkward
            or impossible to represent by reusing the predefined capa-
            bilities.
     
            ncurses addresses this limitation by allowing user-defined
            capabilities.  The tic and infocmp programs provide the -x
    -       option for this purpose.   When  -x  is  set,  tic  treats
    -       unknown  capabilities  as  user-defined.   That is, if tic
    -       encounters a capability name which it does not  recognize,
    -       it  infers  its  type (boolean, number or string) from the
    +       option  for  this  purpose.   When  -x  is set, tic treats
    +       unknown capabilities as user-defined.   That  is,  if  tic
    +       encounters  a capability name which it does not recognize,
    +       it infers its type (boolean, number or  string)  from  the
            syntax and makes an extended table entry for that capabil-
    -       ity.   The use_extended_names function makes this informa-
    +       ity.  The use_extended_names function makes this  informa-
            tion conditionally available to applications.  The ncurses
    -       library  provides the data leaving most of the behavior to
    +       library provides the data leaving most of the behavior  to
            applications:
     
            o   User-defined capability strings whose name begins with
                "k" are treated as function keys.
     
    -       o   The  types (boolean, number, string) determined by tic
    +       o   The types (boolean, number, string) determined by  tic
                can be inferred by successful calls on tigetflag, etc.
     
    -       o   If the capability name happens to be  two  characters,
    -           the  capability  is also available through the termcap
    +       o   If  the  capability name happens to be two characters,
    +           the capability is also available through  the  termcap
                interface.
     
            While termcap is said to be extensible because it does not
    -       use  a  predefined set of capabilities, in practice it has
    -       been limited  to  the  capabilities  defined  by  terminfo
    -       implementations.   As  a  rule,  user-defined capabilities
    +       use a predefined set of capabilities, in practice  it  has
    +       been  limited  to  the  capabilities  defined  by terminfo
    +       implementations.  As  a  rule,  user-defined  capabilities
            intended for use by termcap applications should be limited
    -       to  booleans  and  numbers  to avoid running past the 1023
    -       byte limit assumed by termcap  implementations  and  their
    -       applications.   In  particular, providing extended sets of
    -       function keys (past the 60 numbered keys and  the  handful
    +       to booleans and numbers to avoid  running  past  the  1023
    +       byte  limit  assumed  by termcap implementations and their
    +       applications.  In particular, providing extended  sets  of
    +       function  keys  (past the 60 numbered keys and the handful
            of special named keys) is best done using the longer names
            available using terminfo.
     
     
     

    A Sample Entry

            The following entry, describing an ANSI-standard terminal,
    -       is  representative  of  what a terminfo entry for a modern
    +       is representative of what a terminfo entry  for  a  modern
            terminal typically looks like.
     
            ansi|ansi/pc-term compatible with color,
    @@ -1100,44 +1191,44 @@
                    smul=\E[4m, tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
                    u8=\E[?%[;0123456789]c, u9=\E[c, vpa=\E[%i%p1%dd,
     
    -       Entries may continue onto multiple lines by placing  white
    -       space  at  the  beginning  of  each line except the first.
    -       Comments may be included  on  lines  beginning  with  "#".
    +       Entries  may continue onto multiple lines by placing white
    +       space at the beginning of  each  line  except  the  first.
    +       Comments  may  be  included  on  lines beginning with "#".
            Capabilities in terminfo are of three types:
     
    -       o   Boolean  capabilities which indicate that the terminal
    +       o   Boolean capabilities which indicate that the  terminal
                has some particular feature,
     
    -       o   numeric capabilities giving the size of  the  terminal
    +       o   numeric  capabilities  giving the size of the terminal
                or the size of particular delays, and
     
    -       o   string  capabilities,  which give a sequence which can
    +       o   string capabilities, which give a sequence  which  can
                be used to perform particular terminal operations.
     
     
     

    Types of Capabilities

    -       All capabilities have names.  For instance, the fact  that
    -       ANSI-standard  terminals  have automatic margins (i.e., an
    -       automatic return and line-feed when the end of a  line  is
    -       reached)  is  indicated  by  the capability am.  Hence the
    +       All  capabilities have names.  For instance, the fact that
    +       ANSI-standard terminals have automatic margins  (i.e.,  an
    +       automatic  return  and line-feed when the end of a line is
    +       reached) is indicated by the  capability  am.   Hence  the
            description of ansi includes am.  Numeric capabilities are
    -       followed  by  the character "#" and then a positive value.
    -       Thus cols, which indicates the number of columns the  ter-
    -       minal  has,  gives  the  value  "80" for ansi.  Values for
    +       followed by the character "#" and then a  positive  value.
    +       Thus  cols, which indicates the number of columns the ter-
    +       minal has, gives the value  "80"  for  ansi.   Values  for
            numeric capabilities may be specified in decimal, octal or
    -       hexadecimal,  using the C programming language conventions
    +       hexadecimal, using the C programming language  conventions
            (e.g., 255, 0377 and 0xff or 0xFF).
     
    -       Finally, string valued capabilities, such as el (clear  to
    +       Finally,  string valued capabilities, such as el (clear to
            end of line sequence) are given by the two-character code,
    -       an "=", and then a string ending  at  the  next  following
    +       an  "=",  and  then  a string ending at the next following
            ",".
     
    -       A  number  of  escape sequences are provided in the string
    +       A number of escape sequences are provided  in  the  string
            valued capabilities for easy encoding of characters there.
    -       Both  \E  and  \e map to an ESCAPE character, ^x maps to a
    -       control-x for any appropriate x, and the sequences  \n  \l
    -       \r  \t  \b  \f  \s give a newline, line-feed, return, tab,
    +       Both \E and \e map to an ESCAPE character, ^x  maps  to  a
    +       control-x  for  any appropriate x, and the sequences \n \l
    +       \r \t \b \f \s give a  newline,  line-feed,  return,  tab,
            backspace, form-feed, and space.  Other escapes include
     
            o   \^ for ^,
    @@ -1150,80 +1241,80 @@
     
            o   and \0 for null.
     
    -           \0 will produce  \200,  which  does  not  terminate  a
    -           string  but behaves as a null character on most termi-
    +           \0  will  produce  \200,  which  does  not terminate a
    +           string but behaves as a null character on most  termi-
                nals, providing CS7 is specified.  See stty(1).
     
    -           The reason for this quirk is to maintain  binary  com-
    -           patibility  of  the compiled terminfo files with other
    -           implementations, e.g., the SVr4 systems,  which  docu-
    -           ment  this.   Compiled  terminfo files use null-termi-
    -           nated strings, with no lengths.  Modifying this  would
    +           The  reason  for this quirk is to maintain binary com-
    +           patibility of the compiled terminfo files  with  other
    +           implementations,  e.g.,  the SVr4 systems, which docu-
    +           ment this.  Compiled terminfo  files  use  null-termi-
    +           nated  strings, with no lengths.  Modifying this would
                require a new binary format, which would not work with
                other implementations.
     
    -       Finally, characters may be given  as  three  octal  digits
    +       Finally,  characters  may  be  given as three octal digits
            after a \.
     
    -       A  delay  in  milliseconds may appear anywhere in a string
    -       capability, enclosed in $<..> brackets, as in  el=\EK$<5>,
    -       and  padding  characters are supplied by tputs(3x) to pro-
    +       A delay in milliseconds may appear anywhere  in  a  string
    +       capability,  enclosed in $<..> brackets, as in el=\EK$<5>,
    +       and padding characters are supplied by tputs(3x)  to  pro-
            vide this delay.
     
    -       o   The delay must be a number with at  most  one  decimal
    +       o   The  delay  must  be a number with at most one decimal
                place of precision; it may be followed by suffixes "*"
                or "/" or both.
     
    -       o   A "*" indicates that the padding required  is  propor-
    -           tional  to  the number of lines affected by the opera-
    -           tion, and the amount given  is  the  per-affected-unit
    -           padding  required.   (In the case of insert character,
    +       o   A  "*"  indicates that the padding required is propor-
    +           tional to the number of lines affected by  the  opera-
    +           tion,  and  the  amount given is the per-affected-unit
    +           padding required.  (In the case of  insert  character,
                the factor is still the number of lines affected.)
     
    -           Normally, padding is advisory if the  device  has  the
    -           xon  capability;  it  is used for cost computation but
    +           Normally,  padding  is  advisory if the device has the
    +           xon capability; it is used for  cost  computation  but
                does not trigger delays.
     
    -       o   A "/" suffix indicates that the padding  is  mandatory
    +       o   A  "/"  suffix indicates that the padding is mandatory
                and forces a delay of the given number of milliseconds
    -           even on devices for which xon is present  to  indicate
    +           even  on  devices for which xon is present to indicate
                flow control.
     
    -       Sometimes  individual  capabilities must be commented out.
    -       To do this, put a period before the capability name.   For
    +       Sometimes individual capabilities must be  commented  out.
    +       To  do this, put a period before the capability name.  For
            example, see the second ind in the example above.
     
     
     

    Fetching Compiled Descriptions

    -       The  ncurses library searches for terminal descriptions in
    +       The ncurses library searches for terminal descriptions  in
            several places.  It uses only the first description found.
    -       The  library  has  a  compiled-in list of places to search
    -       which can be overridden by environment variables.   Before
    -       starting  to  search, ncurses eliminates duplicates in its
    +       The library has a compiled-in list  of  places  to  search
    +       which  can be overridden by environment variables.  Before
    +       starting to search, ncurses eliminates duplicates  in  its
            search list.
     
    -       o   If the environment variable TERMINFO  is  set,  it  is
    -           interpreted  as the pathname of a directory containing
    -           the compiled description you  are  working  on.   Only
    +       o   If  the  environment  variable  TERMINFO is set, it is
    +           interpreted as the pathname of a directory  containing
    +           the  compiled  description  you  are working on.  Only
                that directory is searched.
     
    -       o   If  TERMINFO  is not set, ncurses will instead look in
    -           the directory $HOME/.terminfo for a compiled  descrip-
    +       o   If TERMINFO is not set, ncurses will instead  look  in
    +           the  directory $HOME/.terminfo for a compiled descrip-
                tion.
     
    -       o   Next,  if  the  environment  variable TERMINFO_DIRS is
    +       o   Next, if the  environment  variable  TERMINFO_DIRS  is
                set, ncurses will interpret the contents of that vari-
    -           able  as  a  list  of  colon-separated directories (or
    +           able as a  list  of  colon-separated  directories  (or
                database files) to be searched.
     
    -           An empty directory name (i.e., if the variable  begins
    -           or  ends with a colon, or contains adjacent colons) is
    -           interpreted as  the  system  location  /usr/share/ter-
    +           An  empty directory name (i.e., if the variable begins
    +           or ends with a colon, or contains adjacent colons)  is
    +           interpreted  as  the  system  location /usr/share/ter-
                minfo.
     
            o   Finally, ncurses searches these compiled-in locations:
     
    -           o   a           list           of          directories
    +           o   a          list           of           directories
                    (/usr/local/ncurses/share/terminfo:/usr/share/ter-
                    minfo), and
     
    @@ -1232,91 +1323,91 @@
     
     
     

    Preparing Descriptions

    -       We now outline how to prepare descriptions  of  terminals.
    -       The  most  effective way to prepare a terminal description
    -       is by imitating the description of a similar  terminal  in
    -       terminfo  and  to  build up a description gradually, using
    +       We  now  outline how to prepare descriptions of terminals.
    +       The most effective way to prepare a  terminal  description
    +       is  by  imitating the description of a similar terminal in
    +       terminfo and to build up a  description  gradually,  using
            partial descriptions with vi or some other screen-oriented
    -       program  to  check that they are correct.  Be aware that a
    +       program to check that they are correct.  Be aware  that  a
            very unusual terminal may expose deficiencies in the abil-
    -       ity  of  the  terminfo  file to describe it or bugs in the
    +       ity of the terminfo file to describe it  or  bugs  in  the
            screen-handling code of the test program.
     
    -       To get the padding for insert line right (if the  terminal
    +       To  get the padding for insert line right (if the terminal
            manufacturer did not document it) a severe test is to edit
    -       a large file at 9600 baud, delete 16 or so lines from  the
    -       middle  of  the screen, then hit the "u" key several times
    -       quickly.  If the terminal messes up, more padding is  usu-
    -       ally  needed.  A similar test can be used for insert char-
    +       a  large file at 9600 baud, delete 16 or so lines from the
    +       middle of the screen, then hit the "u" key  several  times
    +       quickly.   If the terminal messes up, more padding is usu-
    +       ally needed.  A similar test can be used for insert  char-
            acter.
     
     
     

    Basic Capabilities

    -       The number of columns on each line  for  the  terminal  is
    -       given  by the cols numeric capability.  If the terminal is
    -       a CRT, then the number of lines on the screen is given  by
    +       The  number  of  columns  on each line for the terminal is
    +       given by the cols numeric capability.  If the terminal  is
    +       a  CRT, then the number of lines on the screen is given by
            the lines capability.  If the terminal wraps around to the
    -       beginning of the next line when it reaches the right  mar-
    +       beginning  of the next line when it reaches the right mar-
            gin, then it should have the am capability.  If the termi-
    -       nal can clear its screen, leaving the cursor in  the  home
    -       position,  then this is given by the clear string capabil-
    -       ity.  If the terminal overstrikes (rather than clearing  a
    -       position  when  a character is struck over) then it should
    -       have the os capability.  If the  terminal  is  a  printing
    -       terminal,  with no soft copy unit, give it both hc and os.
    -       (os applies to storage scope terminals, such as  TEKTRONIX
    -       4010  series, as well as hard copy and APL terminals.)  If
    +       nal  can  clear its screen, leaving the cursor in the home
    +       position, then this is given by the clear string  capabil-
    +       ity.   If the terminal overstrikes (rather than clearing a
    +       position when a character is struck over) then  it  should
    +       have  the  os  capability.   If the terminal is a printing
    +       terminal, with no soft copy unit, give it both hc and  os.
    +       (os  applies to storage scope terminals, such as TEKTRONIX
    +       4010 series, as well as hard copy and APL terminals.)   If
            there is a code to move the cursor to the left edge of the
            current row, give this as cr.  (Normally this will be car-
    -       riage return, control M.)  If there is a code  to  produce
    +       riage  return,  control M.)  If there is a code to produce
            an audible signal (bell, beep, etc) give this as bel.
     
    -       If  there is a code to move the cursor one position to the
    -       left (such as backspace) that capability should  be  given
    -       as  cub1.   Similarly, codes to move to the right, up, and
    +       If there is a code to move the cursor one position to  the
    +       left  (such  as backspace) that capability should be given
    +       as cub1.  Similarly, codes to move to the right,  up,  and
            down should be given as cuf1, cuu1, and cud1.  These local
    -       cursor  motions  should not alter the text they pass over,
    -       for example, you would not normally use  "cuf1= "  because
    +       cursor motions should not alter the text they  pass  over,
    +       for  example,  you would not normally use "cuf1= " because
            the space would erase the character moved over.
     
    -       A  very  important  point  here  is  that the local cursor
    -       motions encoded in terminfo are undefined at the left  and
    -       top  edges  of  a  CRT  terminal.   Programs  should never
    -       attempt to backspace around the left edge,  unless  bw  is
    +       A very important point  here  is  that  the  local  cursor
    +       motions  encoded in terminfo are undefined at the left and
    +       top edges  of  a  CRT  terminal.   Programs  should  never
    +       attempt  to  backspace  around the left edge, unless bw is
            given, and never attempt to go up locally off the top.  In
    -       order to scroll text up, a program will go to  the  bottom
    +       order  to  scroll text up, a program will go to the bottom
            left corner of the screen and send the ind (index) string.
     
            To scroll text down, a program goes to the top left corner
    -       of the screen and sends the  ri  (reverse  index)  string.
    -       The  strings  ind  and  ri are undefined when not on their
    +       of  the  screen  and  sends the ri (reverse index) string.
    +       The strings ind and ri are undefined  when  not  on  their
            respective corners of the screen.
     
            Parameterized versions of the scrolling sequences are indn
            and rin which have the same semantics as ind and ri except
    -       that they take one parameter, and scroll that many  lines.
    -       They  are also undefined except at the appropriate edge of
    +       that  they take one parameter, and scroll that many lines.
    +       They are also undefined except at the appropriate edge  of
            the screen.
     
    -       The am capability tells whether the cursor sticks  at  the
    -       right  edge  of  the  screen when text is output, but this
    +       The  am  capability tells whether the cursor sticks at the
    +       right edge of the screen when text  is  output,  but  this
            does not necessarily apply to a cuf1 from the last column.
    -       The  only local motion which is defined from the left edge
    -       is if bw is given, then a cub1 from  the  left  edge  will
    -       move  to the right edge of the previous row.  If bw is not
    -       given, the effect is undefined.  This is useful for  draw-
    -       ing  a box around the edge of the screen, for example.  If
    -       the terminal has switch selectable automatic margins,  the
    -       terminfo  file  usually assumes that this is on; i.e., am.
    -       If the terminal has a command which  moves  to  the  first
    -       column  of the next line, that command can be given as nel
    -       (newline).  It does not matter if the command  clears  the
    -       remainder  of  the current line, so if the terminal has no
    -       cr and lf it may still be possible to craft a working  nel
    +       The only local motion which is defined from the left  edge
    +       is  if  bw  is  given, then a cub1 from the left edge will
    +       move to the right edge of the previous row.  If bw is  not
    +       given,  the effect is undefined.  This is useful for draw-
    +       ing a box around the edge of the screen, for example.   If
    +       the  terminal has switch selectable automatic margins, the
    +       terminfo file usually assumes that this is on;  i.e.,  am.
    +       If  the  terminal  has  a command which moves to the first
    +       column of the next line, that command can be given as  nel
    +       (newline).   It  does not matter if the command clears the
    +       remainder of the current line, so if the terminal  has  no
    +       cr  and lf it may still be possible to craft a working nel
            out of one or both of them.
     
            These  capabilities  suffice  to  describe  hard-copy  and
    -       "glass-tty" terminals.  Thus  the  model  33  teletype  is
    +       "glass-tty"  terminals.   Thus  the  model  33 teletype is
            described as
     
            33|tty33|tty|model 33 teletype,
    @@ -1330,21 +1421,21 @@
     
     
     

    Parameterized Strings

    -       Cursor  addressing  and other strings requiring parameters
    -       in the terminal are described by  a  parameterized  string
    -       capability,  with  printf-like  escapes  such as %x in it.
    -       For example, to address the cursor, the cup capability  is
    +       Cursor addressing and other strings  requiring  parameters
    +       in  the  terminal  are described by a parameterized string
    +       capability, with printf-like escapes such  as  %x  in  it.
    +       For  example, to address the cursor, the cup capability is
            given, using two parameters: the row and column to address
            to.  (Rows and columns are numbered from zero and refer to
            the physical screen visible to the user, not to any unseen
    -       memory.)  If  the  terminal  has  memory  relative  cursor
    +       memory.)   If  the  terminal  has  memory  relative cursor
            addressing, that can be indicated by mrcup.
     
    -       The  parameter  mechanism uses a stack and special % codes
    -       to manipulate it.  Typically a sequence will push  one  of
    -       the  parameters  onto  the stack and then print it in some
    -       format.  Print (e.g., "%d")  is  a  special  case.   Other
    -       operations,  including  "%t"  pop  their  operand from the
    +       The parameter mechanism uses a stack and special  %  codes
    +       to  manipulate  it.  Typically a sequence will push one of
    +       the parameters onto the stack and then print  it  in  some
    +       format.   Print  (e.g.,  "%d")  is  a special case.  Other
    +       operations, including "%t"  pop  their  operand  from  the
            stack.  It is noted that more complex operations are often
            necessary, e.g., in the sgr string.
     
    @@ -1353,8 +1444,8 @@
            %%   outputs "%"
     
            %[[:]flags][width[.precision]][doxXs]
    -            as  in  printf, flags are [-+#] and space.  Use a ":"
    -            to allow the next character to be a "-" flag,  avoid-
    +            as in printf, flags are [-+#] and space.  Use  a  ":"
    +            to  allow the next character to be a "-" flag, avoid-
                 ing interpreting "%-" as an operator.
     
            %c   print pop() like %c in printf
    @@ -1376,12 +1467,12 @@
            %g[A-Z]
                 get static variable [a-z] and push it
     
    -            The  terms  "static"  and  "dynamic"  are misleading.
    -            Historically, these are simply two different sets  of
    -            variables,  whose  values are not reset between calls
    -            to tparm(3x).  However, that fact is  not  documented
    -            in   other   implementations.   Relying  on  it  will
    -            adversely impact  portability  to  other  implementa-
    +            The terms  "static"  and  "dynamic"  are  misleading.
    +            Historically,  these are simply two different sets of
    +            variables, whose values are not reset  between  calls
    +            to  tparm(3x).   However, that fact is not documented
    +            in  other  implementations.   Relying  on   it   will
    +            adversely  impact  portability  to  other implementa-
                 tions.
     
            %'c' char constant c
    @@ -1405,16 +1496,16 @@
                 logical AND and OR operations (for conditionals)
     
            %!, %~
    -            unary  operations  (logical  and   bit   complement):
    +            unary   operations   (logical  and  bit  complement):
                 push(op pop())
     
            %i   add 1 to first two parameters (for ANSI terminals)
     
            %? expr %t thenpart %e elsepart %;
    -            This  forms  an  if-then-else.   The  %e  elsepart is
    -            optional.  Usually the %? expr part  pushes  a  value
    -            onto  the stack, and %t pops it from the stack, test-
    -            ing if it is nonzero (true).  If it is zero  (false),
    +            This forms  an  if-then-else.   The  %e  elsepart  is
    +            optional.   Usually  the  %? expr part pushes a value
    +            onto the stack, and %t pops it from the stack,  test-
    +            ing  if it is nonzero (true).  If it is zero (false),
                 control passes to the %e (else) part.
     
                 It is possible to form else-if's a la Algol 68:
    @@ -1423,221 +1514,221 @@
                 where ci are conditions, bi are bodies.
     
                 Use the -f option of tic or infocmp to see the struc-
    -            ture of if-then-else's.  Some strings, e.g., sgr  can
    +            ture  of if-then-else's.  Some strings, e.g., sgr can
                 be very complicated when written on one line.  The -f
    -            option splits the string into lines  with  the  parts
    +            option  splits  the  string into lines with the parts
                 indented.
     
            Binary operations are in postfix form with the operands in
    -       the usual order.  That  is,  to  get  x-5  one  would  use
    -       "%gx%{5}%-".   %P  and  %g variables are persistent across
    +       the  usual  order.   That  is,  to  get  x-5 one would use
    +       "%gx%{5}%-".  %P and %g variables  are  persistent  across
            escape-string evaluations.
     
            Consider the HP2645, which, to get to row 3 and column 12,
    -       needs  to  be  sent  \E&a12c03Y padded for 6 milliseconds.
    -       Note that the order of the rows and  columns  is  inverted
    -       here,  and that the row and column are printed as two dig-
    +       needs to be sent \E&a12c03Y  padded  for  6  milliseconds.
    +       Note  that  the  order of the rows and columns is inverted
    +       here, and that the row and column are printed as two  dig-
            its.  Thus its cup capability is "cup=6\E&%p2%2dc%p1%2dY".
     
            The Microterm ACT-IV needs the current row and column sent
    -       preceded  by  a ^T, with the row and column simply encoded
    -       in binary, "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"
    -       need  to  be  able  to backspace the cursor (cub1), and to
    +       preceded by a ^T, with the row and column  simply  encoded
    +       in  binary,  "cup=^T%p1%c%p2%c".  Terminals which use "%c"
    +       need to be able to backspace the  cursor  (cub1),  and  to
            move the cursor up one line on the screen (cuu1).  This is
    -       necessary  because it is not always safe to transmit \n ^D
    -       and \r, as the system may change or  discard  them.   (The
    -       library  routines  dealing  with terminfo set tty modes so
    +       necessary because it is not always safe to transmit \n  ^D
    +       and  \r,  as  the system may change or discard them.  (The
    +       library routines dealing with terminfo set  tty  modes  so
            that tabs are never expanded, so \t is safe to send.  This
            turns out to be essential for the Ann Arbor 4080.)
     
            A final example is the LSI ADM-3a, which uses row and col-
            umn  offset  by  a  blank  character,  thus  "cup=\E=%p1%'
    -       '%+%c%p2%'  '%+%c".   After sending "\E=", this pushes the
    -       first parameter, pushes the ASCII value for a space  (32),
    -       adds  them  (pushing  the sum on the stack in place of the
    -       two previous values) and outputs that value as  a  charac-
    -       ter.   Then  the  same  is  done for the second parameter.
    +       '%+%c%p2%' '%+%c".  After sending "\E=", this  pushes  the
    +       first  parameter, pushes the ASCII value for a space (32),
    +       adds them (pushing the sum on the stack in  place  of  the
    +       two  previous  values) and outputs that value as a charac-
    +       ter.  Then the same is  done  for  the  second  parameter.
            More complex arithmetic is possible using the stack.
     
     
     

    Cursor Motions

            If the terminal has a fast way to home the cursor (to very
    -       upper  left  corner  of  screen) then this can be given as
    -       home; similarly a fast way of getting to the  lower  left-
    -       hand  corner can be given as ll; this may involve going up
    -       with cuu1 from the home position,  but  a  program  should
    -       never  do this itself (unless ll does) because it can make
    -       no assumption about the effect of moving up from the  home
    -       position.   Note  that  the  home  position is the same as
    +       upper left corner of screen) then this  can  be  given  as
    +       home;  similarly  a fast way of getting to the lower left-
    +       hand corner can be given as ll; this may involve going  up
    +       with  cuu1  from  the  home position, but a program should
    +       never do this itself (unless ll does) because it can  make
    +       no  assumption about the effect of moving up from the home
    +       position.  Note that the home  position  is  the  same  as
            addressing to (0,0): to the top left corner of the screen,
    -       not  of  memory.   (Thus, the \EH sequence on HP terminals
    +       not of memory.  (Thus, the \EH sequence  on  HP  terminals
            cannot be used for home.)
     
            If the terminal has row or column absolute cursor address-
    -       ing,  these  can be given as single parameter capabilities
    +       ing, these can be given as single  parameter  capabilities
            hpa (horizontal position absolute) and vpa (vertical posi-
            tion absolute).  Sometimes these are shorter than the more
    -       general two parameter sequence (as with  the  hp2645)  and
    +       general  two  parameter  sequence (as with the hp2645) and
            can be used in preference to cup.  If there are parameter-
    -       ized local motions (e.g., move  n  spaces  to  the  right)
    +       ized  local  motions  (e.g.,  move  n spaces to the right)
            these can be given as cud, cub, cuf, and cuu with a single
    -       parameter indicating how many spaces to move.   These  are
    -       primarily  useful  if the terminal does not have cup, such
    +       parameter  indicating  how many spaces to move.  These are
    +       primarily useful if the terminal does not have  cup,  such
            as the TEKTRONIX 4025.
     
            If the terminal needs to be in a special mode when running
            a program that uses these capabilities, the codes to enter
    -       and exit this mode can be given as smcup and rmcup.   This
    -       arises,  for example, from terminals like the Concept with
    -       more than one page of memory.  If the  terminal  has  only
    -       memory  relative cursor addressing and not screen relative
    +       and  exit this mode can be given as smcup and rmcup.  This
    +       arises, for example, from terminals like the Concept  with
    +       more  than  one  page of memory.  If the terminal has only
    +       memory relative cursor addressing and not screen  relative
            cursor addressing, a one screen-sized window must be fixed
    -       into  the terminal for cursor addressing to work properly.
    +       into the terminal for cursor addressing to work  properly.
            This is also used for the TEKTRONIX 4025, where smcup sets
    -       the  command character to be the one used by terminfo.  If
    -       the smcup sequence will not restore the  screen  after  an
    +       the command character to be the one used by terminfo.   If
    +       the  smcup  sequence  will not restore the screen after an
            rmcup sequence is output (to the state prior to outputting
            rmcup), specify nrrmc.
     
     
     

    Area Clears

            If the terminal can clear from the current position to the
    -       end  of  the  line,  leaving  the cursor where it is, this
    +       end of the line, leaving the  cursor  where  it  is,  this
            should be given as el.  If the terminal can clear from the
    -       beginning  of  the line to the current position inclusive,
    -       leaving the cursor where it is, this should  be  given  as
    -       el1.   If the terminal can clear from the current position
    -       to the end of the display, then this should  be  given  as
    -       ed.   Ed  is only defined from the first column of a line.
    -       (Thus, it can be simulated by a request to delete a  large
    +       beginning of the line to the current  position  inclusive,
    +       leaving  the  cursor  where it is, this should be given as
    +       el1.  If the terminal can clear from the current  position
    +       to  the  end  of the display, then this should be given as
    +       ed.  Ed is only defined from the first column of  a  line.
    +       (Thus,  it can be simulated by a request to delete a large
            number of lines, if a true ed is not available.)
     
     
     

    Insert/delete line and vertical motions

    -       If  the terminal can open a new blank line before the line
    -       where the cursor is, this should be given as il1; this  is
    -       done  only  from the first position of a line.  The cursor
    +       If the terminal can open a new blank line before the  line
    +       where  the cursor is, this should be given as il1; this is
    +       done only from the first position of a line.   The  cursor
            must then appear on the newly blank line.  If the terminal
    -       can  delete  the  line  which  the cursor is on, then this
    -       should be given as dl1; this is done only from  the  first
    -       position  on  the line to be deleted.  Versions of il1 and
    -       dl1 which take a single parameter  and  insert  or  delete
    +       can delete the line which the  cursor  is  on,  then  this
    +       should  be  given as dl1; this is done only from the first
    +       position on the line to be deleted.  Versions of  il1  and
    +       dl1  which  take  a  single parameter and insert or delete
            that many lines can be given as il and dl.
     
    -       If  the terminal has a settable scrolling region (like the
    -       vt100) the command to set this can be described  with  the
    -       csr  capability,  which  takes two parameters: the top and
    +       If the terminal has a settable scrolling region (like  the
    +       vt100)  the  command to set this can be described with the
    +       csr capability, which takes two parameters:  the  top  and
            bottom lines of the scrolling region.  The cursor position
            is, alas, undefined after using this command.
     
    -       It  is possible to get the effect of insert or delete line
    +       It is possible to get the effect of insert or delete  line
            using csr on a properly chosen region; the sc and rc (save
    -       and  restore  cursor)  commands may be useful for ensuring
    -       that your synthesized insert/delete string does  not  move
    -       the  cursor.  (Note that the ncurses(3x) library does this
    -       synthesis  automatically,  so   you   need   not   compose
    +       and restore cursor) commands may be  useful  for  ensuring
    +       that  your  synthesized insert/delete string does not move
    +       the cursor.  (Note that the ncurses(3x) library does  this
    +       synthesis   automatically,   so   you   need  not  compose
            insert/delete strings for an entry with csr).
     
            Yet another way to construct insert and delete might be to
    -       use a combination of index with  the  memory-lock  feature
    -       found  on some terminals (like the HP-700/90 series, which
    +       use  a  combination  of index with the memory-lock feature
    +       found on some terminals (like the HP-700/90 series,  which
            however also has insert/delete).
     
    -       Inserting lines at the top or bottom  of  the  screen  can
    -       also  be  done using ri or ind on many terminals without a
    -       true insert/delete line, and is often faster even on  ter-
    +       Inserting  lines  at  the  top or bottom of the screen can
    +       also be done using ri or ind on many terminals  without  a
    +       true  insert/delete line, and is often faster even on ter-
            minals with those features.
     
    -       The  boolean  non_dest_scroll_region should be set if each
    -       scrolling window is effectively a view port on  a  screen-
    -       sized  canvas.   To  test  for  this  capability, create a
    -       scrolling region in the middle of the screen, write  some-
    -       thing  to  the  bottom line, move the cursor to the top of
    +       The boolean non_dest_scroll_region should be set  if  each
    +       scrolling  window  is effectively a view port on a screen-
    +       sized canvas.  To  test  for  this  capability,  create  a
    +       scrolling  region in the middle of the screen, write some-
    +       thing to the bottom line, move the cursor to  the  top  of
            the region, and do ri followed by dl1 or ind.  If the data
    -       scrolled  off  the  bottom  of  the  region  by the ri re-
    -       appears, then scrolling is non-destructive.  System V  and
    -       XSI  Curses  expect that ind, ri, indn, and rin will simu-
    -       late destructive scrolling; their  documentation  cautions
    -       you  not  to  define csr unless this is true.  This curses
    +       scrolled off the bottom  of  the  region  by  the  ri  re-
    +       appears,  then scrolling is non-destructive.  System V and
    +       XSI Curses expect that ind, ri, indn, and rin  will  simu-
    +       late  destructive  scrolling; their documentation cautions
    +       you not to define csr unless this is  true.   This  curses
            implementation is more liberal and will do explicit erases
            after scrolling if ndsrc is defined.
     
            If the terminal has the ability to define a window as part
    -       of memory, which all commands affect, it should  be  given
    +       of  memory,  which all commands affect, it should be given
            as the parameterized string wind.  The four parameters are
    -       the starting and ending lines in memory and  the  starting
    +       the  starting  and ending lines in memory and the starting
            and ending columns in memory, in that order.
     
    -       If  the terminal can retain display memory above, then the
    -       da capability should be given; if display  memory  can  be
    -       retained  below,  then db should be given.  These indicate
    -       that deleting a line  or  scrolling  may  bring  non-blank
    -       lines  up  from  below  or that scrolling back with ri may
    +       If the terminal can retain display memory above, then  the
    +       da  capability  should  be given; if display memory can be
    +       retained below, then db should be given.   These  indicate
    +       that  deleting  a  line  or  scrolling may bring non-blank
    +       lines up from below or that scrolling  back  with  ri  may
            bring down non-blank lines.
     
     
     

    Insert/Delete Character

    -       There are two basic kinds of  intelligent  terminals  with
    -       respect  to insert/delete character which can be described
    -       using terminfo.  The most common  insert/delete  character
    -       operations  affect only the characters on the current line
    -       and shift characters off the  end  of  the  line  rigidly.
    -       Other  terminals,  such  as the Concept 100 and the Perkin
    -       Elmer Owl, make a distinction between  typed  and  untyped
    -       blanks  on  the  screen, shifting upon an insert or delete
    -       only to an untyped blank on the  screen  which  is  either
    +       There  are  two  basic kinds of intelligent terminals with
    +       respect to insert/delete character which can be  described
    +       using  terminfo.   The most common insert/delete character
    +       operations affect only the characters on the current  line
    +       and  shift  characters  off  the  end of the line rigidly.
    +       Other terminals, such as the Concept 100  and  the  Perkin
    +       Elmer  Owl,  make  a distinction between typed and untyped
    +       blanks on the screen, shifting upon an  insert  or  delete
    +       only  to  an  untyped  blank on the screen which is either
            eliminated, or expanded to two untyped blanks.
     
    -       You  can determine the kind of terminal you have by clear-
    -       ing the screen and then typing text  separated  by  cursor
    -       motions.   Type  "abc    def"  using  local cursor motions
    -       (not spaces) between the "abc" and the "def".  Then  posi-
    -       tion  the  cursor before the "abc" and put the terminal in
    -       insert mode.  If typing characters causes the rest of  the
    -       line  to shift rigidly and characters to fall off the end,
    +       You can determine the kind of terminal you have by  clear-
    +       ing  the  screen  and then typing text separated by cursor
    +       motions.  Type "abc    def"  using  local  cursor  motions
    +       (not  spaces) between the "abc" and the "def".  Then posi-
    +       tion the cursor before the "abc" and put the  terminal  in
    +       insert  mode.  If typing characters causes the rest of the
    +       line to shift rigidly and characters to fall off the  end,
            then your terminal does not distinguish between blanks and
    -       untyped  positions.  If the "abc" shifts over to the "def"
    -       which then move together around the  end  of  the  current
    -       line  and onto the next as you insert, you have the second
    +       untyped positions.  If the "abc" shifts over to the  "def"
    +       which  then  move  together  around the end of the current
    +       line and onto the next as you insert, you have the  second
            type of terminal, and should give the capability in, which
            stands for "insert null".
     
    -       While  these  are  two  logically separate attributes (one
    -       line versus multi-line insert mode, and special  treatment
    -       of  untyped spaces) we have seen no terminals whose insert
    +       While these are two  logically  separate  attributes  (one
    +       line  versus multi-line insert mode, and special treatment
    +       of untyped spaces) we have seen no terminals whose  insert
            mode cannot be described with the single attribute.
     
    -       Terminfo can describe both terminals which have an  insert
    +       Terminfo  can describe both terminals which have an insert
            mode, and terminals which send a simple sequence to open a
    -       blank position on the current  line.   Give  as  smir  the
    -       sequence  to  get  into  insert  mode.   Give  as rmir the
    -       sequence to leave insert  mode.   Now  give  as  ich1  any
    +       blank  position  on  the  current  line.  Give as smir the
    +       sequence to get  into  insert  mode.   Give  as  rmir  the
    +       sequence  to  leave  insert  mode.   Now  give as ich1 any
            sequence needed to be sent just before sending the charac-
    -       ter to be inserted.  Most terminals  with  a  true  insert
    -       mode  will  not give ich1; terminals which send a sequence
    +       ter  to  be  inserted.   Most terminals with a true insert
    +       mode will not give ich1; terminals which send  a  sequence
            to open a screen position should give it here.
     
    -       If your terminal has both, insert mode is usually  prefer-
    -       able  to  ich1.   Technically,  you  should  not give both
    -       unless the terminal actually requires both to be  used  in
    -       combination.   Accordingly,  some  non-curses applications
    -       get confused if both are present; the symptom  is  doubled
    +       If  your terminal has both, insert mode is usually prefer-
    +       able to ich1.   Technically,  you  should  not  give  both
    +       unless  the  terminal actually requires both to be used in
    +       combination.  Accordingly,  some  non-curses  applications
    +       get  confused  if both are present; the symptom is doubled
            characters in an update using insert.  This requirement is
            now rare; most ich sequences do not require previous smir,
            and most smir insert modes do not require ich1 before each
    -       character.  Therefore, the  new  curses  actually  assumes
    -       this  is the case and uses either rmir/smir or ich/ich1 as
    +       character.   Therefore,  the  new  curses actually assumes
    +       this is the case and uses either rmir/smir or ich/ich1  as
            appropriate (but not both).  If you have to write an entry
    -       to  be  used under new curses for a terminal old enough to
    +       to be used under new curses for a terminal old  enough  to
            need both, include the rmir/smir sequences in ich1.
     
            If post insert padding is needed, give this as a number of
    -       milliseconds  in ip (a string option).  Any other sequence
    -       which may need to be sent after  an  insert  of  a  single
    +       milliseconds in ip (a string option).  Any other  sequence
    +       which  may  need  to  be  sent after an insert of a single
            character may also be given in ip.  If your terminal needs
            both to be placed into an "insert mode" and a special code
    -       to  precede  each  inserted character, then both smir/rmir
    -       and ich1 can be given, and both will  be  used.   The  ich
    +       to precede each inserted character,  then  both  smir/rmir
    +       and  ich1  can  be  given, and both will be used.  The ich
            capability, with one parameter, n, will repeat the effects
            of ich1 n times.
     
    @@ -1645,62 +1736,62 @@
            in insert mode, give this as a number of milliseconds pad-
            ding in rmp.
     
    -       It is occasionally  necessary  to  move  around  while  in
    -       insert  mode  to delete characters on the same line (e.g.,
    -       if there is a tab after the insertion position).  If  your
    -       terminal  allows  motion while in insert mode you can give
    -       the capability mir to speed up  inserting  in  this  case.
    -       Omitting  mir  will  affect  only  speed.   Some terminals
    +       It  is  occasionally  necessary  to  move  around while in
    +       insert mode to delete characters on the same  line  (e.g.,
    +       if  there is a tab after the insertion position).  If your
    +       terminal allows motion while in insert mode you  can  give
    +       the  capability  mir  to  speed up inserting in this case.
    +       Omitting mir  will  affect  only  speed.   Some  terminals
            (notably Datamedia's) must not have mir because of the way
            their insert mode works.
     
    -       Finally,  you  can specify dch1 to delete a single charac-
    -       ter, dch with one parameter, n, to  delete  n  characters,
    -       and  delete mode by giving smdc and rmdc to enter and exit
    -       delete mode (any mode the terminal needs to be  placed  in
    +       Finally, you can specify dch1 to delete a  single  charac-
    +       ter,  dch  with  one parameter, n, to delete n characters,
    +       and delete mode by giving smdc and rmdc to enter and  exit
    +       delete  mode  (any mode the terminal needs to be placed in
            for dch1 to work).
     
    -       A  command to erase n characters (equivalent to outputting
    -       n blanks without moving the cursor) can be  given  as  ech
    +       A command to erase n characters (equivalent to  outputting
    +       n  blanks  without  moving the cursor) can be given as ech
            with one parameter.
     
     
     

    Highlighting, Underlining, and Visible Bells

            If  your  terminal  has  one  or  more  kinds  of  display
    -       attributes, these can be represented in a number  of  dif-
    +       attributes,  these  can be represented in a number of dif-
            ferent ways.  You should choose one display form as stand-
            out mode, representing a good, high contrast, easy-on-the-
    -       eyes,  format  for  highlighting  error messages and other
    -       attention getters.  (If you have a choice,  reverse  video
    -       plus  half-bright  is  good, or reverse video alone.)  The
    -       sequences to enter and exit standout  mode  are  given  as
    -       smso  and  rmso, respectively.  If the code to change into
    -       or out of standout mode leaves one or even two blank  spa-
    -       ces  on  the  screen,  as the TVI 912 and Teleray 1061 do,
    +       eyes, format for highlighting  error  messages  and  other
    +       attention  getters.   (If you have a choice, reverse video
    +       plus half-bright is good, or reverse  video  alone.)   The
    +       sequences  to  enter  and  exit standout mode are given as
    +       smso and rmso, respectively.  If the code to  change  into
    +       or  out of standout mode leaves one or even two blank spa-
    +       ces on the screen, as the TVI 912  and  Teleray  1061  do,
            then xmc should be given to tell how many spaces are left.
     
    -       Codes to begin underlining  and  end  underlining  can  be
    -       given  as smul and rmul respectively.  If the terminal has
    -       a code to underline the current  character  and  move  the
    +       Codes  to  begin  underlining  and  end underlining can be
    +       given as smul and rmul respectively.  If the terminal  has
    +       a  code  to  underline  the current character and move the
            cursor one space to the right, such as the Microterm Mime,
            this can be given as uc.
     
    -       Other capabilities to  enter  various  highlighting  modes
    -       include  blink  (blinking) bold (bold or extra bright) dim
    -       (dim or half-bright) invis (blanking  or  invisible  text)
    -       prot  (protected)  rev  (reverse video) sgr0 (turn off all
    -       attribute modes)  smacs  (enter  alternate  character  set
    -       mode)  and  rmacs  (exit  alternate  character  set mode).
    -       Turning on any of these modes singly may or may  not  turn
    +       Other  capabilities  to  enter  various highlighting modes
    +       include blink (blinking) bold (bold or extra  bright)  dim
    +       (dim  or  half-bright)  invis (blanking or invisible text)
    +       prot (protected) rev (reverse video) sgr0  (turn  off  all
    +       attribute  modes)  smacs  (enter  alternate  character set
    +       mode) and  rmacs  (exit  alternate  character  set  mode).
    +       Turning  on  any of these modes singly may or may not turn
            off other modes.
     
    -       If  there  is  a sequence to set arbitrary combinations of
    -       modes, this should be given as sgr (set attributes),  tak-
    -       ing  9 parameters.  Each parameter is either 0 or nonzero,
    +       If there is a sequence to set  arbitrary  combinations  of
    +       modes,  this should be given as sgr (set attributes), tak-
    +       ing 9 parameters.  Each parameter is either 0 or  nonzero,
            as the corresponding attribute is on or off.  The 9 param-
    -       eters  are, in order: standout, underline, reverse, blink,
    -       dim, bold, blank, protect, alternate character  set.   Not
    -       all  modes  need be supported by sgr, only those for which
    +       eters are, in order: standout, underline, reverse,  blink,
    +       dim,  bold,  blank, protect, alternate character set.  Not
    +       all modes need be supported by sgr, only those  for  which
            corresponding separate attribute commands exist.
     
            For example, the DEC vt220 supports most of the modes:
    @@ -1718,22 +1809,22 @@
             p8                   protect          not used
             p9                   altcharset       ^O (off) ^N (on)
     
    -       We begin each escape sequence by turning off any  existing
    -       modes,  since  there  is no quick way to determine whether
    +       We  begin each escape sequence by turning off any existing
    +       modes, since there is no quick way  to  determine  whether
            they are active.  Standout is set up to be the combination
    -       of  reverse  and  bold.   The vt220 terminal has a protect
    -       mode, though it is not commonly used  in  sgr  because  it
    -       protects  characters  on  the  screen from the host's era-
    -       sures.  The altcharset mode also is different in  that  it
    -       is  either ^O or ^N, depending on whether it is off or on.
    -       If all modes are turned  on,  the  resulting  sequence  is
    +       of reverse and bold.  The vt220  terminal  has  a  protect
    +       mode,  though  it  is  not commonly used in sgr because it
    +       protects characters on the screen  from  the  host's  era-
    +       sures.   The  altcharset mode also is different in that it
    +       is either ^O or ^N, depending on whether it is off or  on.
    +       If  all  modes  are  turned  on, the resulting sequence is
            \E[0;1;4;5;7;8m^N.
     
    -       Some  sequences  are common to different modes.  For exam-
    -       ple, ;7 is output when either p1 or p3 is true,  that  is,
    +       Some sequences are common to different modes.   For  exam-
    +       ple,  ;7  is output when either p1 or p3 is true, that is,
            if either standout or reverse modes are turned on.
     
    -       Writing  out  the above sequences, along with their depen-
    +       Writing out the above sequences, along with  their  depen-
            dencies yields
     
           sequence             when to output      terminfo translation
    @@ -1752,62 +1843,62 @@
                sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
                    %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
     
    -       Remember that if you specify sgr, you  must  also  specify
    -       sgr0.   Also, some implementations rely on sgr being given
    -       if sgr0 is, Not all terminfo entries necessarily  have  an
    -       sgr  string,  however.   Many terminfo entries are derived
    -       from termcap entries which have no sgr string.   The  only
    -       drawback  to  adding  an  sgr  string is that termcap also
    -       assumes that sgr0 does not exit  alternate  character  set
    +       Remember  that  if  you specify sgr, you must also specify
    +       sgr0.  Also, some implementations rely on sgr being  given
    +       if  sgr0  is, Not all terminfo entries necessarily have an
    +       sgr string, however.  Many terminfo  entries  are  derived
    +       from  termcap  entries which have no sgr string.  The only
    +       drawback to adding an sgr  string  is  that  termcap  also
    +       assumes  that  sgr0  does not exit alternate character set
            mode.
     
    -       Terminals  with  the  "magic  cookie" glitch (xmc) deposit
    +       Terminals with the "magic  cookie"  glitch  (xmc)  deposit
            special   "cookies"   when   they   receive   mode-setting
    -       sequences,  which affect the display algorithm rather than
    -       having extra bits for  each  character.   Some  terminals,
    -       such  as  the  HP  2621, automatically leave standout mode
    -       when they move to a new line or the cursor  is  addressed.
    -       Programs  using  standout  mode  should exit standout mode
    -       before moving the cursor or sending a newline, unless  the
    -       msgr  capability,  asserting  that  it  is safe to move in
    +       sequences, which affect the display algorithm rather  than
    +       having  extra  bits  for  each character.  Some terminals,
    +       such as the HP 2621,  automatically  leave  standout  mode
    +       when  they  move to a new line or the cursor is addressed.
    +       Programs using standout mode  should  exit  standout  mode
    +       before  moving the cursor or sending a newline, unless the
    +       msgr capability, asserting that it  is  safe  to  move  in
            standout mode, is present.
     
    -       If the terminal has a way of flashing the screen to  indi-
    -       cate  an  error quietly (a bell replacement) then this can
    +       If  the terminal has a way of flashing the screen to indi-
    +       cate an error quietly (a bell replacement) then  this  can
            be given as flash; it must not move the cursor.
     
    -       If the cursor needs to be made more  visible  than  normal
    +       If  the  cursor  needs to be made more visible than normal
            when it is not on the bottom line (to make, for example, a
    -       non-blinking underline into an easier  to  find  block  or
    +       non-blinking  underline  into  an  easier to find block or
            blinking underline) give this sequence as cvvis.  If there
    -       is a way to make the  cursor  completely  invisible,  give
    +       is  a  way  to  make the cursor completely invisible, give
            that as civis.  The capability cnorm should be given which
            undoes the effects of both of these modes.
     
            If your terminal correctly generates underlined characters
    -       (with  no  special  codes  needed) even though it does not
    -       overstrike, then you should give the capability ul.  If  a
    -       character  overstriking  another leaves both characters on
    +       (with no special codes needed) even  though  it  does  not
    +       overstrike,  then you should give the capability ul.  If a
    +       character overstriking another leaves both  characters  on
            the screen, specify the capability os.  If overstrikes are
    -       erasable  with  a  blank, then this should be indicated by
    +       erasable with a blank, then this should  be  indicated  by
            giving eo.
     
     
     

    Keypad and Function Keys

            If the terminal has a keypad that transmits codes when the
    -       keys  are  pressed,  this  information can be given.  Note
    +       keys are pressed, this information  can  be  given.   Note
            that it is not possible to handle terminals where the key-
            pad only works in local (this applies, for example, to the
    -       unshifted HP 2621 keys).  If the  keypad  can  be  set  to
    -       transmit  or  not  transmit,  give these codes as smkx and
    +       unshifted  HP  2621  keys).   If  the keypad can be set to
    +       transmit or not transmit, give these  codes  as  smkx  and
            rmkx.  Otherwise the keypad is assumed to always transmit.
     
    -       The codes sent by the left arrow, right arrow,  up  arrow,
    -       down  arrow,  and  home keys can be given as kcub1, kcuf1,
    -       kcuu1, kcud1, and khome respectively.  If there are  func-
    -       tion  keys  such  as f0, f1, ..., f10, the codes they send
    -       can be given as kf0, kf1, ..., kf10.  If these  keys  have
    -       labels  other  than the default f0 through f10, the labels
    +       The  codes  sent by the left arrow, right arrow, up arrow,
    +       down arrow, and home keys can be given  as  kcub1,  kcuf1,
    +       kcuu1,  kcud1, and khome respectively.  If there are func-
    +       tion keys such as f0, f1, ..., f10, the  codes  they  send
    +       can  be  given as kf0, kf1, ..., kf10.  If these keys have
    +       labels other than the default f0 through f10,  the  labels
            can be given as lf0, lf1, ..., lf10.
     
            The codes transmitted by certain other special keys can be
    @@ -1847,60 +1938,60 @@
     
            o   khts (set a tab stop in this column).
     
    -       In  addition,  if  the  keypad  has a 3 by 3 array of keys
    -       including the four arrow keys, the other five keys can  be
    +       In addition, if the keypad has a 3  by  3  array  of  keys
    +       including  the four arrow keys, the other five keys can be
            given as ka1, ka3, kb2, kc1, and kc3.  These keys are use-
    -       ful when the effects of a  3  by  3  directional  pad  are
    +       ful  when  the  effects  of  a  3 by 3 directional pad are
            needed.
     
    -       Strings  to  program  function keys can be given as pfkey,
    -       pfloc, and pfx.  A string to program screen labels  should
    -       be  specified  as  pln.   Each  of these strings takes two
    -       parameters: the function key number to program (from 0  to
    -       10)  and the string to program it with.  Function key num-
    -       bers out of this range may program  undefined  keys  in  a
    -       terminal  dependent  manner.   The  difference between the
    -       capabilities is that pfkey causes pressing the  given  key
    -       to  be the same as the user typing the given string; pfloc
    +       Strings to program function keys can be  given  as  pfkey,
    +       pfloc,  and pfx.  A string to program screen labels should
    +       be specified as pln.  Each  of  these  strings  takes  two
    +       parameters:  the function key number to program (from 0 to
    +       10) and the string to program it with.  Function key  num-
    +       bers  out  of  this  range may program undefined keys in a
    +       terminal dependent manner.   The  difference  between  the
    +       capabilities  is  that pfkey causes pressing the given key
    +       to be the same as the user typing the given string;  pfloc
            causes the string to be executed by the terminal in local;
    -       and  pfx  causes  the string to be transmitted to the com-
    +       and pfx causes the string to be transmitted  to  the  com-
            puter.
     
            The capabilities nlab, lw and lh define the number of pro-
    -       grammable  screen  labels  and their width and height.  If
    -       there are commands to turn the labels  on  and  off,  give
    -       them  in smln and rmln.  smln is normally output after one
    +       grammable screen labels and their width  and  height.   If
    +       there  are  commands  to  turn the labels on and off, give
    +       them in smln and rmln.  smln is normally output after  one
            or more pln sequences to make sure that the change becomes
            visible.
     
     
     

    Tabs and Initialization

    -       If  the terminal has hardware tabs, the command to advance
    -       to the next tab stop can be given as ht  (usually  control
    +       If the terminal has hardware tabs, the command to  advance
    +       to  the  next tab stop can be given as ht (usually control
            I).  A "back-tab" command which moves leftward to the pre-
    -       ceding tab stop can be given as cbt.   By  convention,  if
    -       the  teletype  modes indicate that tabs are being expanded
    -       by the computer rather than being sent  to  the  terminal,
    -       programs  should  not  use  ht  or  cbt  even  if they are
    -       present, since the user may not have the tab  stops  prop-
    -       erly  set.   If  the  terminal has hardware tabs which are
    -       initially set every n spaces when the terminal is  powered
    -       up,  the numeric parameter it is given, showing the number
    -       of spaces the tabs are set to.  This is normally  used  by
    -       the  tset command to determine whether to set the mode for
    -       hardware tab expansion, and whether to set the tab  stops.
    -       If  the  terminal  has tab stops that can be saved in non-
    -       volatile memory, the terminfo description can assume  that
    +       ceding  tab  stop  can be given as cbt.  By convention, if
    +       the teletype modes indicate that tabs are  being  expanded
    +       by  the  computer  rather than being sent to the terminal,
    +       programs should not  use  ht  or  cbt  even  if  they  are
    +       present,  since  the user may not have the tab stops prop-
    +       erly set.  If the terminal has  hardware  tabs  which  are
    +       initially  set every n spaces when the terminal is powered
    +       up, the numeric parameter it is given, showing the  number
    +       of  spaces  the tabs are set to.  This is normally used by
    +       the tset command to determine whether to set the mode  for
    +       hardware  tab expansion, and whether to set the tab stops.
    +       If the terminal has tab stops that can be  saved  in  non-
    +       volatile  memory, the terminfo description can assume that
            they are properly set.
     
    -       Other  capabilities include is1, is2, and is3, initializa-
    -       tion strings for the terminal, iprog, the path name  of  a
    -       program  to be run to initialize the terminal, and if, the
    -       name of a file  containing  long  initialization  strings.
    -       These  strings are expected to set the terminal into modes
    -       consistent with the  rest  of  the  terminfo  description.
    +       Other capabilities include is1, is2, and is3,  initializa-
    +       tion  strings  for the terminal, iprog, the path name of a
    +       program to be run to initialize the terminal, and if,  the
    +       name  of  a  file  containing long initialization strings.
    +       These strings are expected to set the terminal into  modes
    +       consistent  with  the  rest  of  the terminfo description.
            They are normally sent to the terminal, by the init option
    -       of the tput program, each time the  user  logs  in.   They
    +       of  the  tput  program,  each time the user logs in.  They
            will be printed in the following order:
     
                   run the program
    @@ -1920,107 +2011,107 @@
                   and finally
                          output is3.
     
    -       Most  initialization  is  done with is2.  Special terminal
    +       Most initialization is done with  is2.   Special  terminal
            modes can be set up without duplicating strings by putting
    -       the  common  sequences in is2 and special cases in is1 and
    +       the common sequences in is2 and special cases in  is1  and
            is3.
     
            A set of sequences that does a harder reset from a totally
            unknown state can be given as rs1, rs2, rf and rs3, analo-
    -       gous to is1 ,  is2  ,  if  and  is3  respectively.   These
    -       strings  are  output  by  the reset program, which is used
    -       when the terminal gets into a wedged state.  Commands  are
    -       normally  placed  in rs1, rs2 rs3 and rf only if they pro-
    -       duce annoying effects on the screen and are not  necessary
    -       when  logging  in.   For  example,  the command to set the
    -       vt100 into 80-column mode would normally be part  of  is2,
    -       but  it causes an annoying glitch of the screen and is not
    -       normally needed since the terminal is usually  already  in
    +       gous  to  is1  ,  is2  ,  if  and is3 respectively.  These
    +       strings are output by the reset  program,  which  is  used
    +       when  the terminal gets into a wedged state.  Commands are
    +       normally placed in rs1, rs2 rs3 and rf only if  they  pro-
    +       duce  annoying effects on the screen and are not necessary
    +       when logging in.  For example,  the  command  to  set  the
    +       vt100  into  80-column mode would normally be part of is2,
    +       but it causes an annoying glitch of the screen and is  not
    +       normally  needed  since the terminal is usually already in
            80 column mode.
     
            The reset program writes strings including iprog, etc., in
    -       the same order as  the  init  program,  using  rs1,  etc.,
    +       the  same  order  as  the  init  program, using rs1, etc.,
            instead of is1, etc.  If any of rs1, rs2, rs3, or rf reset
    -       capability strings are missing, the  reset  program  falls
    +       capability  strings  are  missing, the reset program falls
            back  upon  the  corresponding  initialization  capability
            string.
     
            If there are commands to set and clear tab stops, they can
    -       be  given  as tbc (clear all tab stops) and hts (set a tab
    -       stop in the current column of every row).  If a more  com-
    -       plex  sequence  is  needed  to  set  the  tabs than can be
    -       described by this, the sequence can be placed  in  is2  or
    +       be given as tbc (clear all tab stops) and hts (set  a  tab
    +       stop  in the current column of every row).  If a more com-
    +       plex sequence is needed  to  set  the  tabs  than  can  be
    +       described  by  this,  the sequence can be placed in is2 or
            if.
     
     
     

    Delays and Padding

    -       Many  older  and  slower  terminals  do not support either
    +       Many older and slower  terminals  do  not  support  either
            XON/XOFF or DTR handshaking, including hard copy terminals
    -       and  some  very  archaic CRTs (including, for example, DEC
    -       VT100s).  These may require padding characters after  cer-
    +       and some very archaic CRTs (including,  for  example,  DEC
    +       VT100s).   These may require padding characters after cer-
            tain cursor motions and screen changes.
     
            If the terminal uses xon/xoff handshaking for flow control
    -       (that is, it automatically emits ^S back to the host  when
    +       (that  is, it automatically emits ^S back to the host when
            its input buffers are close to full), set xon.  This capa-
    -       bility suppresses the emission of padding.  You  can  also
    -       set  it for memory-mapped console devices effectively that
    -       do not have a speed  limit.   Padding  information  should
    -       still  be  included so that routines can make better deci-
    +       bility  suppresses  the emission of padding.  You can also
    +       set it for memory-mapped console devices effectively  that
    +       do  not  have  a  speed limit.  Padding information should
    +       still be included so that routines can make  better  deci-
            sions about relative costs, but actual pad characters will
            not be transmitted.
     
    -       If  pb (padding baud rate) is given, padding is suppressed
    -       at baud rates below the value of pb.  If the entry has  no
    -       padding  baud rate, then whether padding is emitted or not
    +       If pb (padding baud rate) is given, padding is  suppressed
    +       at  baud rates below the value of pb.  If the entry has no
    +       padding baud rate, then whether padding is emitted or  not
            is completely controlled by xon.
     
    -       If the terminal requires other than a null (zero)  charac-
    -       ter  as  a  pad,  then this can be given as pad.  Only the
    +       If  the terminal requires other than a null (zero) charac-
    +       ter as a pad, then this can be given  as  pad.   Only  the
            first character of the pad string is used.
     
     
     

    Status Lines

    -       Some terminals have an extra "status line"  which  is  not
    -       normally  used  by  software  (and thus not counted in the
    +       Some  terminals  have  an extra "status line" which is not
    +       normally used by software (and thus  not  counted  in  the
            terminal's lines capability).
     
    -       The simplest case  is  a  status  line  which  is  cursor-
    -       addressable  but  not part of the main scrolling region on
    -       the screen; the Heathkit H19 has a  status  line  of  this
    -       kind,  as  would  a 24-line VT100 with a 23-line scrolling
    -       region set up on initialization.  This situation is  indi-
    +       The  simplest  case  is  a  status  line  which is cursor-
    +       addressable but not part of the main scrolling  region  on
    +       the  screen;  the  Heathkit  H19 has a status line of this
    +       kind, as would a 24-line VT100 with  a  23-line  scrolling
    +       region  set up on initialization.  This situation is indi-
            cated by the hs capability.
     
            Some terminals with status lines need special sequences to
    -       access the status line.   These  may  be  expressed  as  a
    +       access  the  status  line.   These  may  be expressed as a
            string with single parameter tsl which takes the cursor to
    -       a given zero-origin column on the status line.  The  capa-
    +       a  given zero-origin column on the status line.  The capa-
            bility fsl must return to the main-screen cursor positions
    -       before the last tsl.  You may need  to  embed  the  string
    -       values  of sc (save cursor) and rc (restore cursor) in tsl
    +       before  the  last  tsl.   You may need to embed the string
    +       values of sc (save cursor) and rc (restore cursor) in  tsl
            and fsl to accomplish this.
     
    -       The status line is normally assumed to be the  same  width
    -       as  the width of the terminal.  If this is untrue, you can
    +       The  status  line is normally assumed to be the same width
    +       as the width of the terminal.  If this is untrue, you  can
            specify it with the numeric capability wsl.
     
    -       A command to erase or blank the status line may be  speci-
    +       A  command to erase or blank the status line may be speci-
            fied as dsl.
     
    -       The   boolean   capability  eslok  specifies  that  escape
    +       The  boolean  capability  eslok  specifies   that   escape
            sequences, tabs, etc., work ordinarily in the status line.
     
    -       The ncurses implementation does not yet use any  of  these
    -       capabilities.   They are documented here in case they ever
    +       The  ncurses  implementation does not yet use any of these
    +       capabilities.  They are documented here in case they  ever
            become important.
     
     
     

    Line Graphics

    -       Many terminals have alternate character  sets  useful  for
    -       forms-drawing.   Terminfo  and curses build in support for
    -       the drawing characters supported by the VT100,  with  some
    -       characters  from  the  AT&T  4410v1 added.  This alternate
    +       Many  terminals  have  alternate character sets useful for
    +       forms-drawing.  Terminfo and curses build in  support  for
    +       the  drawing  characters supported by the VT100, with some
    +       characters from the AT&T  4410v1  added.   This  alternate
            character set may be specified by the acsc capability.
     
            Glyph                       ACS           Ascii     VT100
    @@ -2037,6 +2128,7 @@
            diamond                     ACS_DIAMOND   +         `
            greater-than-or-equal-to    ACS_GEQUAL    >         z
            greek pi                    ACS_PI        *         {
    +
            horizontal line             ACS_HLINE     -         q
            lantern symbol              ACS_LANTERN   #         i
            large plus or crossover     ACS_PLUS      +         n
    @@ -2058,74 +2150,74 @@
            upper right corner          ACS_URCORNER  +         k
            vertical line               ACS_VLINE     |         x
     
    -       The best way to define a new device's graphics set  is  to
    -       add  a  column  to a copy of this table for your terminal,
    -       giving  the  character   which   (when   emitted   between
    -       smacs/rmacs  switches) will be rendered as the correspond-
    -       ing graphic.  Then read off the VT100/your terminal  char-
    -       acter  pairs  right  to left in sequence; these become the
    +       The  best  way to define a new device's graphics set is to
    +       add a column to a copy of this table  for  your  terminal,
    +       giving   the   character   which   (when  emitted  between
    +       smacs/rmacs switches) will be rendered as the  correspond-
    +       ing  graphic.  Then read off the VT100/your terminal char-
    +       acter pairs right to left in sequence;  these  become  the
            ACSC string.
     
     
     

    Color Handling

    -       The curses  library  functions  init_pair  and  init_color
    -       manipulate  the  color pairs and color values discussed in
    -       this section (see curs_color(3x) for details on these  and
    +       The  curses  library  functions  init_pair  and init_color
    +       manipulate the color pairs and color values  discussed  in
    +       this  section (see curs_color(3x) for details on these and
            related functions).
     
    -       Most  color  terminals are either "Tektronix-like" or "HP-
    +       Most color terminals are either "Tektronix-like"  or  "HP-
            like":
     
    -       o   Tektronix-like terminals have a predefined  set  of  N
    -           colors  (where N is usually 8), and can set character-
    -           cell foreground  and  background  characters  indepen-
    +       o   Tektronix-like  terminals  have  a predefined set of N
    +           colors (where N is usually 8), and can set  character-
    +           cell  foreground  and  background  characters indepen-
                dently, mixing them into N * N color-pairs.
     
    -       o   On  HP-like  terminals,  the  user must set each color
    -           pair up separately (foreground and background are  not
    -           independently  settable).   Up to M color-pairs may be
    -           set up from  2*M  different  colors.   ANSI-compatible
    +       o   On HP-like terminals, the user  must  set  each  color
    +           pair  up separately (foreground and background are not
    +           independently settable).  Up to M color-pairs  may  be
    +           set  up  from  2*M  different colors.  ANSI-compatible
                terminals are Tektronix-like.
     
            Some basic color capabilities are independent of the color
            method.  The numeric capabilities colors and pairs specify
    -       the  maximum numbers of colors and color-pairs that can be
    -       displayed simultaneously.  The op (original  pair)  string
    -       resets  foreground  and background colors to their default
    -       values for the terminal.  The oc string resets all  colors
    -       or  color-pairs  to their default values for the terminal.
    -       Some terminals  (including  many  PC  terminal  emulators)
    -       erase  screen  areas  with  the  current  background color
    -       rather than the power-up default background; these  should
    +       the maximum numbers of colors and color-pairs that can  be
    +       displayed  simultaneously.   The op (original pair) string
    +       resets foreground and background colors to  their  default
    +       values  for the terminal.  The oc string resets all colors
    +       or color-pairs to their default values for  the  terminal.
    +       Some  terminals  (including  many  PC  terminal emulators)
    +       erase screen  areas  with  the  current  background  color
    +       rather  than the power-up default background; these should
            have the boolean capability bce.
     
    -       While  the curses library works with color pairs (reflect-
    -       ing the inability of some devices to  set  foreground  and
    +       While the curses library works with color pairs  (reflect-
    +       ing  the  inability  of some devices to set foreground and
            background colors independently), there are separate capa-
            bilities for setting these features:
     
    -       o   To change the current foreground or  background  color
    -           on  a  Tektronix-type  terminal,  use  setaf (set ANSI
    -           foreground) and setab (set ANSI  background)  or  setf
    -           (set  foreground)  and  setb  (set background).  These
    -           take one parameter, the color number.  The SVr4  docu-
    -           mentation  describes  only setaf/setab; the XPG4 draft
    +       o   To  change  the current foreground or background color
    +           on a Tektronix-type  terminal,  use  setaf  (set  ANSI
    +           foreground)  and  setab  (set ANSI background) or setf
    +           (set foreground) and  setb  (set  background).   These
    +           take  one parameter, the color number.  The SVr4 docu-
    +           mentation describes only setaf/setab; the  XPG4  draft
                says  that  "If  the  terminal  supports  ANSI  escape
                sequences  to  set  background  and  foreground,  they
                should be coded as setaf and setab, respectively.
     
            o   If the terminal supports other escape sequences to set
    -           background  and  foreground,  they  should be coded as
    -           setf and setb,  respectively.   The  vidputs  and  the
    +           background and foreground, they  should  be  coded  as
    +           setf  and  setb,  respectively.   The  vidputs and the
                refresh(3x) functions use the setaf and setab capabil-
                ities if they are defined.
     
    -       The setaf/setab and setf/setb capabilities take  a  single
    +       The  setaf/setab  and setf/setb capabilities take a single
            numeric argument each.  Argument values 0-7 of setaf/setab
    -       are portably defined as follows (the middle column is  the
    +       are  portably defined as follows (the middle column is the
            symbolic #define available in the header for the curses or
    -       ncurses libraries).  The terminal hardware is free to  map
    -       these  as  it  likes,  but  the RGB values indicate normal
    +       ncurses  libraries).  The terminal hardware is free to map
    +       these as it likes, but  the  RGB  values  indicate  normal
            locations in color space.
     
                  Color       #define       Value       RGB
    @@ -2136,10 +2228,9 @@
                  blue      COLOR_BLUE        4     0,0,max
                  magenta   COLOR_MAGENTA     5     max,0,max
                  cyan      COLOR_CYAN        6     0,max,max
    -
                  white     COLOR_WHITE       7     max,max,max
     
    -       The argument values of setf/setb  historically  correspond
    +       The  argument  values of setf/setb historically correspond
            to a different mapping, i.e.,
     
                  Color       #define       Value       RGB
    @@ -2153,36 +2244,36 @@
                  white     COLOR_WHITE       7     max,max,max
     
            It is important to not confuse the two sets of color capa-
    -       bilities; otherwise red/blue will be interchanged  on  the
    +       bilities;  otherwise  red/blue will be interchanged on the
            display.
     
    -       On  an  HP-like terminal, use scp with a color-pair number
    +       On an HP-like terminal, use scp with a  color-pair  number
            parameter to set which color pair is current.
     
            Some terminals allow the color values to be modified:
     
    -       o   On a Tektronix-like terminal, the capability  ccc  may
    -           be  present  to  indicate that colors can be modified.
    -           If so, the initc capability will take a  color  number
    -           (0  to  colors  -  1)and  three  more parameters which
    +       o   On  a  Tektronix-like terminal, the capability ccc may
    +           be present to indicate that colors  can  be  modified.
    +           If  so,  the initc capability will take a color number
    +           (0 to colors  -  1)and  three  more  parameters  which
                describe the color.  These three parameters default to
    -           being  interpreted  as  RGB (Red, Green, Blue) values.
    -           If the boolean capability hls  is  present,  they  are
    -           instead  as  HLS (Hue, Lightness, Saturation) indices.
    +           being interpreted as RGB (Red,  Green,  Blue)  values.
    +           If  the  boolean  capability  hls is present, they are
    +           instead as HLS (Hue, Lightness,  Saturation)  indices.
                The ranges are terminal-dependent.
     
    -       o   On an HP-like terminal, initp may  give  a  capability
    -           for  changing  a color-pair value.  It will take seven
    -           parameters; a color-pair number (0 to max_pairs -  1),
    -           and  two  triples describing first background and then
    -           foreground colors.  These  parameters  must  be  (Red,
    +       o   On  an  HP-like  terminal, initp may give a capability
    +           for changing a color-pair value.  It will  take  seven
    +           parameters;  a color-pair number (0 to max_pairs - 1),
    +           and two triples describing first background  and  then
    +           foreground  colors.   These  parameters  must be (Red,
                Green, Blue) or (Hue, Lightness, Saturation) depending
                on hls.
     
    -       On some color terminals, colors collide  with  highlights.
    +       On  some  color terminals, colors collide with highlights.
            You can register these collisions with the ncv capability.
    -       This is a bit-mask of attributes not to be used when  col-
    -       ors  are  enabled.  The correspondence with the attributes
    +       This  is a bit-mask of attributes not to be used when col-
    +       ors are enabled.  The correspondence with  the  attributes
            understood by curses is as follows:
     
               Attribute              Bit   Decimal      Set by
    @@ -2203,147 +2294,122 @@
               A_VERTICAL             14    16384        sgr1
               A_ITALIC               15    32768        sitm
     
    -       For example,  on  many  IBM  PC  consoles,  the  underline
    -       attribute  collides  with the foreground color blue and is
    -       not available in color mode.  These  should  have  an  ncv
    +       For  example,  on  many  IBM  PC  consoles,  the underline
    +       attribute collides with the foreground color blue  and  is
    +       not  available  in  color  mode.  These should have an ncv
            capability of 2.
     
    -       SVr4  curses  does nothing with ncv, ncurses recognizes it
    +       SVr4 curses does nothing with ncv, ncurses  recognizes  it
            and optimizes the output in favor of colors.
     
     
     

    Miscellaneous

    -       If the terminal requires other than a null (zero)  charac-
    -       ter  as  a  pad,  then this can be given as pad.  Only the
    -       first character of the pad string is used.  If the  termi-
    +       If  the terminal requires other than a null (zero) charac-
    +       ter as a pad, then this can be given  as  pad.   Only  the
    +       first  character of the pad string is used.  If the termi-
            nal does not have a pad character, specify npc.  Note that
    -       ncurses implements  the  termcap-compatible  PC  variable;
    -       though  the  application  may  set this value to something
    -       other than a null, ncurses will test  npc  first  and  use
    +       ncurses  implements  the  termcap-compatible  PC variable;
    +       though the application may set  this  value  to  something
    +       other  than  a  null,  ncurses will test npc first and use
            napms if the terminal has no pad character.
     
    -       If  the terminal can move up or down half a line, this can
    -       be indicated with hu  (half-line  up)  and  hd  (half-line
    +       If the terminal can move up or down half a line, this  can
    +       be  indicated  with  hu  (half-line  up) and hd (half-line
            down).  This is primarily useful for superscripts and sub-
    -       scripts on hard-copy terminals.  If a  hard-copy  terminal
    -       can  eject  to  the next page (form feed), give this as ff
    +       scripts  on  hard-copy terminals.  If a hard-copy terminal
    +       can eject to the next page (form feed), give  this  as  ff
            (usually control L).
     
    -       If there is a command to repeat a given character a  given
    -       number  of times (to save time transmitting a large number
    -       of identical characters) this can be  indicated  with  the
    -       parameterized  string  rep.   The  first  parameter is the
    -       character to be repeated and the second is the  number  of
    -       times  to repeat it.  Thus, tparm(repeat_char, 'x', 10) is
    +       If  there is a command to repeat a given character a given
    +       number of times (to save time transmitting a large  number
    +       of  identical  characters)  this can be indicated with the
    +       parameterized string rep.   The  first  parameter  is  the
    +       character  to  be repeated and the second is the number of
    +       times to repeat it.  Thus, tparm(repeat_char, 'x', 10)  is
            the same as "xxxxxxxxxx".
     
    -       If the terminal has a settable command character, such  as
    -       the  TEKTRONIX  4025, this can be indicated with cmdch.  A
    +       If  the terminal has a settable command character, such as
    +       the TEKTRONIX 4025, this can be indicated with  cmdch.   A
            prototype command character is chosen which is used in all
    -       capabilities.   This character is given in the cmdch capa-
    -       bility to identify it.  The following convention  is  sup-
    -       ported  on  some  UNIX  systems:  The environment is to be
    -       searched for a CC variable, and if found, all  occurrences
    +       capabilities.  This character is given in the cmdch  capa-
    +       bility  to  identify it.  The following convention is sup-
    +       ported on some UNIX systems:  The  environment  is  to  be
    +       searched  for a CC variable, and if found, all occurrences
            of the prototype character are replaced with the character
            in the environment variable.
     
    -       Terminal descriptions that do  not  represent  a  specific
    +       Terminal  descriptions  that  do  not represent a specific
            kind of known terminal, such as switch, dialup, patch, and
    -       network, should include the  gn  (generic)  capability  so
    -       that  programs  can  complain that they do not know how to
    -       talk to the terminal.  (This capability does not apply  to
    -       virtual   terminal   descriptions  for  which  the  escape
    +       network,  should  include  the  gn (generic) capability so
    +       that programs can complain that they do not  know  how  to
    +       talk  to the terminal.  (This capability does not apply to
    +       virtual  terminal  descriptions  for  which   the   escape
            sequences are known.)
     
    -       If the terminal has a "meta key" which  acts  as  a  shift
    -       key,  setting  the  8th  bit of any character transmitted,
    -       this fact can be indicated with km.   Otherwise,  software
    +       If  the  terminal  has  a "meta key" which acts as a shift
    +       key, setting the 8th bit  of  any  character  transmitted,
    +       this  fact  can be indicated with km.  Otherwise, software
            will assume that the 8th bit is parity and it will usually
    -       be cleared.  If strings exist to turn this "meta mode"  on
    +       be  cleared.  If strings exist to turn this "meta mode" on
            and off, they can be given as smm and rmm.
     
    -       If  the terminal has more lines of memory than will fit on
    -       the screen at once, the number of lines of memory  can  be
    -       indicated  with  lm.   A  value of lm#0 indicates that the
    +       If the terminal has more lines of memory than will fit  on
    +       the  screen  at once, the number of lines of memory can be
    +       indicated with lm.  A value of  lm#0  indicates  that  the
            number of lines is not fixed, but that there is still more
            memory than fits on the screen.
     
            If the terminal is one of those supported by the UNIX vir-
    -       tual terminal protocol, the terminal number can  be  given
    +       tual  terminal  protocol, the terminal number can be given
            as vt.
     
            Media copy strings which control an auxiliary printer con-
            nected to the terminal can be given as mc0: print the con-
    -       tents  of  the screen, mc4: turn off the printer, and mc5:
    -       turn on the printer.  When the printer  is  on,  all  text
    -       sent  to  the terminal will be sent to the printer.  It is
    +       tents of the screen, mc4: turn off the printer,  and  mc5:
    +       turn  on  the  printer.   When the printer is on, all text
    +       sent to the terminal will be sent to the printer.   It  is
            undefined whether the text is also displayed on the termi-
            nal screen when the printer is on.  A variation mc5p takes
            one parameter, and leaves the printer on for as many char-
    -       acters  as  the  value  of  the  parameter, then turns the
    -       printer off.  The parameter should not  exceed  255.   All
    +       acters as the value  of  the  parameter,  then  turns  the
    +       printer  off.   The  parameter should not exceed 255.  All
            text,  including  mc4,  is  transparently  passed  to  the
            printer while an mc5p is in effect.
     
     
     

    Glitches and Braindamage

    -       Hazeltine terminals, which do not allow "~" characters  to
    +       Hazeltine  terminals, which do not allow "~" characters to
            be displayed should indicate hz.
     
            Terminals which ignore a line-feed immediately after an am
            wrap, such as the Concept and vt100, should indicate xenl.
     
    -       If el is required to  get  rid  of  standout  (instead  of
    -       merely  writing  normal  text on top of it), xhp should be
    +       If  el  is  required  to  get  rid of standout (instead of
    +       merely writing normal text on top of it),  xhp  should  be
            given.
     
    -       Teleray terminals, where tabs turn  all  characters  moved
    -       over  to  blanks,  should  indicate xt (destructive tabs).
    -       Note:   the    variable    indicating    this    is    now
    -       "dest_tabs_magic_smso";  in  older  versions,  it was tel-
    +       Teleray  terminals,  where  tabs turn all characters moved
    +       over to blanks, should  indicate  xt  (destructive  tabs).
    +       Note:    the    variable    indicating    this    is   now
    +       "dest_tabs_magic_smso"; in older  versions,  it  was  tel-
            eray_glitch.  This glitch is also taken to mean that it is
    -       not  possible  to  position  the cursor on top of a "magic
    -       cookie", that to erase standout mode it is instead  neces-
    +       not possible to position the cursor on  top  of  a  "magic
    +       cookie",  that to erase standout mode it is instead neces-
            sary to use delete and insert line.  The ncurses implemen-
            tation ignores this glitch.
     
    -       The Beehive Superbee, which is unable to correctly  trans-
    -       mit  the escape or control C characters, has xsb, indicat-
    -       ing that the f1 key is used for escape and f2 for  control
    -       C.   (Only  certain Superbees have this problem, depending
    -       on the ROM.)  Note that in older terminfo  versions,  this
    -       capability   was   called   "beehive_glitch";  it  is  now
    +       The  Beehive Superbee, which is unable to correctly trans-
    +       mit the escape or control C characters, has xsb,  indicat-
    +       ing  that the f1 key is used for escape and f2 for control
    +       C.  (Only certain Superbees have this  problem,  depending
    +       on  the  ROM.)  Note that in older terminfo versions, this
    +       capability  was  called  "beehive_glitch";   it   is   now
            "no_esc_ctl_c".
     
    -       Other specific  terminal  problems  may  be  corrected  by
    +       Other  specific  terminal  problems  may  be  corrected by
            adding more capabilities of the form xx.
     
     
    -

    Similar Terminals

    -       If there are two very similar terminals, one (the variant)
    -       can be defined as being just like  the  other  (the  base)
    -       with  certain  exceptions.  In the definition of the vari-
    -       ant, the string capability use can be given with the  name
    -       of  the  base terminal.  The capabilities given before use
    -       override those in the base type named by  use.   If  there
    -       are  multiple use capabilities, they are merged in reverse
    -       order.  That is, the rightmost use reference is  processed
    -       first,  then the one to its left, and so forth.  Capabili-
    -       ties given explicitly in the entry override those  brought
    -       in by use references.
    -
    -       A capability can be canceled by placing xx@ to the left of
    -       the use reference that imports it, where xx is  the  capa-
    -       bility.  For example, the entry
    -
    -              2621-nl, smkx@, rmkx@, use=2621,
    -
    -       defines  a  2621-nl  that  does  not have the smkx or rmkx
    -       capabilities, and hence does not turn on the function  key
    -       labels  when in visual mode.  This is useful for different
    -       modes for a terminal, or for different user preferences.
    -
    -
     

    Pitfalls of Long Entries

            Long terminfo entries are unlikely to  be  a  problem;  to
            date,  no  entry  has even approached terminfo's 4096-byte
    @@ -2468,9 +2534,9 @@
            AT&T 505 terminal.
     
            Be careful assigning the kmous  capability.   The  ncurses
    -       wants  to  interpret it as KEY_MOUSE, for use by terminals
    -       and emulators like xterm that  can  return  mouse-tracking
    -       information in the keyboard-input stream.
    +       library  wants  to  interpret  it as KEY_MOUSE, for use by
    +       terminals and emulators like xterm that can return  mouse-
    +       tracking information in the keyboard-input stream.
     
            X/Open Curses does not mention italics.  Portable applica-
            tions must assume that  numeric  capabilities  are  signed
    @@ -2485,28 +2551,29 @@
            cases) different extension sets.  Here is a summary, accu-
            rate as of October 1995:
     
    -       SVR4, Solaris, ncurses -- These support all SVr4 capabili-
    -       ties.
    +       o   SVR4, Solaris, ncurses -- These support all SVr4 capa-
    +           bilities.
     
    -       SGI  --  Supports  the  SVr4  set,  adds  one undocumented
    -       extended string capability (set_pglen).
    +       o   SGI  --  Supports  the SVr4 set, adds one undocumented
    +           extended string capability (set_pglen).
     
    -       SVr1, Ultrix -- These support a restricted subset of  ter-
    -       minfo  capabilities.   The booleans end with xon_xoff; the
    -       numerics with  width_status_line;  and  the  strings  with
    -       prtr_non.
    +       o   SVr1, Ultrix -- These support a restricted  subset  of
    +           terminfo   capabilities.    The   booleans   end  with
    +           xon_xoff; the numerics with width_status_line; and the
    +           strings with prtr_non.
     
    -       HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234]
    -       numerics num_labels, label_height, label_width, plus func-
    -       tion  keys  11  through  63, plus plab_norm, label_on, and
    -       label_off, plus some incompatible extensions in the string
    -       table.
    +       o   HP/UX  --  Supports the SVr1 subset, plus the SVr[234]
    +           numerics num_labels, label_height,  label_width,  plus
    +           function keys 11 through 63, plus plab_norm, label_on,
    +           and label_off, plus some  incompatible  extensions  in
    +           the string table.
     
    -       AIX  --  Supports  the  SVr1 subset, plus function keys 11
    -       through 63, plus a number  of  incompatible  string  table
    -       extensions.
    +       o   AIX -- Supports the SVr1 subset, plus function keys 11
    +           through 63, plus a number of incompatible string table
    +           extensions.
     
    -       OSF -- Supports both the SVr4 set and the AIX extensions.
    +       o   OSF  --  Supports both the SVr4 set and the AIX exten-
    +           sions.
     
     
     

    FILES

    @@ -2520,7 +2587,7 @@
     
     
     

    AUTHORS

    -       Zeyd  M.  Ben-Halim,  Eric  S.  Raymond, Thomas E. Dickey.
    +       Zeyd M. Ben-Halim, Eric  S.  Raymond,  Thomas  E.  Dickey.
            Based on pcurses by Pavel Curtis.
     
     
    @@ -2533,6 +2600,9 @@
     
  • SYNOPSIS
  • DESCRIPTION diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html index faba1a86..03f4c6e6 100644 --- a/doc/html/man/tic.1m.html +++ b/doc/html/man/tic.1m.html @@ -403,7 +403,7 @@ infocmp(1m), captoinfo(1m), infotocap(1m), toe(1m), curses(3x), term(5). terminfo(5). - This describes ncurses version 6.0 (patch 20170218). + This describes ncurses version 6.0 (patch 20170304).
  • AUTHOR

    diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
    index e2a40ab5..2100f4ca 100644
    --- a/doc/html/man/toe.1m.html
    +++ b/doc/html/man/toe.1m.html
    @@ -120,7 +120,7 @@
            tic(1m),    infocmp(1m),   captoinfo(1m),   infotocap(1m),
            curses(3x), terminfo(5).
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     
    diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
    index 7fa10e86..588b32a9 100644
    --- a/doc/html/man/tput.1.html
    +++ b/doc/html/man/tput.1.html
    @@ -530,7 +530,7 @@
            clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
            curs_termcap(3x).
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     
    diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
    index 70599a4e..45dc271b 100644
    --- a/doc/html/man/tset.1.html
    +++ b/doc/html/man/tset.1.html
    @@ -435,7 +435,7 @@
            csh(1),   sh(1),   stty(1),   curs_terminfo(3x),   tty(4),
            terminfo(5), ttys(5), environ(7)
     
    -       This describes ncurses version 6.0 (patch 20170218).
    +       This describes ncurses version 6.0 (patch 20170304).
     
     
     
    diff --git a/include/hashed_db.h b/include/hashed_db.h
    index 1ae29b08..fc6f5366 100644
    --- a/include/hashed_db.h
    +++ b/include/hashed_db.h
    @@ -1,5 +1,5 @@
     /****************************************************************************
    - * Copyright (c) 2006 Free Software Foundation, Inc.                        *
    + * Copyright (c) 2006-2014,2017 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            *
    @@ -31,7 +31,7 @@
      ****************************************************************************/
     
     /*
    - * $Id: hashed_db.h,v 1.6 2014/04/12 22:41:10 tom Exp $
    + * $Id: hashed_db.h,v 1.7 2017/02/26 22:59:23 Andre.Sa Exp $
      */
     
     #ifndef HASHED_DB_H
    @@ -45,7 +45,7 @@
     
     #include 
     
    -#ifndef DBN_SUFFIX
    +#ifndef DBM_SUFFIX
     #define DBM_SUFFIX ".db"
     #endif
     
    diff --git a/man/curs_get_wstr.3x b/man/curs_get_wstr.3x
    index 22f0e068..be4dc371 100644
    --- a/man/curs_get_wstr.3x
    +++ b/man/curs_get_wstr.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_get_wstr.3x,v 1.10 2017/01/07 19:25:15 tom Exp $
    +.\" $Id: curs_get_wstr.3x,v 1.11 2017/03/04 21:24:04 tom Exp $
     .TH curs_get_wstr 3X ""
     .na
     .hy 0
    @@ -167,8 +167,18 @@ In the latter case,
     an ERR return without other data is treated as an end-of-file condition,
     and the returned array contains a \fBWEOF\fR followed by a null \fBwchar_t\fR.
     .PP
    -X/Open curses documents these functions to pass an array of \fBwchar_t\fR,
    -but all of the vendors implement this using \fBwint_t\fR.
    +X/Open curses documented these functions to pass an array of \fBwchar_t\fR
    +in 1997, but that was an error because of this part of the description:
    +.RS
    +.PP
    +The effect of \fIget_wstr()\fP is as though a series of calls to
    +\fIget_wch()\fP were made, until a newline character, end-of-line character, or
    +end-of-file character is processed.
    +.RE
    +.PP
    +The latter function \fIget_wch()\fP can return a negative value,
    +while \fBwchar_t\fP is a unsigned type.
    +All of the vendors implement this using \fBwint_t\fR, following the standard.
     .SH SEE ALSO
     Functions:
     \fBcurses\fR(3X),
    diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
    index 6c8a2d06..24b6fc52 100644
    --- a/man/curs_initscr.3x
    +++ b/man/curs_initscr.3x
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: curs_initscr.3x,v 1.26 2017/01/07 19:25:15 tom Exp $
    +.\" $Id: curs_initscr.3x,v 1.27 2017/03/04 20:59:02 tom Exp $
     .TH curs_initscr 3X ""
     .de bP
     .IP \(bu 4
    @@ -108,14 +108,19 @@ A program should always call \fBendwin\fR before exiting or escaping from
     \fBcurses\fR mode temporarily.
     This routine
     .bP
    -restores tty modes,
    +resets colors to correspond with the default color pair 0,
     .bP
    -moves the cursor to the lower left-hand corner of the screen and
    +moves the cursor to the lower left-hand corner of the screen,
     .bP
    -resets the terminal into
    -the proper non-visual mode.
    +clears the remainder of the line so that it uses the default colors,
    +.bP
    +sets the cursor to normal visibility (see \fBcurs_set\fP(3X)),
    +.bP
    +stops cursor-addressing mode using the \fIexit_ca_mode\fP terminal capability,
    +.bP
    +restores tty modes (see \fBreset_shell_mode\fP(3X)).
     .PP
    -Calling \fBrefresh\fR(3X) or \fBdoupdate\fR after a
    +Calling \fBrefresh\fR(3X) or \fBdoupdate\fR(3X) after a
     temporary escape causes the program to resume visual mode.
     .SS isendwin
     .PP
    @@ -155,8 +160,6 @@ i.e.,
     .bP
     \fBset_term\fP
     returns no error.
    -.SH NOTES
    -Note that \fBinitscr\fR and \fBnewterm\fR may be macros.
     .SH PORTABILITY
     These functions were described in the XSI Curses standard, Issue 4.
     As of 2015, the current document is X/Open Curses, Issue 7.
    diff --git a/man/manhtml.aliases b/man/manhtml.aliases
    index e27dc5ea..688862e6 100644
    --- a/man/manhtml.aliases
    +++ b/man/manhtml.aliases
    @@ -1,4 +1,4 @@
    -# $Id: manhtml.aliases,v 1.6 2017/01/14 19:57:16 tom Exp $
    +# $Id: manhtml.aliases,v 1.9 2017/03/05 00:55:53 tom Exp $
     #***************************************************************************
     # Copyright (c) 2013-2016,2017 Free Software Foundation, Inc.              *
     #                                                                          *
    @@ -28,10 +28,11 @@
     #***************************************************************************
     # Items in this list will be linked to the corresponding manpages by man2html
     addch(3X)		curs_addch(3X)
    +curs_set(3X)		curs_kernel(3X)
     delscreen(3X)		curs_initscr(3X)
    +doupdate(3X)		curs_refresh(3X)
     endwin(3X)		curs_initscr(3X)
     filter(3X)		curs_util(3X)
    -form_fieldtype(3X)	form_fieldtype(3X)
     get_wch(3X)		curs_get_wch(3X)
     getch(3X)		curs_getch(3X)
     inch(3X)		curs_inch(3X)
    @@ -42,6 +43,7 @@ keypad(3X)		curs_inopts(3X)
     meta(3X)		curs_inopts(3X)
     newterm(3X)		curs_initscr(3X)
     refresh(3X)		curs_refresh(3X)
    +reset_shell_mode(3X)	curs_kernel(3X)
     set_fieldtype(3X)	form_fieldtype(3X)
     set_term(3X)		curs_initscr(3X)
     setupterm(3X)		curs_terminfo(3X)
    diff --git a/man/terminfo.head b/man/terminfo.head
    index fcd27e3a..a7ba4e3c 100644
    --- a/man/terminfo.head
    +++ b/man/terminfo.head
    @@ -26,7 +26,7 @@
     .\" authorization.                                                           *
     .\"***************************************************************************
     .\"
    -.\" $Id: terminfo.head,v 1.23 2017/02/18 17:04:53 tom Exp $
    +.\" $Id: terminfo.head,v 1.30 2017/03/05 00:24:35 tom Exp $
     .TH terminfo 5 "" "" "File Formats"
     .ds n 5
     .ds d @TERMINFO@
    @@ -54,30 +54,54 @@ have, by specifying how to perform screen operations, and by
     specifying padding requirements and initialization sequences.
     This describes \fBncurses\fR
     version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
    +.SS Terminfo Entry Syntax
     .PP
     Entries in
     .I terminfo
    -consist of a sequence of \*(``,\*('' separated fields (embedded commas may be
    -escaped with a backslash or notated as \\054).
    -White space after the \*(``,\*('' separator is ignored.
    -The first entry for each terminal gives the names which are known for the
    +consist of a sequence of fields:
    +.bP
    +Each field ends with a comma \*(``,\*('' 
    +(embedded commas may be
    +escaped with a backslash or written as \*(``\\054\*('').
    +.bP
    +White space between fields is ignored.
    +.bP
    +The first field in a \fIterminfo\fP entry begins in the first column.
    +.bP
    +Newlines and leading whitespace (spaces or tabs)
    +may be used for formatting entries for readability.
    +These are removed from parsed entries.
    +.IP
    +The \fB@INFOCMP@\fP \fB\-f\fP and \fB\-W\fP options relies on this to
    +format if-then-else expressions,
    +or to enforce maximum line-width.
    +The resulting formatted terminal description can be read by \fB@TIC@\fP.
    +.bP
    +The first field for each terminal gives the names which are known for the
     terminal, separated by \*(``|\*('' characters.
    -The first name given is the most common abbreviation for the terminal,
    -the last name given should be a long name fully identifying the terminal,
    -and all others are understood as synonyms for the terminal name.
    -All names but the last should be in lower case and contain no blanks;
    +.IP
    +The first name given is the most common abbreviation for the terminal
    +(its primary name),
    +the last name given should be a long name fully identifying the terminal
    +(see \fBlongname\fP(3X)),
    +and all others are treated as synonyms (aliases) for the primary terminal name.
    +.IP
    +X/Open Curses advises that all names but the last should be in lower case
    +and contain no blanks;
     the last name may well contain upper case and blanks for readability.
    -.PP
    +.IP
    +This implementation is not so strict;
    +it allows mixed case in the primary name and aliases.
    +If the last name has no embedded blanks,
    +it allows that to be both an alias and a verbose name
    +(but will warn about this ambiguity).
    +.bP
     Lines beginning with a \*(``#\*('' in the first column are treated as comments.
    +.IP
     While comment lines are legal at any point, the output of \fB@CAPTOINFO@\fP
     and \fB@INFOTOCAP@\fP (aliases for \fB@TIC@\fP)
     will move comments so they occur only between entries.
     .PP
    -Newlines and leading tabs may be used for formatting entries for readability.
    -These are removed from parsed entries.
    -The \fB@INFOCMP@\ \-f\fP option relies on this to format if-then-else expressions:
    -the result can be read by \fB@TIC@\fP.
    -.PP
     Terminal names (except for the last, verbose entry) should
     be chosen using the following conventions.
     The particular piece of hardware making up the terminal should
    @@ -109,6 +133,72 @@ l l l.
     .TE
     .PP
     For more on terminal naming conventions, see the \fBterm(7)\fR manual page.
    +.SS Terminfo Capabilities Syntax
    +.PP
    +The terminfo entry consists of several \fIcapabilities\fP,
    +i.e., features that the terminal has,
    +or methods for exercising the terminal's features.
    +.PP
    +After the first field (giving the name(s) of the terminal entry),
    +there should be one or more \fIcapability\fP fields.
    +These are boolean, numeric or string names with corresponding values:
    +.bP
    +Boolean capabilities are true when present, false when absent.
    +There is no explicit value for boolean capabilities.
    +.bP
    +Numeric capabilities have a \*(``#\*('' following the name,
    +then an unsigned decimal integer value.
    +.bP
    +String capabilities have a \*(``=\*('' following the name,
    +then an string of characters making up the capability value.
    +.IP
    +String capabilities can be split into multiple lines,
    +just as the fields comprising a terminal entry can be
    +split into multiple lines.
    +While blanks between fields are ignored,
    +blanks embedded within a string value are retained,
    +except for leading blanks on a line.
    +.PP
    +Any capability can be \fIcanceled\fP,
    +i.e., suppressed from the terminal entry,
    +by following its name with \*(``@\*(''
    +rather than a capability value.
    +.SS Similar Terminals
    +.PP
    +If there are two very similar terminals, one (the variant) can be defined as
    +being just like the other (the base) with certain exceptions.
    +In the
    +definition of the variant, the string capability \fBuse\fR can be given with
    +the name of the base terminal:
    +.bP
    +The capabilities given before
    +.B use
    +override those in the base type named by
    +.BR use .
    +.bP
    +If there are multiple \fBuse\fR capabilities, they are merged in reverse order.
    +That is, the rightmost \fBuse\fR reference is processed first, then the one to
    +its left, and so forth.
    +.bP
    +Capabilities given explicitly in the entry override
    +those brought in by \fBuse\fR references.
    +.PP
    +A capability can be canceled by placing \fBxx@\fR to the left of the
    +use reference that imports it, where \fIxx\fP is the capability.
    +For example, the entry
    +.RS
    +.PP
    +2621\-nl, smkx@, rmkx@, use=2621,
    +.RE
    +.PP
    +defines a 2621\-nl that does not have the \fBsmkx\fR or \fBrmkx\fR capabilities,
    +and hence does not turn on the function key labels when in visual mode.
    +This is useful for different modes for a terminal, or for different
    +user preferences.
    +.PP
    +An entry included via \fBuse\fP can contain canceled capabilities,
    +which have the same effect as if those cancels were inline in the
    +using terminal entry.
     .SS Predefined Capabilities
     .\" Head of terminfo man page ends here
     .ps -1
    diff --git a/man/terminfo.tail b/man/terminfo.tail
    index 6b6a1b27..41b6d29f 100644
    --- a/man/terminfo.tail
    +++ b/man/terminfo.tail
    @@ -1,4 +1,4 @@
    -.\" $Id: terminfo.tail,v 1.76 2017/01/07 18:32:49 tom Exp $
    +.\" $Id: terminfo.tail,v 1.78 2017/03/04 23:52:35 tom Exp $
     .\" Beginning of terminfo.tail file
     .\" This file is part of ncurses.
     .\" See "terminfo.head" for copyright.
    @@ -1628,36 +1628,6 @@ Note that in older terminfo versions, this capability was called
     Other specific terminal problems may be corrected by adding more
     capabilities of the form \fBx\fR\fIx\fR.
     .PP
    -.SS Similar Terminals
    -.PP
    -If there are two very similar terminals, one (the variant) can be defined as
    -being just like the other (the base) with certain exceptions.
    -In the
    -definition of the variant, the string capability \fBuse\fR can be given with
    -the name of the base terminal.
    -The capabilities given before
    -.B use
    -override those in the base type named by
    -.BR use .
    -If there are multiple \fBuse\fR capabilities, they are merged in reverse order.
    -That is, the rightmost \fBuse\fR reference is processed first, then the one to
    -its left, and so forth.
    -Capabilities given explicitly in the entry override
    -those brought in by \fBuse\fR references.
    -.PP
    -A capability can be canceled by placing \fBxx@\fR to the left of the
    -use reference that imports it, where \fIxx\fP is the capability.
    -For example, the entry
    -.RS
    -.PP
    -2621\-nl, smkx@, rmkx@, use=2621,
    -.RE
    -.PP
    -defines a 2621\-nl that does not have the \fBsmkx\fR or \fBrmkx\fR capabilities,
    -and hence does not turn on the function key labels when in visual mode.
    -This is useful for different modes for a terminal, or for different
    -user preferences.
    -.PP
     .SS Pitfalls of Long Entries
     .PP
     Long terminfo entries are unlikely to be a problem; to date, no entry has even
    @@ -1775,8 +1745,8 @@ They are deduced from the
     documentation for the AT&T 505 terminal.
     .PP
     Be careful assigning the \fBkmous\fR capability.
    -The \fBncurses\fR wants to
    -interpret it as \fBKEY_MOUSE\fR, for use by terminals and emulators like xterm
    +The \fBncurses\fR library wants to interpret it as \fBKEY_MOUSE\fR,
    +for use by terminals and emulators like xterm
     that can return mouse-tracking information in the keyboard-input stream.
     .PP
     X/Open Curses does not mention italics.
    @@ -1792,30 +1762,30 @@ Different commercial ports of terminfo and curses support different subsets of
     the XSI Curses standard and (in some cases) different extension sets.
     Here
     is a summary, accurate as of October 1995:
    -.PP
    +.bP
     \fBSVR4, Solaris, ncurses\fR \-\-
     These support all SVr4 capabilities.
    -.PP
    +.bP
     \fBSGI\fR \-\-
     Supports the SVr4 set, adds one undocumented extended string
     capability (\fBset_pglen\fR).
    -.PP
    +.bP
     \fBSVr1, Ultrix\fR \-\-
     These support a restricted subset of terminfo capabilities.
     The booleans end with \fBxon_xoff\fR;
     the numerics with \fBwidth_status_line\fR;
     and the strings with \fBprtr_non\fR.
    -.PP
    +.bP
     \fBHP/UX\fR \-\-
     Supports the SVr1 subset, plus the SVr[234] numerics \fBnum_labels\fR,
     \fBlabel_height\fR, \fBlabel_width\fR, plus function keys 11 through 63, plus
     \fBplab_norm\fR, \fBlabel_on\fR, and \fBlabel_off\fR, plus some incompatible
     extensions in the string table.
    -.PP
    +.bP
     \fBAIX\fR \-\-
     Supports the SVr1 subset, plus function keys 11 through 63, plus a number
     of incompatible string table extensions.
    -.PP
    +.bP
     \fBOSF\fR \-\-
     Supports both the SVr4 set and the AIX extensions.
     .SH FILES
    diff --git a/ncurses/widechar/lib_cchar.c b/ncurses/widechar/lib_cchar.c
    index 20ccb75b..da28cfc0 100644
    --- a/ncurses/widechar/lib_cchar.c
    +++ b/ncurses/widechar/lib_cchar.c
    @@ -1,5 +1,5 @@
     /****************************************************************************
    - * Copyright (c) 2001-2014,2016 Free Software Foundation, Inc.              *
    + * Copyright (c) 2001-2016,2017 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 
     
    -MODULE_ID("$Id: lib_cchar.c,v 1.28 2016/05/28 23:36:34 tom Exp $")
    +MODULE_ID("$Id: lib_cchar.c,v 1.29 2017/03/04 19:56:00 tom Exp $")
     
     /* 
      * The SuSv2 description leaves some room for interpretation.  We'll assume wch
    @@ -59,7 +59,8 @@ setcchar(cchar_t *wcval,
     
         if (opts != NULL
     	|| wch == NULL
    -	|| ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)) {
    +	|| ((len = (unsigned) wcslen(wch)) > 1 && wcwidth(wch[0]) < 0)
    +	|| color_pair < 0) {
     	code = ERR;
         } else {
     	unsigned i;
    @@ -130,7 +131,8 @@ getcchar(const cchar_t *wcval,
     	    *color_pair = (NCURSES_PAIRS_T) GetPair(*wcval);
     	    wmemcpy(wch, wcval->chars, (size_t) len);
     	    wch[len] = L'\0';
    -	    code = OK;
    +	    if (*color_pair >= 0)
    +		code = OK;
     	}
         }
     
    diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
    index f74aeadd..1547e1cf 100644
    --- a/package/debian-mingw/changelog
    +++ b/package/debian-mingw/changelog
    @@ -1,8 +1,8 @@
    -ncurses6 (6.0+20170225) unstable; urgency=low
    +ncurses6 (6.0+20170304) unstable; urgency=low
     
       * latest weekly patch
     
    - -- Thomas E. Dickey   Sat, 25 Feb 2017 08:32:34 -0500
    + -- Thomas E. Dickey   Sun, 26 Feb 2017 11:41:23 -0500
     
     ncurses6 (5.9-20131005) unstable; urgency=low
     
    diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
    index f74aeadd..1547e1cf 100644
    --- a/package/debian-mingw64/changelog
    +++ b/package/debian-mingw64/changelog
    @@ -1,8 +1,8 @@
    -ncurses6 (6.0+20170225) unstable; urgency=low
    +ncurses6 (6.0+20170304) unstable; urgency=low
     
       * latest weekly patch
     
    - -- Thomas E. Dickey   Sat, 25 Feb 2017 08:32:34 -0500
    + -- Thomas E. Dickey   Sun, 26 Feb 2017 11:41:23 -0500
     
     ncurses6 (5.9-20131005) unstable; urgency=low
     
    diff --git a/package/debian/changelog b/package/debian/changelog
    index 0f204c85..434ba685 100644
    --- a/package/debian/changelog
    +++ b/package/debian/changelog
    @@ -1,8 +1,8 @@
    -ncurses6 (6.0+20170225) unstable; urgency=low
    +ncurses6 (6.0+20170304) unstable; urgency=low
     
       * latest weekly patch
     
    - -- Thomas E. Dickey   Sat, 25 Feb 2017 08:32:34 -0500
    + -- Thomas E. Dickey   Sun, 26 Feb 2017 11:41:23 -0500
     
     ncurses6 (5.9-20120608) unstable; urgency=low
     
    diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
    index c8676e9a..a126a3eb 100644
    --- a/package/mingw-ncurses.nsi
    +++ b/package/mingw-ncurses.nsi
    @@ -1,4 +1,4 @@
    -; $Id: mingw-ncurses.nsi,v 1.200 2017/02/25 13:32:34 tom Exp $
    +; $Id: mingw-ncurses.nsi,v 1.201 2017/02/26 16:41:23 tom Exp $
     
     ; TODO add examples
     ; TODO bump ABI to 6
    @@ -10,7 +10,7 @@
     !define VERSION_MAJOR "6"
     !define VERSION_MINOR "0"
     !define VERSION_YYYY  "2017"
    -!define VERSION_MMDD  "0225"
    +!define VERSION_MMDD  "0304"
     !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
     
     !define MY_ABI   "5"
    diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
    index 0c473f21..4dd7b116 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.0
    -Release: 20170225
    +Release: 20170304
     License: X11
     Group: Development/Libraries
     Source: ncurses-%{version}-%{release}.tgz
    diff --git a/package/ncurses.spec b/package/ncurses.spec
    index f99b0514..a4897f18 100644
    --- a/package/ncurses.spec
    +++ b/package/ncurses.spec
    @@ -1,7 +1,7 @@
     Summary: shared libraries for terminal handling
     Name: ncurses6
     Version: 6.0
    -Release: 20170225
    +Release: 20170304
     License: X11
     Group: Development/Libraries
     Source: ncurses-%{version}-%{release}.tgz
    diff --git a/progs/dump_entry.c b/progs/dump_entry.c
    index 3be09f86..db407187 100644
    --- a/progs/dump_entry.c
    +++ b/progs/dump_entry.c
    @@ -39,7 +39,7 @@
     #include "termsort.c"		/* this C file is generated */
     #include 	/* so is this */
     
    -MODULE_ID("$Id: dump_entry.c,v 1.148 2017/02/04 16:55:42 tom Exp $")
    +MODULE_ID("$Id: dump_entry.c,v 1.149 2017/03/04 20:18:20 tom Exp $")
     
     #define DISCARD(string) string = ABSENT_STRING
     #define PRINTF (void) printf
    @@ -571,7 +571,7 @@ wrap_concat(const char *src)
     	(!TcOutput() || strncmp(src, "..", 2))) {
     	int step = 0;
     	int used = width > WRAPPED ? width : WRAPPED;
    -	int size = used;
    +	int size;
     	int base = 0;
     	char *p, align[9];
     	const char *my_t = trailer;
    -- 
    2.44.0