From: Thomas E. Dickey Date: Sun, 16 Oct 2016 00:57:24 +0000 (+0000) Subject: ncurses 6.0 - patch 20161015 X-Git-Tag: v6.1~67 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=c3b21f65a2687f3894a0d3217006c23f162c893a;hp=7af63696972b12659832a1c3413d9ace9641c8f6;ds=sidebyside ncurses 6.0 - patch 20161015 + amend internal use of tputs to consistently use the number of lines affected, e.g., for insert/delete character operations. While merging terminfo source early in 1995, several descriptions used the "*" proportional delay for these operations, prompting a change in doupdate. + regenerate llib-* files. + regenerate HTML manpages. + fix several formatting issues with manual pages. --- diff --git a/NEWS b/NEWS index 92a00a4a..a53b691a 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.2677 2016/10/09 01:52:39 tom Exp $ +-- $Id: NEWS,v 1.2682 2016/10/15 23:26:53 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,16 @@ 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. +20161015 + + amend internal use of tputs to consistently use the number of lines + affected, e.g., for insert/delete character operations. While + merging terminfo source early in 1995, several descriptions used the + "*" proportional delay for these operations, prompting a change in + doupdate. + + regenerate llib-* files. + + regenerate HTML manpages. + + fix several formatting issues with manual pages. + 20161008 + adjust size in infocmp/tic to work with strlcpy. + fix configure script to record when strlcat is found on OpenBSD. @@ -11094,7 +11104,7 @@ it is not possible to add this information. (SVr4) curses, which doesn't use 'const' in its prototypes. + modify ifdef's in test/hashtest.c and test/view.c to compile with Solaris curses. - + modify _tracedump() to pad pad colors & attrs lines to match change + + modify _tracedump() to pad colors & attrs lines to match change in 970101 showing first/last changes. + corrected location of terminating null on dynamically allocated forms fields (patch by Per Foreby). diff --git a/VERSION b/VERSION index 40525620..906b2f6c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20161008 +5:0:9 6.0 20161015 diff --git a/dist.mk b/dist.mk index 54b05ef5..c3670a66 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.1127 2016/10/03 00:57:15 tom Exp $ +# $Id: dist.mk,v 1.1128 2016/10/15 15:43:49 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 = 20161008 +NCURSES_PATCH = 20161015 # 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/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html index 12f861b7..7665785b 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -1,7 +1,7 @@ @@ -160,7 +160,7 @@ GG acs magic cookie count If the single-line capabilities occur in an entry, they - will automatically be composed into an acsc string. The + will automatically be composed into an acsc string. The double-line capabilities and GG are discarded with a warn- ing message. @@ -178,10 +178,10 @@ font3 s3ds Additionally, the AIX box1 capability will be automati- - cally translated to an acsc string. + cally translated to an acsc string. Hewlett-Packard's terminfo library supports two nonstan- - dard terminfo capabilities meml (memory lock) and memu + dard terminfo capabilities meml (memory lock) and memu (memory unlock). These will be discarded with a warning message. @@ -198,7 +198,7 @@

SEE ALSO

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

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index ceb0e5b9..484a59c7 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -67,7 +67,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 31852c41..c4c0eddf 100644
--- a/doc/html/man/curs_attr.3x.html
+++ b/doc/html/man/curs_attr.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_attr.3x,v 1.47 2016/07/23 23:48:49 tom Exp @
+  * @Id: curs_attr.3x,v 1.48 2016/10/15 17:09:05 tom Exp @
   * attr_get
   * .br
   * .br
@@ -266,12 +266,12 @@
        A_ALTCHARSET, A_PROTECT, and A_INVIS).
 
        This implementation provides the  A_ITALIC  attribute  for
-       terminals which have the enter_italics_mode (sitm) and ex-
-       it_italics_mode (ritm) capabilities.  Italics are not men-
+       terminals which have the enter_italics_mode (sitm) and ex-
+       it_italics_mode (ritm) capabilities.  Italics are not men-
        tioned  in  X/Open  Curses.   Unlike  the  other video at-
-       tributes, I_ITALIC is unrelated to the set_attributes  ca-
+       tributes, A_ITALIC is unrelated to the set_attributes  ca-
        pabilities.  This implementation makes the assumption that
-       exit_attribute_mode may also reset italics.
+       exit_attribute_mode may also reset italics.
 
        XSI Curses added the new entry points, attr_get,  attr_on,
        attr_off,  attr_set,  wattr_on, wattr_off, wattr_get, wat-
diff --git a/doc/html/man/curs_clear.3x.html b/doc/html/man/curs_clear.3x.html
index cfc60626..237d4a27 100644
--- a/doc/html/man/curs_clear.3x.html
+++ b/doc/html/man/curs_clear.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -111,9 +111,9 @@
        scr).  This will not work under ncurses.
 
        This implementation, and others such as Solaris, sets  the
-       current  position  to  0,0  after erasing via werase() and
-       wclear().  That fact is not documented in other  implemen-
-       tations, and may not be true of implementations which were
+       current  position  to  0,0  after  erasing  via werase and
+       wclear.  That fact is not documented in other  implementa-
+       tions,  and  may not be true of implementations which were
        not derived from SVr4 source.
 
        Not obvious from  the  description,  most  implementations
diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html
index 4f6a34b0..cdeaec72 100644
--- a/doc/html/man/curs_color.3x.html
+++ b/doc/html/man/curs_color.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_color.3x,v 1.43 2016/07/30 15:22:11 tom Exp @
+  * @Id: curs_color.3x,v 1.45 2016/10/15 17:10:19 tom Exp @
   * .br
   * .br
   * .br
@@ -302,8 +302,8 @@

RETURN VALUE

-       The routines can_change_color()  and  has_colors()  return
-       TRUE or FALSE.
+       The routines can_change_color and has_colors  return  TRUE
+       or FALSE.
 
        All other routines return the integer ERR upon failure and
        an OK (SVr4 specifies only "an integer  value  other  than
@@ -321,7 +321,7 @@
 
           init_color
                returns  an error if the terminal does not support
-               this feature, e.g., if the initialize_color  capa-
+               this feature, e.g., if the initialize_color  capa-
                bility is absent from the terminal description.
 
           start_color
diff --git a/doc/html/man/curs_extend.3x.html b/doc/html/man/curs_extend.3x.html
index 2ad268f8..2a482b8f 100644
--- a/doc/html/man/curs_extend.3x.html
+++ b/doc/html/man/curs_extend.3x.html
@@ -27,7 +27,7 @@
   * authorization.                                                           *
   ****************************************************************************
   * Author: Thomas E. Dickey 1999-on
-  * @Id: curs_extend.3x,v 1.20 2016/05/14 23:10:54 tom Exp @
+  * @Id: curs_extend.3x,v 1.21 2016/10/15 16:52:48 tom Exp @
 -->
 
 
@@ -64,20 +64,20 @@

curses_version

-       Use  curses_version() to get the version number, including
+       Use  curses_version  to  get the version number, including
        patch level of the library, e.g., 5.0.19991023

use_extended_names

-       The use_extended_names()  function  controls  whether  the
-       calling  application  is  able to use user-defined or non-
-       standard names which may be  compiled  into  the  terminfo
-       description, i.e., via the terminfo or termcap interfaces.
-       Normally these names are  available  for  use,  since  the
-       essential  decision  is made by using the -x option of tic
-       to compile extended terminal definitions.  However you can
-       disable  this  feature  to ensure compatibility with other
-       implementations of curses.
+       The use_extended_names function controls whether the call-
+       ing application is able to use user-defined or nonstandard
+       names which may be compiled into the terminfo description,
+       i.e.,  via  the  terminfo or termcap interfaces.  Normally
+       these names are available for  use,  since  the  essential
+       decision  is made by using the -x option of tic to compile
+       extended terminal definitions.  However  you  can  disable
+       this  feature to ensure compatibility with other implemen-
+       tations of curses.

RETURN VALUE

diff --git a/doc/html/man/curs_getch.3x.html b/doc/html/man/curs_getch.3x.html
index 08942082..8eaad52d 100644
--- a/doc/html/man/curs_getch.3x.html
+++ b/doc/html/man/curs_getch.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_getch.3x,v 1.48 2016/09/10 21:56:25 Leon.Winter Exp @
+  * @Id: curs_getch.3x,v 1.49 2016/10/15 16:44:01 tom Exp @
 -->
 
 
@@ -295,7 +295,7 @@

RETURN VALUE

        All  routines  return  the integer ERR upon failure and an
-       integer value other than ERR (OK in the case of ungetch())
+       integer value other than ERR (OK in the case  of  ungetch)
        upon successful completion.
 
           ungetch
diff --git a/doc/html/man/curs_initscr.3x.html b/doc/html/man/curs_initscr.3x.html
index 09945199..c7e16775 100644
--- a/doc/html/man/curs_initscr.3x.html
+++ b/doc/html/man/curs_initscr.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -202,7 +202,7 @@
 
             Curses implementations may provide for  special  han-
             dling  of  the SIGINT, SIGQUIT and SIGTSTP signals if
-            their disposition is SIG_DFL at the time initscr() is
+            their disposition is SIG_DFL at the time  initscr  is
             called ...
 
             Any  special handling for these signals may remain in
diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html
index a7ab87a5..eacf7034 100644
--- a/doc/html/man/curs_inopts.3x.html
+++ b/doc/html/man/curs_inopts.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -193,8 +193,8 @@
        and  output queues associated with the INTR, QUIT and SUSP
        characters will not be done [see termio(7)].  When qiflush
        is  called,  the queues will be flushed when these control
-       characters are read.  You may want to call noqiflush()  in
-       a  signal handler if you want output to continue as though
+       characters are read.  You may want to call noqiflush in  a
+       signal  handler  if  you want output to continue as though
        the interrupt had not occurred, after the handler exits.
 
 
@@ -268,7 +268,7 @@
        curses  key-names).  On the other hand, an application can
        use define_key to establish a specific keycode for a given
        string.   This  makes  it  possible  for an application to
-       check for an extended capability's presence with tigetstr,
+       check for an extended capability's presence with tigetstr,
        and reassign the keycode to match its own needs.
 
        Low-level applications can use tigetstr to obtain the def-
diff --git a/doc/html/man/curs_kernel.3x.html b/doc/html/man/curs_kernel.3x.html
index 22eeefee..ceb4dc27 100644
--- a/doc/html/man/curs_kernel.3x.html
+++ b/doc/html/man/curs_kernel.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -79,7 +79,7 @@
        "shell"   (not  in  curses)  state  for  use  by  the  re-
        set_prog_mode and reset_shell_mode routines.  This is done
        automatically by initscr.  There is one such save area for
-       each screen context allocated by newterm().
+       each screen context allocated by newterm.

reset_prog_mode, reset_shell_mode

diff --git a/doc/html/man/curs_outopts.3x.html b/doc/html/man/curs_outopts.3x.html
index 4126dbb2..f77255ec 100644
--- a/doc/html/man/curs_outopts.3x.html
+++ b/doc/html/man/curs_outopts.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -193,8 +193,8 @@
        Issue 4.
 
        The XSI Curses standard is ambiguous on  the  question  of
-       whether  raw()  should  disable the CRLF translations con-
-       trolled by nl() and nonl().  BSD curses did turn off these
+       whether  raw  should  disable  the  CRLF translations con-
+       trolled by nl and nonl.  BSD curses  did  turn  off  these
        translations;  AT&T  curses (at least as late as SVr1) did
        not.  We choose to do so, on the theory that a  programmer
        requesting  raw  input wants a clean (ideally 8-bit clean)
diff --git a/doc/html/man/curs_refresh.3x.html b/doc/html/man/curs_refresh.3x.html
index 024119e2..1e3fc963 100644
--- a/doc/html/man/curs_refresh.3x.html
+++ b/doc/html/man/curs_refresh.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_refresh.3x,v 1.16 2016/01/30 15:52:36 tom Exp @
+  * @Id: curs_refresh.3x,v 1.17 2016/10/15 16:45:45 tom Exp @
 -->
 
 
@@ -114,7 +114,7 @@
        The wredrawln routine indicates to curses that some screen
        lines are corrupted and should be thrown away before  any-
        thing  is  written  over  them.   It touches the indicated
-       lines (marking them  changed).   The  routine  redrawwin()
+       lines  (marking  them  changed).   The  routine  redrawwin
        touches the entire window.
 
 
@@ -143,14 +143,14 @@
        The XSI Curses standard, Issue  4  describes  these  func-
        tions.
 
-       Whether  wnoutrefresh()  copies  to the virtual screen the
-       entire contents of a window or just its  changed  portions
-       has never been well-documented in historic curses versions
+       Whether  wnoutrefresh copies to the virtual screen the en-
+       tire contents of a window or just its changed portions has
+       never  been  well-documented  in  historic curses versions
        (including SVr4).  It might be unwise to  rely  on  either
        behavior  in  programs  that  might have to be linked with
        other curses implementations.  Instead, you can do an  ex-
-       plicit  touchwin() before the wnoutrefresh() call to guar-
-       antee an entire-contents copy anywhere.
+       plicit  touchwin before the wnoutrefresh call to guarantee
+       an entire-contents copy anywhere.

SEE ALSO

diff --git a/doc/html/man/curs_slk.3x.html b/doc/html/man/curs_slk.3x.html
index 3c9e054a..bb6758c1 100644
--- a/doc/html/man/curs_slk.3x.html
+++ b/doc/html/man/curs_slk.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -207,8 +207,8 @@
        tions.   It changes the argument type of the attribute-ma-
        nipulation functions slk_attron, slk_attroff,  slk_attrset
        to be attr_t, and adds const qualifiers.  The format codes
-       2 and 3 for slk_init() and the function slk_attr are  spe-
-       cific to ncurses.
+       2 and 3 for slk_init and the function slk_attr are specif-
+       ic to ncurses.

SEE ALSO

diff --git a/doc/html/man/curs_terminfo.3x.html b/doc/html/man/curs_terminfo.3x.html
index 2477c6bf..3e964ef5 100644
--- a/doc/html/man/curs_terminfo.3x.html
+++ b/doc/html/man/curs_terminfo.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_terminfo.3x,v 1.44 2016/08/20 23:26:10 tom Exp @
+  * @Id: curs_terminfo.3x,v 1.46 2016/10/15 17:27:48 tom Exp @
   * ***************************************************************************
   * ***************************************************************************
   * ***************************************************************************
@@ -149,14 +149,14 @@
             for curses applications.
 
             setupterm  determines if the entry is a hardcopy type
-            by checking the hc (hardcopy) capability.
+            by checking the hc (hardcopy) capability.
 
        0    means that the terminal could not be found,  or  that
             it  is  a generic type, having too little information
             for curses applications to run.
 
             setupterm determines if the entry is a  generic  type
-            by checking the gn (generic) capability.
+            by checking the gn (generic) capability.
 
        -1   means that the terminfo database could not be found.
 
@@ -226,44 +226,49 @@

Output Functions

        The tputs  routine  applies  padding  information  to  the
-       string  str  and  outputs  it.  The str must be a terminfo
-       string variable or the return value from  tparm,  tgetstr,
-       or tgoto.  affcnt is the number of lines affected, or 1 if
-       not applicable.  putc is a putchar-like routine  to  which
-       the characters are passed, one at a time.
-
-       The  putp routine calls tputs(str, 1, putchar).  Note that
-       the output of putp always  goes  to  stdout,  not  to  the
+       string str and outputs it:
+
+       o   The  str must be a terminfo string variable or the re-
+           turn value from tparm, tgetstr, or tgoto.
+
+       o   affcnt is the number of lines affected, or  1  if  not
+           applicable.
+
+       o   putc is a putchar-like routine to which the characters
+           are passed, one at a time.
+
+       The putp routine calls tputs(str, 1, putchar).  Note  that
+       the  output  of  putp  always  goes  to stdout, not to the
        fildes specified in setupterm.
 
        The vidputs routine displays the string on the terminal in
-       the video attribute mode attrs, which is  any  combination
-       of  the  attributes  listed in curses(3x).  The characters
+       the  video  attribute mode attrs, which is any combination
+       of the attributes listed in  curses(3x).   The  characters
        are passed to the putchar-like routine putc.
 
-       The vidattr routine is like the  vidputs  routine,  except
+       The  vidattr  routine  is like the vidputs routine, except
        that it outputs through putchar.
 
-       The  vid_attr  and vid_puts routines correspond to vidattr
-       and vidputs, respectively.  They use a  set  of  arguments
-       for  representing  the  video attributes plus color, i.e.,
+       The vid_attr and vid_puts routines correspond  to  vidattr
+       and  vidputs,  respectively.   They use a set of arguments
+       for representing the video attributes  plus  color,  i.e.,
        one of type attr_t for the attributes and one of short for
        the color_pair number.  The vid_attr and vid_puts routines
-       are designed to use the attribute constants with  the  WA_
-       prefix.   The  opts  argument  is reserved for future use.
-       Currently, applications must provide a  null  pointer  for
+       are  designed  to use the attribute constants with the WA_
+       prefix.  The opts argument is  reserved  for  future  use.
+       Currently,  applications  must  provide a null pointer for
        that argument.
 
-       The  mvcur  routine  provides low-level cursor motion.  It
-       takes effect immediately (rather  than  at  the  next  re-
+       The mvcur routine provides low-level  cursor  motion.   It
+       takes  effect  immediately  (rather  than  at the next re-
        fresh).

Terminal Capability Functions

-       The  tigetflag,  tigetnum and tigetstr routines return the
+       The tigetflag, tigetnum and tigetstr routines  return  the
        value of the capability corresponding to the terminfo cap-
-       name  passed  to them, such as xenl.  The capname for each
-       capability is given in the table column  entitled  capname
+       name passed to them, such as xenl.  The capname  for  each
+       capability  is  given in the table column entitled capname
        code in the capabilities section of terminfo(5).
 
        These routines return special values to denote errors.
@@ -272,14 +277,14 @@
 
        -1     if capname is not a boolean capability, or
 
-       0      if  it  is canceled or absent from the terminal de-
+       0      if it is canceled or absent from the  terminal  de-
               scription.
 
        The tigetnum routine returns
 
        -2     if capname is not a numeric capability, or
 
-       -1     if it is canceled or absent from the  terminal  de-
+       -1     if  it  is canceled or absent from the terminal de-
               scription.
 
        The tigetstr routine returns
@@ -287,13 +292,13 @@
        (char *)-1
               if capname is not a string capability, or
 
-       0      if  it  is canceled or absent from the terminal de-
+       0      if it is canceled or absent from the  terminal  de-
               scription.

Terminal Capability Names

-       These null-terminated arrays contain  the  short  terminfo
-       names  ("codes"), the termcap names, and the long terminfo
+       These  null-terminated  arrays  contain the short terminfo
+       names ("codes"), the termcap names, and the long  terminfo
        names ("fnames") for each of the predefined terminfo vari-
        ables:
               char *boolnames[], *boolcodes[], *boolfnames[]
@@ -304,119 +309,119 @@

RETURN VALUE

-       Routines  that  return  an integer return ERR upon failure
-       and OK (SVr4 only specifies "an integer value  other  than
-       ERR")  upon  successful completion, unless otherwise noted
+       Routines that return an integer return  ERR  upon  failure
+       and  OK  (SVr4 only specifies "an integer value other than
+       ERR") upon successful completion, unless  otherwise  noted
        in the preceding routine descriptions.
 
        Routines that return pointers always return NULL on error.
 
-       X/Open defines no error conditions.  In  this  implementa-
+       X/Open  defines  no error conditions.  In this implementa-
        tion
 
             del_curterm
-                 returns  an  error  if its terminal parameter is
+                 returns an error if its  terminal  parameter  is
                  null.
 
             putp calls tputs, returning the same error-codes.
 
             restartterm
-                 returns an error if the associated call  to  se-
+                 returns  an  error if the associated call to se-
                  tupterm returns an error.
 
             setupterm
-                 returns  an  error  if it cannot allocate enough
-                 memory, or create the initial  windows  (stdscr,
-                 curscr,  newscr).   Other  error  conditions are
+                 returns an error if it  cannot  allocate  enough
+                 memory,  or  create the initial windows (stdscr,
+                 curscr, newscr).   Other  error  conditions  are
                  documented above.
 
             tputs
-                 returns an error  if  the  string  parameter  is
-                 null.   It  does  not  detect I/O errors: X/Open
-                 states that tputs ignores the  return  value  of
+                 returns  an  error  if  the  string parameter is
+                 null.  It does not  detect  I/O  errors:  X/Open
+                 states  that  tputs  ignores the return value of
                  the output function putc.

PORTABILITY

        X/Open notes that vidattr and vidputs may be macros.
 
-       The  function  setterm is not described by X/Open and must
-       be considered non-portable.  All other  functions  are  as
+       The function setterm is not described by X/Open  and  must
+       be  considered  non-portable.   All other functions are as
        described by X/Open.
 
-       setupterm  copies  the terminal name to the array ttytype.
-       This is not part of X/Open Curses, but is assumed by  some
+       setupterm copies the terminal name to the  array  ttytype.
+       This  is not part of X/Open Curses, but is assumed by some
        applications.
 
-       If  configured  to  use the terminal-driver, e.g., for the
+       If configured to use the terminal-driver,  e.g.,  for  the
        MinGW port,
 
-       o   setupterm interprets a missing/empty TERM variable  as
+       o   setupterm  interprets a missing/empty TERM variable as
            the special value "unknown".
 
-       o   setupterm  allows explicit use of the the windows con-
+       o   setupterm allows explicit use of the the windows  con-
            sole driver by checking if $TERM is set to "#win32con"
            or an abbreviation of that string.
 
        Older versions of ncurses assumed that the file descriptor
-       passed to setupterm from initscr or newterm uses  buffered
-       I/O,  and would write to the corresponding stream.  In ad-
-       dition to the limitation that the  terminal  was  left  in
+       passed  to setupterm from initscr or newterm uses buffered
+       I/O, and would write to the corresponding stream.  In  ad-
+       dition  to  the  limitation  that the terminal was left in
        block-buffered mode on exit (like System V curses), it was
-       problematic because ncurses did not allow a  reliable  way
+       problematic  because  ncurses did not allow a reliable way
        to cleanup on receiving SIGTSTP.  The current version uses
-       output buffers managed directly by ncurses.  Some  of  the
+       output  buffers  managed directly by ncurses.  Some of the
        low-level functions described in this manual page write to
        the standard output.  They are not signal-safe.  The high-
        level functions in ncurses use alternate versions of these
        functions using the more reliable buffering scheme.
 
-       In System V Release 4, set_curterm has an int return  type
-       and  returns  OK  or ERR.  We have chosen to implement the
+       In  System V Release 4, set_curterm has an int return type
+       and returns OK or ERR.  We have chosen  to  implement  the
        X/Open Curses semantics.
 
        In System V Release 4, the third argument of tputs has the
        type int (*putc)(char).
 
        At least one implementation of X/Open Curses (Solaris) re-
-       turns a value other than OK/ERR from tputs.  That  returns
+       turns  a value other than OK/ERR from tputs.  That returns
        the length of the string, and does no error-checking.
 
-       X/Open  Curses prototypes tparm with a fixed number of pa-
-       rameters, rather than a variable argument list.  This  im-
-       plementation  uses  a  variable  argument list, but can be
-       configured to use the fixed-parameter list.  Portable  ap-
-       plications  should  provide 9 parameters after the format;
+       X/Open Curses prototypes tparm with a fixed number of  pa-
+       rameters,  rather than a variable argument list.  This im-
+       plementation uses a variable argument  list,  but  can  be
+       configured  to use the fixed-parameter list.  Portable ap-
+       plications should provide 9 parameters after  the  format;
        zeroes are fine for this purpose.
 
        In response to comments by Thomas E. Dickey, X/Open Curses
        Issue 7 proposed the tiparm function in mid-2009.
 
-       X/Open  notes  that  after calling mvcur, the curses state
-       may not match the actual terminal state, and that  an  ap-
-       plication  should  touch and refresh the window before re-
+       X/Open notes that after calling mvcur,  the  curses  state
+       may  not  match the actual terminal state, and that an ap-
+       plication should touch and refresh the window  before  re-
        suming normal curses calls.  Both ncurses and System V Re-
        lease 4 curses implement mvcur using the SCREEN data allo-
        cated in either initscr or newterm.  So though it is docu-
-       mented  as  a  terminfo function, mvcur is really a curses
+       mented as a terminfo function, mvcur is  really  a  curses
        function which is not well specified.
 
-       X/Open states that the old  location  must  be  given  for
-       mvcur.   This implementation allows the caller to use -1's
-       for the old ordinates.  In that case, the old location  is
+       X/Open  states  that  the  old  location must be given for
+       mvcur.  This implementation allows the caller to use  -1's
+       for  the old ordinates.  In that case, the old location is
        unknown.
 
-       Other  implementions  may  not declare the capability name
+       Other implementions may not declare  the  capability  name
        arrays.  Some provide them without declaring them.  X/Open
        does not specify them.
 
-       Extended  terminal  capability  names, e.g., as defined by
+       Extended terminal capability names, e.g.,  as  defined  by
        tic -x, are not stored in the arrays described here.

SEE ALSO

-       curses(3x), curs_initscr(3x), curs_kernel(3x),  curs_term-
-       cap(3x),  curs_variables(3x), term_variables(3x), putc(3),
+       curses(3x),  curs_initscr(3x), curs_kernel(3x), curs_term-
+       cap(3x), curs_variables(3x), term_variables(3x),  putc(3),
        terminfo(5)
 
 
diff --git a/doc/html/man/curs_trace.3x.html b/doc/html/man/curs_trace.3x.html
index ab4eaef9..c066797f 100644
--- a/doc/html/man/curs_trace.3x.html
+++ b/doc/html/man/curs_trace.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -99,7 +99,7 @@
             trace user and system times of updates.
 
        TRACE_TPUTS
-            trace tputs calls.
+            trace tputs calls.
 
        TRACE_UPDATE
             trace update actions, old & new screens.
diff --git a/doc/html/man/curs_window.3x.html b/doc/html/man/curs_window.3x.html
index 7b7efddb..16dcf10f 100644
--- a/doc/html/man/curs_window.3x.html
+++ b/doc/html/man/curs_window.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -218,7 +218,7 @@

BUGS

-       The  subwindow  functions (subwin, derwin, mvderwin, wsyn-
+       The  subwindow  functions (subwin, derwin, mvderwin, wsyn-
        cup, wsyncdown, wcursyncup, syncok) are flaky, incomplete-
        ly implemented, and not well tested.
 
diff --git a/doc/html/man/default_colors.3x.html b/doc/html/man/default_colors.3x.html
index 446d4286..e5f63afd 100644
--- a/doc/html/man/default_colors.3x.html
+++ b/doc/html/man/default_colors.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -59,9 +59,9 @@

DESCRIPTION

-       The use_default_colors() and assume_default_colors() func-
-       tions are extensions to the curses library.  They are used
-       with terminals that support ISO 6429 color, or equivalent.
+       The use_default_colors and assume_default_colors functions
+       are  extensions to the curses library.  They are used with
+       terminals that support  ISO  6429  color,  or  equivalent.
        These terminals allow the application to reset color to an
        unspecified default value (e.g., with SGR 39 or SGR 49).
 
@@ -72,19 +72,19 @@
        there are several implementations of the ls program  which
        use  colors to denote different file types or permissions.
        These "color ls" programs do not  necessarily  modify  the
-       background  color, typically using only the setaf terminfo
+       background  color, typically using only the setaf terminfo
        capability  to  set  the  foreground  color.   Full-screen
        applications  that  use default colors can achieve similar
        visual effects.
 
-       The first function, use_default_colors() tells the  curses
+       The first function, use_default_colors  tells  the  curses
        library  to  assign terminal default foreground/background
        colors to color number  -1.  So  init_pair(x,COLOR_RED,-1)
        will  initialize  pair  x as red on default background and
        init_pair(x,-1,COLOR_BLUE)  will  initialize  pair  x   as
        default foreground on blue.
 
-       The  other,  assume_default_colors() is a refinement which
+       The  other,  assume_default_colors  is  a refinement which
        tells which colors to paint for color pair 0.  This  func-
        tion  recognizes  a special color number -1, which denotes
        the default terminal color.
@@ -95,23 +95,23 @@
 
        These are ncurses extensions.  For other curses  implemen-
        tations,  color  number -1 does not mean anything, just as
-       for ncurses before a successful call  of  use_default_col-
-       ors() or assume_default_colors().
+       for ncurses before a successful call of use_default_colors
+       or assume_default_colors.
 
        Other  curses  implementations do not allow an application
        to modify color pair 0.  They assume that  the  background
        is COLOR_BLACK, but do not ensure that the color pair 0 is
        painted to match the assumption.  If your application does
-       not use either use_default_colors() or assume_default_col-
-       ors() ncurses will paint a white  foreground  (text)  with
-       black background for color pair 0.
+       not use either use_default_colors or assume_default_colors
+       ncurses will paint a white foreground  (text)  with  black
+       background for color pair 0.

RETURN VALUE

        These functions return the integer ERR upon failure and OK
        on success.  They will fail if either  the  terminal  does
-       not  support  the orig_pair or orig_colors capability.  If
-       the initialize_pair capability is not found,  this  causes
+       not  support  the orig_pair or orig_colors capability.  If
+       the initialize_pair capability is not found,  this  causes
        an error as well.
 
 
@@ -120,24 +120,24 @@
        accepts negative arguments to specify  default  foreground
        or background colors.
 
-       The  use_default_colors()  function  was  added to support
-       ded.  This is a full-screen application which uses  curses
-       to  manage only part of the screen.  The bottom portion of
-       the screen, which is of adjustable size, is left uncolored
-       to  display the results from shell commands.  The top por-
-       tion of the screen colors filenames using  a  scheme  like
-       the  "color  ls" programs.  Attempting to manage the back-
-       ground color of the screen for this application would give
-       unsatisfactory  results  for  a  variety of reasons.  This
-       extension was devised after noting that color  xterm  (and
-       similar  programs)  provides a background color which does
-       not necessarily correspond to  any  of  the  ANSI  colors.
-       While  a special terminfo entry could be constructed using
-       nine colors, there was no mechanism provided within curses
-       to  account for the related orig_pair and back_color_erase
+       The  use_default_colors function was added to support ded.
+       This is a full-screen application  which  uses  curses  to
+       manage only part of the screen.  The bottom portion of the
+       screen, which is of adjustable size, is left uncolored  to
+       display  the results from shell commands.  The top portion
+       of the screen colors filenames using  a  scheme  like  the
+       "color  ls" programs.  Attempting to manage the background
+       color of the screen for this application would give unsat-
+       isfactory  results  for a variety of reasons.  This exten-
+       sion was devised after noting that color xterm (and  simi-
+       lar  programs)  provides a background color which does not
+       necessarily correspond to any of the ANSI colors.  While a
+       special  terminfo  entry  could  be constructed using nine
+       colors, there was no mechanism provided within  curses  to
+       account  for  the  related  orig_pair and back_color_erase
        capabilities.
 
-       The assume_default_colors() function was added to solve  a
+       The assume_default_colors function was added  to  solve  a
        different  problem:  support  for applications which would
        use  environment  variables  and  other  configuration  to
        bypass  curses'  notion  of the terminal's default colors,
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 0f1bc621..cc7c6e6b 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -235,7 +235,7 @@
        curses(3x) and related pages whose names begin "form_" for
        detailed descriptions of the entry points.
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 2bacccb1..24237fb4 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -1,7 +1,7 @@
 
 
 
@@ -51,7 +51,7 @@

SYNOPSIS

-       infocmp [-1CDEFGIKLTUVcdegilnpqrtux]
+       infocmp [-1CDEFGIKLTUVWcdegilnpqrtux]
              [-v n] [-s d| i| l| c] [-Q n] [-R subset]
              [-w width] [-A directory] [-B directory]
              [termname...]
@@ -441,10 +441,13 @@
             the  program runs.  Higher values of n induce greater
             verbosity.
 
+       -W   By itself, the -w option will not force long  strings
+            to be wrapped.  Use the -W option to do this.
+
        -w width
             changes the output to width characters.
 
-       -x   print  information  for  user-defined   capabilities.
+       -x   print   information  for  user-defined  capabilities.
             These are extensions to the terminfo repertoire which
             can be loaded using the -x option of tic.
 
@@ -455,13 +458,13 @@

EXTENSIONS

-       The  -0,  -1,  -E, -F, -G, -R, -T, -V, -a, -e, -f, -g, -i,
-       -l, -p, -q and  -t  options  are  not  supported  in  SVr4
+       The -0, -1, -E, -F, -G, -R, -T, -V, -a, -e,  -f,  -g,  -i,
+       -l,  -p,  -q  and  -t  options  are  not supported in SVr4
        curses.
 
        The -r option's notion of `termcap' capabilities is System
-       V Release 4's.  Actual BSD curses  versions  will  have  a
-       more  restricted  set.  To see only the 4.4BSD set, use -r
+       V  Release  4's.   Actual  BSD curses versions will have a
+       more restricted set.  To see only the 4.4BSD set,  use  -r
        -RBSD.
 
 
@@ -470,12 +473,12 @@

SEE ALSO

-       captoinfo(1m),    infotocap(1m),     tic(1m),     toe(1m),
+       captoinfo(1m),     infotocap(1m),     tic(1m),    toe(1m),
        curses(3x), terminfo(5).
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 2026e2fe..18de61e4 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -1,7 +1,7 @@
 
 
 
@@ -81,14 +81,14 @@

NOTES

-       This  utility  is  actually  a  link to tic, running in -C
-       mode.  You can use other tic options such as -f and  -x.
+       This  utility  is  actually  a  link to tic, running in -C
+       mode.  You can use other tic options such as -f and  -x.

SEE ALSO

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

AUTHOR

diff --git a/doc/html/man/legacy_coding.3x.html b/doc/html/man/legacy_coding.3x.html
index c9046dd7..b721536b 100644
--- a/doc/html/man/legacy_coding.3x.html
+++ b/doc/html/man/legacy_coding.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -57,7 +57,7 @@

DESCRIPTION

-       The  use_legacy_coding()  function  is an extension to the
+       The  use_legacy_coding  function  is  an  extension to the
        curses library.  It allows the caller to change the result
        of  unctrl, and suppress related checks within the library
        that would normally cause  nonprinting  characters  to  be
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index db720308..f03f6cfe 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 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html
index 35a8a5d7..2f4533bf 100644
--- a/doc/html/man/menu_format.3x.html
+++ b/doc/html/man/menu_format.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -61,7 +61,7 @@
        of the given menu.  If this size is too small  to  display
        all  menu items, the menu will be made scrollable. If this
        size is larger than the menus subwindow and the  subwindow
-       is  too  small to display all menu items, post_menu() will
+       is  too  small  to  display all menu items, post_menu will
        fail.
 
        The  default  format  is  16  rows,  1  column.    Calling
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index a6eee57c..edbad84d 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -89,8 +89,8 @@
             tion function.
 
        E_NO_ROOM
-            Menu is too large for its window. You should consider
-            to use set_menu_format() to solve the problem.
+            Menu is too large for its window.   You  should  con-
+            sider using set_menu_format to solve the problem.
 
        E_NOT_POSTED
             The menu has not been posted.
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 59f5d079..3d1cd67e 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 20160910).
+       ncurses version 6.0 (patch 20161015).
 
        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/panel.3x.html b/doc/html/man/panel.3x.html
index 43c9b678..0228e002 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -98,13 +98,13 @@
               (causes   it  to   be   displayed  above  any other
               panel) and returns a pointer to the new panel.
 
-       update_panels()
+       update_panels
               refreshes the virtual screen to reflect  the  rela-
               tions between the panels in the stack, but does not
-              call doupdate() to  refresh  the  physical  screen.
-              Use this function and not wrefresh or wnoutrefresh.
+              call doupdate to refresh the physical screen.   Use
+              this  function  and  not  wrefresh or wnoutrefresh.
               update_panels may be called more than once before a
-              call  to doupdate(), but doupdate() is the function
+              call  to  doupdate,  but  doupdate  is the function
               responsible for updating the physical screen.
 
        del_panel(pan)
@@ -138,8 +138,8 @@
               moves the given panel window so that its upper-left
               corner is at starty, startx.  It  does  not  change
               the position of the panel in the stack.  Be sure to
-              use this function, not mvwin(),  to  move  a  panel
-              window.
+              use this function, not mvwin, to move a panel  win-
+              dow.
 
        replace_panel(pan,window)
               replaces  the  current  window of panel with window
@@ -182,20 +182,19 @@
        are  merely   similar. The  programmer is cautioned not to
        directly use PANEL fields.
 
-       The functions show_panel() and top_panel()  are  identical
-       in  this  implementation,  and work equally well with dis-
-       played or hidden panels.  In the native System V implemen-
-       tation, show_panel() is intended for making a hidden panel
-       visible (at the top  of  the  stack)  and  top_panel()  is
-       intended  for  making an already-visible panel move to the
-       top of the stack. You are cautioned  to  use  the  correct
-       function   to   ensure  compatibility  with  native  panel
-       libraries.
+       The functions show_panel and top_panel  are  identical  in
+       this  implementation, and work equally well with displayed
+       or hidden panels.  In the native System V  implementation,
+       show_panel  is  intended for making a hidden panel visible
+       (at the top of the stack) and top_panel  is  intended  for
+       making  an  already-visible  panel  move to the top of the
+       stack. You are cautioned to use the  correct  function  to
+       ensure compatibility with native panel libraries.

NOTE

-       In your library list, libpanel.a should  be  before  libn-
-       curses.a;  that  is,  you want to say `-lpanel -lncurses',
+       In  your  library  list, libpanel.a should be before libn-
+       curses.a; that is, you want to  say  `-lpanel  -lncurses',
        not the other way around (which would usually give a link-
        error).
 
@@ -209,13 +208,13 @@

SEE ALSO

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

AUTHOR

-       Originally   written   by   Warren  Tucker  <wht@n4hgf.mt-
-       park.ga.us>, primarily to assist  in  porting  u386mon  to
-       systems  without  a native panels library.  Repackaged for
+       Originally  written  by   Warren   Tucker   <wht@n4hgf.mt-
+       park.ga.us>,  primarily  to  assist  in porting u386mon to
+       systems without a native panels library.   Repackaged  for
        ncurses by Zeyd ben-Halim.
 
 
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 7cec14c8..48493c17 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: tabs.1,v 1.12 2016/04/02 23:40:46 tom Exp @
+  * @Id: tabs.1,v 1.13 2016/10/15 16:16:38 tom Exp @
 -->
 
 
@@ -148,7 +148,7 @@
            terminal database provide this capability.
 
        o   There  is  no counterpart in X/Open Curses Issue 7 for
-           this utility, unlike tput(3x).
+           this utility, unlike tput(1).
 
        The -d (debug) and -n (no-op) options are  extensions  not
        provided by other implementations.
@@ -164,7 +164,7 @@

SEE ALSO

        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/doc/html/man/term.5.html b/doc/html/man/term.5.html
index ef2781a6..309a23dc 100644
--- a/doc/html/man/term.5.html
+++ b/doc/html/man/term.5.html
@@ -1,6 +1,6 @@
 
 
 
@@ -95,7 +95,7 @@
        made.
 
        The  compiled  file  is  created with the tic program, and
-       read by the routine setupterm.  The file is  divided  into
+       read by the routine setupterm.  The file is  divided  into
        six parts: the header, terminal names, boolean flags, num-
        bers, strings, and string table.
 
@@ -207,13 +207,13 @@

PORTABILITY

-       Note that it is possible for setupterm to expect a differ-
+       Note that it is possible for setupterm to expect a differ-
        ent  set  of capabilities than are actually present in the
        file.  Either the database may  have  been  updated  since
-       setupterm has been recompiled (resulting in extra unrecog-
+       setupterm has been recompiled (resulting in extra unrecog-
        nized entries in the file) or the program  may  have  been
        recompiled  more  recently  than  the database was updated
-       (resulting in missing  entries).   The  routine  setupterm
+       (resulting in missing  entries).   The  routine  setupterm
        must  be prepared for both possibilities - this is why the
        numbers and sizes are included.   Also,  new  capabilities
        must  always  be added at the end of the lists of boolean,
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index e63be4ac..7c0b59bb 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -5,7 +5,7 @@
   * Note: this must be run through tbl before nroff.
   * The magic cookie on the first line triggers this under some man programs.
   ****************************************************************************
-  * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+  * Copyright (c) 1998-2013,2016 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,9 +31,9 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.head,v 1.21 2013/03/09 22:11:36 tom Exp @
+  * @Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp @
   * Head of terminfo man page ends here
-  * @Id: terminfo.tail,v 1.69 2015/04/26 14:47:23 tom Exp @
+  * @Id: terminfo.tail,v 1.72 2016/10/15 18:34:58 tom Exp @
   * Beginning of terminfo.tail file
   * This file is part of ncurses.
   * See "terminfo.head" for copyright.
@@ -75,7 +75,7 @@
        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 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
@@ -1167,56 +1167,63 @@
 
        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 to provide
-       this delay.  The delay must be a number with at  most  one
-       decimal place of precision; it may be followed by suffixes
-       "*" or "/" or both.  A  "*"  indicates  that  the  padding
-       required  is  proportional to the number of lines affected
-       by the  operation,  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  does not trigger delays.  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 flow control.
-
-       Sometimes individual capabilities must be  commented  out.
-       To  do this, put a period before the capability name.  For
+       and  padding  characters  are supplied by tputs to provide
+       this delay.
+
+       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,
+           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
+           does not trigger delays.
+
+       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
+           flow control.
+
+       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
 
@@ -1225,91 +1232,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,
@@ -1323,21 +1330,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.
 
@@ -1346,19 +1353,19 @@
        %%   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
+       %c   print pop() like %c in printf
 
-       %s   print pop() like %s in printf
+       %s   print pop() like %s in printf
 
        %p[1-9]
             push i'th parameter
 
        %P[a-z]
-            set dynamic variable [a-z] to pop()
+            set dynamic variable [a-z] to pop()
 
        %g[a-z]/
             get dynamic variable [a-z] and push it
@@ -1369,11 +1376,11 @@
        %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.   However,  that fact is not documented in
-            other implementations.  Relying on it will  adversely
+            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.  However, that fact is  not  documented  in
+            other  implementations.  Relying on it will adversely
             impact portability to other implementations.
 
        %'c' char constant c
@@ -1384,7 +1391,7 @@
        %l   push strlen(pop)
 
        %+, %-, %*, %/, %m
-            arithmetic (%m is mod): push(pop() op pop())
+            arithmetic (%m is mod): push(pop() op pop())
 
        %&, %|, %^
             bit operations (AND, OR and exclusive-OR): push(pop()
@@ -1397,16 +1404,16 @@
             logical AND and OR operations (for conditionals)
 
        %!, %~
-            unary  operations  (logical  and   bit   complement):
-            push(op pop())
+            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:
@@ -1415,221 +1422,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 ndstr 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.
 
@@ -1637,62 +1644,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:
@@ -1710,22 +1717,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
@@ -1744,62 +1751,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
@@ -1839,60 +1846,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
@@ -1912,107 +1919,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 reset program writes strings including iprog, etc., in
+       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
@@ -2050,58 +2057,58 @@
        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

-       Most color terminals are either "Tektronix-like"  or  "HP-
-       like".   Tektronix-like terminals have a predefined set of
-       N colors (where N usually 8), and can  set  character-cell
+       Most  color  terminals are either "Tektronix-like" or "HP-
+       like".  Tektronix-like terminals have a predefined set  of
+       N  colors  (where N usually 8), and can set character-cell
        foreground and background characters independently, mixing
-       them into N * N color-pairs.  On  HP-like  terminals,  the
+       them  into  N * N  color-pairs.  On HP-like terminals, the
        use 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.
+       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.
 
-       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
+       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  documentation  describes  only
-       setaf/setab;  the  XPG4  draft  says that "If the terminal
+       setaf/setab; the XPG4 draft says  that  "If  the  terminal
        supports ANSI escape sequences to set background and fore-
-       ground,  they  should be coded as setaf and setab, respec-
-       tively.  If the terminal supports other  escape  sequences
-       to  set background and foreground, they should be coded as
-       setf and setb, respectively.  The vidputs()  function  and
-       the  refresh  functions  use  setaf  and setab if they are
+       ground, they should be coded as setaf and  setab,  respec-
+       tively.   If  the terminal supports other escape sequences
+       to set background and foreground, they should be coded  as
+       setf and setb, respectively.  The vidputs function and the
+       refresh  functions  use  setaf  and  setab  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
@@ -2114,7 +2121,7 @@
              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
@@ -2128,32 +2135,32 @@
              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.
 
-       On a Tektronix-like terminal, the capability  ccc  may  be
-       present  to  indicate that colors can be modified.  If so,
+       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.
+       - 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
+       (Red, Green, Blue) values.  If the boolean capability  hls
        is present, they are instead as HLS (Hue, Lightness, Satu-
        ration) indices.  The ranges are terminal-dependent.
 
-       On  an  HP-like  terminal, initp may give a capability for
-       changing a color-pair value.  It will take  seven  parame-
-       ters;  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
+       On an HP-like terminal, initp may give  a  capability  for
+       changing  a  color-pair value.  It will take seven parame-
+       ters; 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
@@ -2174,240 +2181,240 @@
           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
+       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-
+       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
+       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
+       Long  terminfo  entries  are  unlikely to be a problem; to
+       date, no entry has even  approached  terminfo's  4096-byte
        string-table maximum.  Unfortunately, the termcap transla-
        tions are much more strictly limited (to 1023 bytes), thus
-       termcap translations of long terminfo  entries  can  cause
+       termcap  translations  of  long terminfo entries can cause
        problems.
 
-       The  man  pages for 4.3BSD and older versions of tgetent()
-       instruct the user to allocate a 1024-byte buffer  for  the
-       termcap  entry.   The  entry  gets  null-terminated by the
+       The man pages for 4.3BSD and  older  versions  of  tgetent
+       instruct  the  user to allocate a 1024-byte buffer for the
+       termcap entry.  The  entry  gets  null-terminated  by  the
        termcap library, so that makes the maximum safe length for
-       a  termcap entry 1k-1 (1023) bytes.  Depending on what the
-       application and the termcap library being used  does,  and
-       where in the termcap file the terminal type that tgetent()
+       a termcap entry 1k-1 (1023) bytes.  Depending on what  the
+       application  and  the termcap library being used does, and
+       where in the termcap file the terminal type  that  tgetent
        is searching for is, several bad things can happen.
 
-       Some termcap libraries print a warning message or exit  if
-       they  find  an entry that's longer than 1023 bytes; others
-       do not; others truncate the entries to 1023  bytes.   Some
+       Some  termcap libraries print a warning message or exit if
+       they find an entry that's longer than 1023  bytes;  others
+       do  not;  others truncate the entries to 1023 bytes.  Some
        application programs allocate more than the recommended 1K
        for the termcap entry; others do not.
 
        Each termcap entry has two important sizes associated with
        it: before "tc" expansion, and after "tc" expansion.  "tc"
-       is the capability that tacks on another termcap  entry  to
-       the  end  of  the current one, to add on its capabilities.
-       If a termcap entry does not use the "tc" capability,  then
+       is  the  capability that tacks on another termcap entry to
+       the end of the current one, to add  on  its  capabilities.
+       If  a termcap entry does not use the "tc" capability, then
        of course the two lengths are the same.
 
-       The  "before  tc  expansion"  length is the most important
-       one, because it affects more than just users of that  par-
-       ticular  terminal.   This is the length of the entry as it
+       The "before tc expansion" length  is  the  most  important
+       one,  because it affects more than just users of that par-
+       ticular terminal.  This is the length of the entry  as  it
        exists in /etc/termcap, minus the backslash-newline pairs,
-       which tgetent() strips out while reading it.  Some termcap
-       libraries strip off the final newline,  too  (GNU  termcap
+       which tgetent strips out while reading it.   Some  termcap
+       libraries  strip  off  the final newline, too (GNU termcap
        does not).  Now suppose:
 
-       o   a  termcap  entry  before  expansion is more than 1023
+       o   a termcap entry before expansion  is  more  than  1023
            bytes long,
 
        o   and the application has only allocated a 1k buffer,
 
-       o   and the termcap library (like the one  in  BSD/OS  1.1
-           and  GNU)  reads  the  whole entry into the buffer, no
-           matter what its length, to see if it is the  entry  it
+       o   and  the  termcap  library (like the one in BSD/OS 1.1
+           and GNU) reads the whole entry  into  the  buffer,  no
+           matter  what  its length, to see if it is the entry it
            wants,
 
-       o   and  tgetent()  is  searching for a terminal type that
-           either is the long entry, appears in the termcap  file
-           after  the  long entry, or does not appear in the file
-           at all (so that tgetent()  has  to  search  the  whole
-           termcap file).
-
-       Then  tgetent()  will overwrite memory, perhaps its stack,
-       and probably core dump the program.  Programs like  telnet
-       are  particularly  vulnerable;  modern  telnets pass along
-       values like the terminal type automatically.  The  results
-       are  almost  as  undesirable  with a termcap library, like
-       SunOS 4.1.3 and Ultrix 4.4, that prints  warning  messages
-       when  it reads an overly long termcap entry.  If a termcap
-       library truncates long entries,  like  OSF/1  3.0,  it  is
-       immune  to  dying  here but will return incorrect data for
-       the terminal.
+       o   and tgetent is searching  for  a  terminal  type  that
+           either  is the long entry, appears in the termcap file
+           after the long entry, or does not appear in  the  file
+           at  all (so that tgetent has to search the whole term-
+           cap file).
+
+       Then tgetent will overwrite memory, perhaps its stack, and
+       probably  core dump the program.  Programs like telnet are
+       particularly vulnerable; modern telnets pass along  values
+       like  the  terminal  type  automatically.  The results are
+       almost as undesirable with a termcap library,  like  SunOS
+       4.1.3 and Ultrix 4.4, that prints warning messages when it
+       reads an overly long termcap entry.  If a termcap  library
+       truncates  long  entries,  like OSF/1 3.0, it is immune to
+       dying here but will return incorrect data for  the  termi-
+       nal.
 
        The "after tc expansion" length will have a similar effect
        to the above, but only for people who actually set TERM to
-       that terminal type, since tgetent() only does "tc"  expan-
-       sion  once  it  is  found the terminal type it was looking
-       for, not while searching.
+       that terminal type, since tgetent only does "tc" expansion
+       once it is found the terminal type it was looking for, not
+       while searching.
 
        In summary, a termcap entry that is longer than 1023 bytes
-       can  cause,  on  various combinations of termcap libraries
-       and applications, a  core  dump,  warnings,  or  incorrect
-       operation.   If it is too long even before "tc" expansion,
+       can cause, on various combinations  of  termcap  libraries
+       and  applications,  a  core  dump,  warnings, or incorrect
+       operation.  If it is too long even before "tc"  expansion,
        it will have this effect even for users of some other ter-
-       minal  types and users whose TERM variable does not have a
+       minal types and users whose TERM variable does not have  a
        termcap entry.
 
        When in -C (translate to termcap) mode, the ncurses imple-
        mentation of tic(1m) issues warning messages when the pre-
-       tc length of a termcap translation is too  long.   The  -c
-       (check)  option  also checks resolved (after tc expansion)
+       tc  length  of  a termcap translation is too long.  The -c
+       (check) option also checks resolved (after  tc  expansion)
        lengths.

Binary Compatibility

-       It is not wise to count on portability of binary  terminfo
-       entries  between commercial UNIX versions.  The problem is
-       that there are at least two versions  of  terminfo  (under
+       It  is not wise to count on portability of binary terminfo
+       entries between commercial UNIX versions.  The problem  is
+       that  there  are  at least two versions of terminfo (under
        HP-UX and AIX) which diverged from System V terminfo after
-       SVr1, and have added extension capabilities to the  string
-       table  that  (in  the binary format) collide with System V
+       SVr1,  and have added extension capabilities to the string
+       table that (in the binary format) collide  with  System  V
        and XSI Curses extensions.
 
 
@@ -2415,66 +2422,66 @@
        Searching for terminal descriptions in $HOME/.terminfo and
        TERMINFO_DIRS is not supported by older implementations.
 
-       Some  SVr4  curses  implementations,  and  all previous to
-       SVr4, do not interpret the %A and %O operators in  parame-
+       Some SVr4 curses  implementations,  and  all  previous  to
+       SVr4,  do not interpret the %A and %O operators in parame-
        ter strings.
 
-       SVr4/XPG4  do  not  specify whether msgr licenses movement
-       while in an alternate-character-set mode (such modes  may,
-       among  other  things,  map CR and NL to characters that do
-       not trigger local motions).   The  ncurses  implementation
-       ignores  msgr  in ALTCHARSET mode.  This raises the possi-
-       bility that an XPG4  implementation  making  the  opposite
-       interpretation  may need terminfo entries made for ncurses
+       SVr4/XPG4 do not specify whether  msgr  licenses  movement
+       while  in an alternate-character-set mode (such modes may,
+       among other things, map CR and NL to  characters  that  do
+       not  trigger  local  motions).  The ncurses implementation
+       ignores msgr in ALTCHARSET mode.  This raises  the  possi-
+       bility  that  an  XPG4  implementation making the opposite
+       interpretation may need terminfo entries made for  ncurses
        to have msgr turned off.
 
-       The ncurses library handles insert-character  and  insert-
+       The  ncurses  library handles insert-character and insert-
        character modes in a slightly non-standard way to get bet-
-       ter update efficiency.  See  the  Insert/Delete  Character
+       ter  update  efficiency.   See the Insert/Delete Character
        subsection above.
 
-       The   parameter   substitutions  for  set_clock  and  dis-
-       play_clock are not documented in SVr4 or  the  XSI  Curses
+       The  parameter  substitutions  for  set_clock   and   dis-
+       play_clock  are  not  documented in SVr4 or the XSI Curses
        standard.  They are deduced from the documentation for the
        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
+       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.
 
        X/Open Curses does not mention italics.  Portable applica-
-       tions must assume that  numeric  capabilities  are  signed
-       16-bit  values.   This  includes  the no_color_video (ncv)
-       capability.  The 32768 mask value used  for  italics  with
-       ncv  can  be confused with an absent or cancelled ncv.  If
-       italics should work with colors, then the ncv  value  must
+       tions  must  assume  that  numeric capabilities are signed
+       16-bit values.  This  includes  the  no_color_video  (ncv)
+       capability.   The  32768  mask value used for italics with
+       ncv can be confused with an absent or cancelled  ncv.   If
+       italics  should  work with colors, then the ncv value must
        be specified, even if it is zero.
 
-       Different  commercial ports of terminfo and curses support
-       different subsets of the XSI Curses standard and (in  some
+       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, accu-
        rate as of October 1995:
 
        SVR4, Solaris, ncurses -- These support all SVr4 capabili-
        ties.
 
-       SGI  --  Supports  the  SVr4  set,  adds  one undocumented
+       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
+       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.
 
-       HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234]
+       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
+       tion 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
+       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.
@@ -2486,12 +2493,12 @@

SEE ALSO

-       tic(1m),  infocmp(1m),  curses(3x),  printf(3),   term(5).
+       tic(1m),   infocmp(1m),  curses(3x),  printf(3),  term(5).
        term_variables(3x).

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.
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index 6417aae5..90c1162c 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -1,6 +1,6 @@
 
 
 
@@ -50,7 +50,7 @@

SYNOPSIS

-       tic  [-01CDGIKLNTUVacfgqrstx]  [-e names] [-o dir] [-Q[n]]
+       tic  [-01CDGIKLNTUVWacfgqrstx] [-e names] [-o dir] [-Q[n]]
        [-R subset] [-v[n]] [-w[n]] file
 
 
@@ -304,25 +304,28 @@
             If the debug level n is not given, it is taken to  be
             one.
 
-       -wn  specifies  the width of the output.  The parameter is
+       -W   By  itself, the -w option will not force long strings
+            to be wrapped.  Use the -W option to do this.
+
+       -wn  specifies the width of the output.  The parameter  is
             optional.  If it is omitted, it defaults to 60.
 
        -x   Treat unknown capabilities as user-defined.  That is,
-            if  you  supply  a capability name which tic does not
+            if you supply a capability name which  tic  does  not
             recognize, it will infer its type (boolean, number or
-            string)  from  the  syntax and make an extended table
+            string) from the syntax and make  an  extended  table
             entry  for  that.   User-defined  capability  strings
-            whose  name  begins  with "k" are treated as function
+            whose name begins with "k" are  treated  as  function
             keys.

PARAMETERS

        file   contains one or more terminfo terminal descriptions
-              in  source format [see terminfo(5)].  Each descrip-
-              tion in the file describes the  capabilities  of  a
+              in source format [see terminfo(5)].  Each  descrip-
+              tion  in  the  file describes the capabilities of a
               particular terminal.
 
-              If  file  is  "-",  then  the data is read from the
+              If file is "-", then the  data  is  read  from  the
               standard input.  The file parameter may also be the
               path of a character-device.
 
@@ -332,60 +335,60 @@
        umented in terminfo(5).  The exception is the use capabil-
        ity.
 
-       When  a  use=entry-name  field is discovered in a terminal
-       entry currently being compiled, tic reads  in  the  binary
-       from  /usr/share/terminfo to complete the entry.  (Entries
-       created from file will be used first.  tic duplicates  the
+       When a use=entry-name field is discovered  in  a  terminal
+       entry  currently  being  compiled, tic reads in the binary
+       from /usr/share/terminfo to complete the entry.   (Entries
+       created  from file will be used first.  tic duplicates the
        capabilities in entry-name for the current entry, with the
-       exception  of  those  capabilities  that  explicitly   are
+       exception   of  those  capabilities  that  explicitly  are
        defined in the current entry.
 
-       When    an   entry,   e.g.,   entry_name_1,   contains   a
-       use=entry_name_2  field,  any  canceled  capabilities   in
-       entry_name_2  must also appear in entry_name_1 before use=
+       When   an   entry,   e.g.,   entry_name_1,   contains    a
+       use=entry_name_2   field,  any  canceled  capabilities  in
+       entry_name_2 must also appear in entry_name_1 before  use=
        for these capabilities to be canceled in entry_name_1.
 
        Total compiled entries cannot exceed 4096 bytes.  The name
-       field  cannot  exceed 512 bytes.  Terminal names exceeding
-       the maximum alias length (32 characters  on  systems  with
+       field cannot exceed 512 bytes.  Terminal  names  exceeding
+       the  maximum  alias  length (32 characters on systems with
        long filenames, 14 characters otherwise) will be truncated
-       to the maximum alias length and a warning message will  be
+       to  the maximum alias length and a warning message will be
        printed.

COMPATIBILITY

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

EXTENSIONS

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

SEE ALSO

-       infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
+       infocmp(1m),   captoinfo(1m),   infotocap(1m),    toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index f414d6da..ab8af671 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -117,7 +117,7 @@
        tic(1m),   infocmp(1m),   captoinfo(1m),    infotocap(1m),
        curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index f1c67438..6483d3d0 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -438,7 +438,7 @@
        clear(1),    stty(1),   tabs(1),   tset(1),   terminfo(5),
        curs_termcap(3x).
 
-       This describes ncurses version 6.0 (patch 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 353df95c..4a6a048e 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -387,7 +387,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 20160910).
+       This describes ncurses version 6.0 (patch 20161015).
 
 
 
diff --git a/man/captoinfo.1m b/man/captoinfo.1m
index c7a33643..62bcaef5 100644
--- a/man/captoinfo.1m
+++ b/man/captoinfo.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: captoinfo.1m,v 1.25 2010/12/04 18:36:44 tom Exp $
+.\" $Id: captoinfo.1m,v 1.26 2016/10/15 17:26:09 tom Exp $
 .TH @CAPTOINFO@ 1M ""
 .ds n 5
 .ds d @TERMINFO@
@@ -152,7 +152,7 @@ GG	acs magic cookie count
 .TE
 .PP
 If the single-line capabilities occur in an entry, they will automatically
-be composed into an \fIacsc\fR string.
+be composed into an \fBacsc\fR string.
 The double-line capabilities and
 \fBGG\fR are discarded with a warning message.
 .PP
@@ -174,10 +174,10 @@ font3	s3ds
 .TE
 .PP
 Additionally, the AIX \fIbox1\fR capability will be automatically translated to
-an \fIacsc\fR string.
+an \fBacsc\fR string.
 .PP
 Hewlett-Packard's terminfo library supports two nonstandard terminfo
-capabilities \fImeml\fR (memory lock) and \fImemu\fR (memory unlock).
+capabilities \fBmeml\fR (memory lock) and \fBmemu\fR (memory unlock).
 These will be discarded with a warning message.
 .SH NOTES
 This utility is actually a link to \fB@TIC@\fR(1M), running in \fI\-I\fR mode.
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index 204f6c34..9307e917 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.47 2016/07/23 23:48:49 tom Exp $
+.\" $Id: curs_attr.3x,v 1.48 2016/10/15 17:09:05 tom Exp $
 .TH curs_attr 3X ""
 .de bP
 .IP \(bu 4
@@ -285,12 +285,13 @@ SVr4 curses, these functions correctly manipulate all other highlights
 (specifically, \fBA_ALTCHARSET\fR, \fBA_PROTECT\fR, and \fBA_INVIS\fR).
 .PP
 This implementation provides the \fBA_ITALIC\fP attribute for terminals
-which have the \fIenter_italics_mode\fP (sitm) and \fIexit_italics_mode\fP (ritm) capabilities.
+which have the \fBenter_italics_mode\fP (\fBsitm\fP)
+and \fBexit_italics_mode\fP (\fBritm\fP) capabilities.
 Italics are not mentioned in X/Open Curses.
-Unlike the other video attributes, \fBI_ITALIC\fP is unrelated
-to the \fIset_attributes\fP capabilities.
+Unlike the other video attributes, \fBA_ITALIC\fP is unrelated
+to the \fBset_attributes\fP capabilities.
 This implementation makes the assumption that
-\fIexit_attribute_mode\fP may also reset italics.
+\fBexit_attribute_mode\fP may also reset italics.
 .PP
 XSI Curses added the new entry points, \fBattr_get\fR, \fBattr_on\fR,
 \fBattr_off\fR, \fBattr_set\fR, \fBwattr_on\fR, \fBwattr_off\fR,
diff --git a/man/curs_clear.3x b/man/curs_clear.3x
index 305c608a..dec519b4 100644
--- a/man/curs_clear.3x
+++ b/man/curs_clear.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_clear.3x,v 1.14 2010/12/04 18:36:44 tom Exp $
+.\" $Id: curs_clear.3x,v 1.15 2016/10/15 17:02:31 tom Exp $
 .TH curs_clear 3X ""
 .na
 .hy 0
@@ -101,7 +101,7 @@ ncurses.
 .PP
 This implementation, and others such as Solaris,
 sets the current position to 0,0 after erasing
-via \fBwerase()\fP and \fBwclear()\fP.
+via \fBwerase\fP and \fBwclear\fP.
 That fact is not documented in other implementations,
 and may not be true of implementations
 which were not derived from SVr4 source.
diff --git a/man/curs_color.3x b/man/curs_color.3x
index bd4c48e7..05288b5d 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.43 2016/07/30 15:22:11 tom Exp $
+.\" $Id: curs_color.3x,v 1.45 2016/10/15 17:10:19 tom Exp $
 .TH curs_color 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -295,7 +295,7 @@ background color for all terminals.
       \fBCOLOR_WHITE\fR
 .fi
 .SH RETURN VALUE
-The routines \fBcan_change_color()\fR and \fBhas_colors()\fR return \fBTRUE\fR
+The routines \fBcan_change_color\fR and \fBhas_colors\fR return \fBTRUE\fR
 or \fBFALSE\fR.
 .PP
 All other routines return the integer \fBERR\fR upon failure and an \fBOK\fR
@@ -316,7 +316,7 @@ if \fBstart_color\fP was not called.
 .TP 5
 \fBinit_color\fP
 returns an error if the terminal does not support
-this feature, e.g., if the \fIinitialize_color\fP capability is absent
+this feature, e.g., if the \fBinitialize_color\fP capability is absent
 from the terminal description.
 .TP 5
 \fBstart_color\fP
diff --git a/man/curs_extend.3x b/man/curs_extend.3x
index 6c5309eb..cfb64ed3 100644
--- a/man/curs_extend.3x
+++ b/man/curs_extend.3x
@@ -28,7 +28,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1999-on
 .\"
-.\" $Id: curs_extend.3x,v 1.20 2016/05/14 23:10:54 tom Exp $
+.\" $Id: curs_extend.3x,v 1.21 2016/10/15 16:52:48 tom Exp $
 .TH curs_extend 3X ""
 .SH NAME
 \fBcurses_version\fP,
@@ -45,14 +45,12 @@ These functions are extensions to the curses library
 which do not fit easily into other categories.
 .SS curses_version
 .PP
-Use
-.I curses_version()
+Use \fBcurses_version\fP
 to get the version number, including patch level of the library, e.g.,
 .B 5.0.19991023
 .SS use_extended_names
 .PP
-The
-.I use_extended_names()
+The \fBuse_extended_names\fP
 function controls whether the calling application
 is able to use user-defined or nonstandard names
 which may be compiled into the terminfo
diff --git a/man/curs_getch.3x b/man/curs_getch.3x
index 3bdaf337..b8d6a82b 100644
--- a/man/curs_getch.3x
+++ b/man/curs_getch.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_getch.3x,v 1.48 2016/09/10 21:56:25 Leon.Winter Exp $
+.\" $Id: curs_getch.3x,v 1.49 2016/10/15 16:44:01 tom Exp $
 .TH curs_getch 3X ""
 .na
 .hy 0
@@ -289,7 +289,7 @@ string (see \fBkey_defined\fP(3X)).
 .PP
 .SH RETURN VALUE
 All routines return the integer \fBERR\fR upon failure and an integer value
-other than \fBERR\fR (\fBOK\fR in the case of ungetch()) upon successful
+other than \fBERR\fR (\fBOK\fR in the case of \fBungetch\fP) upon successful
 completion.
 .RS 3
 .TP 5
diff --git a/man/curs_initscr.3x b/man/curs_initscr.3x
index dc15ecbc..962b7ad5 100644
--- a/man/curs_initscr.3x
+++ b/man/curs_initscr.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_initscr.3x,v 1.24 2015/07/21 23:01:38 tom Exp $
+.\" $Id: curs_initscr.3x,v 1.25 2016/10/15 17:02:31 tom Exp $
 .TH curs_initscr 3X ""
 .de bP
 .IP \(bu 4
@@ -189,7 +189,7 @@ Quoting from X/Open Curses, section 3.1.1:
 .PP
 \fICurses implementations may provide for special handling of the SIGINT,
 SIGQUIT and SIGTSTP signals if their disposition is SIG_DFL at the time
-\fBinitscr()\fP is called \fP...
+\fBinitscr\fP is called \fP...
 .PP
 \fIAny special handling for these signals may remain in effect for the
 life of the process or until the process changes the disposition of
diff --git a/man/curs_inopts.3x b/man/curs_inopts.3x
index b3d071bc..baa88c88 100644
--- a/man/curs_inopts.3x
+++ b/man/curs_inopts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_inopts.3x,v 1.20 2015/11/28 19:03:12 Benno.Schulenberg Exp $
+.\" $Id: curs_inopts.3x,v 1.22 2016/10/15 17:13:45 tom Exp $
 .TH curs_inopts 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -229,7 +229,7 @@ output queues associated with the \fBINTR\fR, \fBQUIT\fR and
 When
 \fBqiflush\fR is called, the queues will be flushed when these control
 characters are read.
-You may want to call \fBnoqiflush()\fR in a signal
+You may want to call \fBnoqiflush\fR in a signal
 handler if you want output to continue as though the interrupt
 had not occurred, after the handler exits.
 .\"
@@ -308,7 +308,7 @@ terminfo capability name rather than "K", used for curses key-names).
 On the other hand, an application can use \fBdefine_key\fP to establish
 a specific keycode for a given string.
 This makes it possible for an application to check for an extended
-capability's presence with \fItigetstr\fP,
+capability's presence with \fBtigetstr\fP,
 and reassign the keycode to match its own needs.
 .PP
 Low-level applications can use \fBtigetstr\fP to obtain the definition
diff --git a/man/curs_kernel.3x b/man/curs_kernel.3x
index 664d15d2..727a2721 100644
--- a/man/curs_kernel.3x
+++ b/man/curs_kernel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.                        *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.                        *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_kernel.3x,v 1.20 2015/07/21 01:10:11 tom Exp $
+.\" $Id: curs_kernel.3x,v 1.21 2016/10/15 16:42:55 tom Exp $
 .de bP
 .IP \(bu 4
 ..
@@ -83,7 +83,7 @@ current terminal modes as the "program" (in \fBcurses\fR) or "shell"
 (not in \fBcurses\fR) state for use by the \fBreset_prog_mode\fR and
 \fBreset_shell_mode\fR routines.  This is done automatically by
 \fBinitscr\fR.  There is one such save area for each screen context
-allocated by \fBnewterm()\fR.
+allocated by \fBnewterm\fR.
 .SS reset_prog_mode, reset_shell_mode
 .PP
 The \fBreset_prog_mode\fR and \fBreset_shell_mode\fR routines restore
diff --git a/man/curs_outopts.3x b/man/curs_outopts.3x
index f6d425b2..b9b3b8f6 100644
--- a/man/curs_outopts.3x
+++ b/man/curs_outopts.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_outopts.3x,v 1.26 2015/07/21 00:23:43 tom Exp $
+.\" $Id: curs_outopts.3x,v 1.27 2016/10/15 17:02:31 tom Exp $
 .TH curs_outopts 3X ""
 .na
 .hy 0
@@ -189,8 +189,8 @@ if the window pointer is null.
 .SH PORTABILITY
 These functions are described in the XSI Curses standard, Issue 4.
 .PP
-The XSI Curses standard is ambiguous on the question of whether \fBraw\fR()
-should disable the CRLF translations controlled by \fBnl\fR() and \fBnonl\fR().
+The XSI Curses standard is ambiguous on the question of whether \fBraw\fR
+should disable the CRLF translations controlled by \fBnl\fR and \fBnonl\fR.
 BSD curses did turn off these translations; AT&T curses (at least as late as
 SVr1) did not.
 We choose to do so, on the theory that a programmer requesting
diff --git a/man/curs_refresh.3x b/man/curs_refresh.3x
index 82ae069b..ed84a0b0 100644
--- a/man/curs_refresh.3x
+++ b/man/curs_refresh.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_refresh.3x,v 1.16 2016/01/30 15:52:36 tom Exp $
+.\" $Id: curs_refresh.3x,v 1.17 2016/10/15 16:45:45 tom Exp $
 .TH curs_refresh 3X ""
 .na
 .hy 0
@@ -105,7 +105,7 @@ exploiting this behavior.)
 The \fBwredrawln\fR routine indicates to \fBcurses\fR that some screen lines
 are corrupted and should be thrown away before anything is written over them.
 It touches the indicated lines (marking them changed).
-The routine \fBredrawwin\fR() touches the entire window.
+The routine \fBredrawwin\fR touches the entire window.
 .SH RETURN VALUE
 Routines that return an integer return \fBERR\fR upon failure, and \fBOK\fR
 (SVr4 only specifies "an integer value other than \fBERR\fR") upon successful
@@ -129,14 +129,14 @@ Note that \fBrefresh\fR and \fBredrawwin\fR may be macros.
 .SH PORTABILITY
 The XSI Curses standard, Issue 4 describes these functions.
 .PP
-Whether \fBwnoutrefresh()\fR copies to the virtual screen the entire contents
+Whether \fBwnoutrefresh\fR copies to the virtual screen the entire contents
 of a window or just its changed portions has never been well-documented in
 historic curses versions (including SVr4).
 It might be unwise to rely on
 either behavior in programs that might have to be linked with other curses
 implementations.
-Instead, you can do an explicit \fBtouchwin()\fR before the
-\fBwnoutrefresh()\fR call to guarantee an entire-contents copy anywhere.
+Instead, you can do an explicit \fBtouchwin\fR before the
+\fBwnoutrefresh\fR call to guarantee an entire-contents copy anywhere.
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fBcurs_outopts\fR(3X)
diff --git a/man/curs_slk.3x b/man/curs_slk.3x
index e8f7afbd..83de447b 100644
--- a/man/curs_slk.3x
+++ b/man/curs_slk.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_slk.3x,v 1.22 2010/12/04 18:38:55 tom Exp $
+.\" $Id: curs_slk.3x,v 1.23 2016/10/15 17:02:31 tom Exp $
 .TH curs_slk 3X ""
 .na
 .hy 0
@@ -232,7 +232,7 @@ It changes the
 argument type of the attribute-manipulation functions \fBslk_attron\fR,
 \fBslk_attroff\fR, \fBslk_attrset\fR to be \fBattr_t\fR, and adds \fBconst\fR
 qualifiers.
-The format codes \fB2\fR and \fB3\fR for \fBslk_init()\fR and the
+The format codes \fB2\fR and \fB3\fR for \fBslk_init\fR and the
 function \fBslk_attr\fR are specific to ncurses.
 .SH SEE ALSO
 \fBcurses\fR(3X),
diff --git a/man/curs_terminfo.3x b/man/curs_terminfo.3x
index 9e9dfa43..3072a2d6 100644
--- a/man/curs_terminfo.3x
+++ b/man/curs_terminfo.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_terminfo.3x,v 1.44 2016/08/20 23:26:10 tom Exp $
+.\" $Id: curs_terminfo.3x,v 1.46 2016/10/15 17:27:48 tom Exp $
 .TH curs_terminfo 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -172,7 +172,7 @@ If \fBERR\fR is returned, examine \fIerrret\fR:
 means that the terminal is hardcopy, cannot be used for curses applications.
 .IP
 \fBsetupterm\fP determines if the entry is a hardcopy type by
-checking the \fIhc\fP (\fIhardcopy\fP) capability.
+checking the \fBhc\fP (\fBhardcopy\fP) capability.
 .TP 5
 .B 0
 means that the terminal could not be found,
@@ -180,7 +180,7 @@ or that it is a generic type,
 having too little information for curses applications to run.
 .IP
 \fBsetupterm\fP determines if the entry is a generic type by
-checking the \fIgn\fP (\fIgeneric\fP) capability.
+checking the \fBgn\fP (\fBgeneric\fP) capability.
 .TP 5
 .B \-1
 means that the \fBterminfo\fR database could not be found.
@@ -249,10 +249,16 @@ Its numeric parameters are integers (int) rather than longs.
 .SS Output Functions
 .PP
 The \fBtputs\fR routine applies padding information to the string
-\fIstr\fR and outputs it.  The \fIstr\fR must be a terminfo string
+\fIstr\fR and outputs it:
+.bP
+The \fIstr\fR must be a terminfo string
 variable or the return value from \fBtparm\fR, \fBtgetstr\fR, or
-\fBtgoto\fR.  \fIaffcnt\fR is the number of lines affected, or 1 if
-not applicable.  \fIputc\fR is a \fBputchar\fR-like routine to which
+\fBtgoto\fR.
+.bP
+\fIaffcnt\fR is the number of lines affected, or 1 if
+not applicable.
+.bP
+\fIputc\fR is a \fBputchar\fR-like routine to which
 the characters are passed, one at a time.
 .PP
 The \fBputp\fR routine calls \fBtputs(\fR\fIstr\fR\fB, 1, putchar)\fR.
diff --git a/man/curs_trace.3x b/man/curs_trace.3x
index 00e7bd63..85df283c 100644
--- a/man/curs_trace.3x
+++ b/man/curs_trace.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2000-2010,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2000-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_trace.3x,v 1.13 2015/07/20 22:54:44 tom Exp $
+.\" $Id: curs_trace.3x,v 1.14 2016/10/15 17:26:09 tom Exp $
 .de bP
 .IP \(bu 4
 ..
@@ -102,7 +102,7 @@ turn off tracing.
 trace user and system times of updates.
 .TP 5
 .B TRACE_TPUTS
-trace tputs calls.
+trace \fBtputs\fP calls.
 .TP 5
 .B TRACE_UPDATE
 trace update actions, old & new screens.
diff --git a/man/curs_window.3x b/man/curs_window.3x
index ba9d293e..f53f3d77 100644
--- a/man/curs_window.3x
+++ b/man/curs_window.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_window.3x,v 1.19 2015/07/21 08:25:23 tom Exp $
+.\" $Id: curs_window.3x,v 1.20 2016/10/15 17:26:09 tom Exp $
 .TH curs_window 3X ""
 .na
 .hy 0
@@ -215,7 +215,7 @@ degrade performance.
 .PP
 Note that \fBsyncok\fR may be a macro.
 .SH BUGS
-The subwindow functions (\fIsubwin\fR, \fIderwin\fR, \fImvderwin\fR,
+The subwindow functions (\fBsubwin\fR, \fBderwin\fR, \fBmvderwin\fR,
 \fBwsyncup\fR, \fBwsyncdown\fR, \fBwcursyncup\fR, \fBsyncok\fR) are flaky,
 incompletely implemented, and not well tested.
 .PP
diff --git a/man/default_colors.3x b/man/default_colors.3x
index 0b85598e..72628647 100644
--- a/man/default_colors.3x
+++ b/man/default_colors.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2011 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2011,2016 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            *
@@ -28,7 +28,7 @@
 .\"
 .\" Author: Thomas E. Dickey 1997,1999,2000,2005
 .\"
-.\" $Id: default_colors.3x,v 1.23 2011/01/03 21:52:27 Tim.van.der.Molen Exp $
+.\" $Id: default_colors.3x,v 1.25 2016/10/15 17:16:48 tom Exp $
 .TH default_colors 3X ""
 .SH NAME
 \fBuse_default_colors\fR,
@@ -40,10 +40,7 @@
 .br
 \fBint assume_default_colors(int fg, int bg);\fP
 .SH DESCRIPTION
-The
-.I use_default_colors()
-and
-.I assume_default_colors()
+The \fBuse_default_colors\fP and \fBassume_default_colors\fP
 functions are extensions to the curses library.
 They are used with terminals that support ISO 6429 color, or equivalent.
 These terminals allow the application to reset color to an unspecified
@@ -56,20 +53,18 @@ using colors only for text.
 For example, there are several implementations of the \fBls\fP program
 which use colors to denote different file types or permissions.
 These "color ls" programs do not necessarily modify the background color,
-typically using only the \fIsetaf\fP terminfo capability to set the
+typically using only the \fBsetaf\fP terminfo capability to set the
 foreground color.
 Full-screen applications that use default colors can achieve similar
 visual effects.
 .PP
-The first function,
-.I use_default_colors()
+The first function, \fBuse_default_colors\fP
 tells the curses library to assign terminal default
 foreground/background colors to color number \-1. So init_pair(x,COLOR_RED,\-1)
 will initialize pair x as red on default background and init_pair(x,\-1,COLOR_BLUE) will
 initialize pair x as default foreground on blue.
 .PP
-The other,
-.I assume_default_colors()
+The other, \fBassume_default_colors\fP
 is a refinement which tells which colors to paint for color pair 0.
 This function recognizes a special color number \-1,
 which denotes the default terminal color.
@@ -85,29 +80,29 @@ The following are equivalent:
 These are ncurses extensions.
 For other curses implementations, color
 number \-1 does not mean anything, just as for ncurses before a
-successful call of \fIuse_default_colors()\fP or \fIassume_default_colors()\fP.
+successful call of \fBuse_default_colors\fP or \fBassume_default_colors\fP.
 .PP
 Other curses implementations do not allow an application to modify color pair 0.
 They assume that the background is COLOR_BLACK,
 but do not ensure that the color pair 0 is painted to match the
 assumption.
 If your application does not use either
-.I use_default_colors()
+.B use_default_colors
 or
-.I assume_default_colors()
+.B assume_default_colors
 ncurses will paint a white foreground (text) with black background
 for color pair 0.
 .SH RETURN VALUE
 These functions return the integer \fBERR\fP upon failure and \fBOK\fP on success.
 They will fail if either the terminal does not support
-the \fIorig_pair\fP or \fIorig_colors\fP capability.
-If the \fIinitialize_pair\fP capability is not found, this causes an
+the \fBorig_pair\fP or \fBorig_colors\fP capability.
+If the \fBinitialize_pair\fP capability is not found, this causes an
 error as well.
 .SH NOTES
 Associated with this extension, the \fBinit_pair\fR function accepts
 negative arguments to specify default foreground or background colors.
 .PP
-The \fIuse_default_colors()\fP function was added to support \fIded\fP.
+The \fBuse_default_colors\fP function was added to support \fIded\fP.
 This is a full-screen application which uses curses to manage only part
 of the screen.  The bottom portion of the screen, which is of adjustable
 size, is left uncolored to display the results from shell commands.
@@ -120,9 +115,9 @@ noting that color xterm (and similar programs) provides a background color
 which does not necessarily correspond to any of the ANSI colors.
 While a special terminfo entry could be constructed using nine colors,
 there was no mechanism provided within curses to account for the related
-\fIorig_pair\fP and \fIback_color_erase\fP capabilities.
+\fBorig_pair\fP and \fBback_color_erase\fP capabilities.
 .PP
-The \fIassume_default_colors()\fP function was added to solve
+The \fBassume_default_colors\fP function was added to solve
 a different problem: support for applications which would use
 environment variables and other configuration to bypass curses'
 notion of the terminal's default colors, setting specific values.
diff --git a/man/infotocap.1m b/man/infotocap.1m
index d9b44f0e..bbdce0de 100644
--- a/man/infotocap.1m
+++ b/man/infotocap.1m
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1999-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1999-2010,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: infotocap.1m,v 1.11 2010/12/04 18:38:55 tom Exp $
+.\" $Id: infotocap.1m,v 1.12 2016/10/15 17:26:09 tom Exp $
 .TH @INFOTOCAP@ 1M ""
 .ds n 5
 .ds d @TERMINFO@
@@ -61,8 +61,8 @@ change the output to \fIwidth\fR characters.
 \*d
 Compiled terminal description database.
 .SH NOTES
-This utility is actually a link to \fI@TIC@\fR, running in \fI\-C\fR mode.
-You can use other \fI@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
+This utility is actually a link to \fB@TIC@\fR, running in \fI\-C\fR mode.
+You can use other \fB@TIC@\fR options such as \fB\-f\fR and  \fB\-x\fR.
 .SH SEE ALSO
 \fBcurses\fR(3X),
 \fB@TIC@\fR(1M),
diff --git a/man/legacy_coding.3x b/man/legacy_coding.3x
index fabb607a..32ff783b 100644
--- a/man/legacy_coding.3x
+++ b/man/legacy_coding.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2005-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 2005-2010,2016 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            *
@@ -28,7 +28,7 @@
 .\"
 .\" Author: Thomas E. Dickey
 .\"
-.\" $Id: legacy_coding.3x,v 1.4 2010/12/04 18:49:20 tom Exp $
+.\" $Id: legacy_coding.3x,v 1.5 2016/10/15 17:02:31 tom Exp $
 .TH legacy_coding 3X ""
 .SH NAME
 \fBuse_legacy_coding\fR \- use terminal's default colors
@@ -37,9 +37,7 @@
 .sp
 \fBint use_legacy_coding(int level);\fP
 .SH DESCRIPTION
-The
-.I use_legacy_coding()
-function is an extension to the curses library.
+The \fBuse_legacy_coding\fP function is an extension to the curses library.
 It allows the caller to change the result of \fBunctrl\fP,
 and suppress related checks within the library that would normally
 cause nonprinting characters to be rendered in visible form.
diff --git a/man/menu_format.3x b/man/menu_format.3x
index c9efcd76..b72fe22e 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.13 2015/12/05 23:01:16 tom Exp $
+.\" $Id: menu_format.3x,v 1.14 2016/10/15 17:02:31 tom Exp $
 .TH menu_format 3X ""
 .SH NAME
 \fBset_menu_format\fP,
@@ -43,7 +43,7 @@ void menu_format(const MENU *menu, int *rows, int *cols);
 The function \fBset_menu_format\fR sets the maximum display size of the given
 menu.  If this size is too small to display all menu items, the menu will be
 made scrollable. If this size is larger than the menus subwindow and the
-subwindow is too small to display all menu items, \fBpost_menu()\fR will fail.
+subwindow is too small to display all menu items, \fBpost_menu\fR will fail.
 .PP
 The default format is 16 rows, 1 column.  Calling \fBset_menu_format\fR with a
 null menu pointer will change this default.  A zero row or column argument to
diff --git a/man/menu_post.3x b/man/menu_post.3x
index 2c3e8dd4..99ee1a93 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
+.\" $Id: menu_post.3x,v 1.13 2016/10/15 17:02:31 tom Exp $
 .TH menu_post 3X ""
 .SH NAME
 \fBpost_menu\fR,
@@ -65,8 +65,8 @@ The menu has already been posted.
 Routine was called from an initialization or termination function.
 .TP 5
 .B E_NO_ROOM
-Menu is too large for its window. You should consider to use
-\fBset_menu_format()\fR to solve the problem.
+Menu is too large for its window.
+You should consider using \fBset_menu_format\fR to solve the problem.
 .TP 5
 .B E_NOT_POSTED
 The menu has not been posted.
diff --git a/man/panel.3x b/man/panel.3x
index 3877b2e7..7880e8cd 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: panel.3x,v 1.19 2015/12/05 23:42:45 tom Exp $
+.\" $Id: panel.3x,v 1.20 2016/10/15 17:02:31 tom Exp $
 .TH panel 3X ""
 .ds n 5
 .ds d @TERMINFO@
@@ -90,14 +90,14 @@ allocates  a  \fBPANEL\fR structure, associates it with
 to  be  displayed above any other panel) and returns a
 pointer to the new panel.
 .TP
-.B update_panels()
+.B update_panels
 refreshes the virtual screen to reflect the relations between the
-panels in the stack, but does not call doupdate() to refresh the
+panels in the stack, but does not call \fBdoupdate\fP to refresh the
 physical screen.
 Use this function and not \fBwrefresh\fP or \fBwnoutrefresh\fP.
 .B update_panels
 may be called more than once before a call to
-doupdate(), but doupdate() is the function responsible for updating
+\fBdoupdate\fP, but \fBdoupdate\fP is the function responsible for updating
 the physical screen.
 .TP
 .B del_panel(pan)
@@ -127,7 +127,7 @@ puts panel at the bottom of all panels.
 .B move_panel(pan,starty,startx)
 moves the given panel window so that its upper-left corner is at
 \fBstarty\fR, \fBstartx\fR.  It does not change the position of the
-panel in the stack.  Be sure to use this function, not \fBmvwin()\fR,
+panel in the stack.  Be sure to use this function, not \fBmvwin\fR,
 to move a panel window.
 .TP
 .B replace_panel(pan,window)
@@ -163,11 +163,11 @@ the SVr4 manual pages suggests the programming interface is unchanged).
 The \fBPANEL\fR data structures are merely  similar. The  programmer
 is cautioned not to directly use \fBPANEL\fR fields.
 .P
-The functions \fBshow_panel()\fR and \fBtop_panel()\fR are identical
+The functions \fBshow_panel\fR and \fBtop_panel\fR are identical
 in this implementation, and work equally well with displayed or hidden
-panels.  In the native System V implementation, \fBshow_panel()\fR is
+panels.  In the native System V implementation, \fBshow_panel\fR is
 intended for making a hidden panel visible (at the top of the stack)
-and \fBtop_panel()\fR is intended for making an already-visible panel
+and \fBtop_panel\fR is intended for making an already-visible panel
 move to the top of the stack. You are cautioned to use the correct
 function to ensure compatibility with native panel libraries.
 .SH NOTE
diff --git a/man/tabs.1 b/man/tabs.1
index ead73e5f..7928113f 100644
--- a/man/tabs.1
+++ b/man/tabs.1
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: tabs.1,v 1.12 2016/04/02 23:40:46 tom Exp $
+.\" $Id: tabs.1,v 1.13 2016/10/15 16:16:38 tom Exp $
 .TH @TABS@ 1 ""
 .ds n 5
 .de bP
@@ -133,7 +133,7 @@ This standard describes a \fB+m\fP option, to set a terminal's left-margin.
 Very few of the entries in the terminal database provide this capability.
 .bP
 There is no counterpart in X/Open Curses Issue 7 for this utility,
-unlike @TPUT@(3X).
+unlike @TPUT@(1).
 .PP
 The \fB\-d\fP (debug) and \fB\-n\fP (no-op) options are extensions not provided
 by other implementations.
diff --git a/man/term.5 b/man/term.5
index a4cca9c3..8b50e959 100644
--- a/man/term.5
+++ b/man/term.5
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term.5,v 1.22 2015/04/26 14:50:23 tom Exp $
+.\" $Id: term.5,v 1.23 2016/10/15 17:02:31 tom Exp $
 .TH term 5
 .ds n 5
 .ds d @TERMINFO@
@@ -76,7 +76,7 @@ or sign extension are made.
 The compiled file is created with the
 .B @TIC@
 program, and read by the routine
-.IR setupterm .
+.BR setupterm .
 The file is divided into six parts:
 the header,
 terminal names,
@@ -197,18 +197,18 @@ finally strings.
 .
 .SH PORTABILITY
 Note that it is possible for
-.I setupterm
+.B setupterm
 to expect a different set of capabilities
 than are actually present in the file.
 Either the database may have been updated since
-.I setupterm
+.B setupterm
 has been recompiled
 (resulting in extra unrecognized entries in the file)
 or the program may have been recompiled more recently
 than the database was updated
 (resulting in missing entries).
 The routine
-.I setupterm
+.B setupterm
 must be prepared for both possibilities \-
 this is why the numbers and sizes are included.
 Also, new capabilities must always be added at the end of the lists
diff --git a/man/terminfo.head b/man/terminfo.head
index c4cc072b..b4c17205 100644
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2013,2016 Free Software Foundation, Inc.              *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
 .\" copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.head,v 1.21 2013/03/09 22:11:36 tom Exp $
+.\" $Id: terminfo.head,v 1.22 2016/10/15 17:02:31 tom Exp $
 .TH terminfo 5 "" "" "File Formats"
 .ds n 5
 .ds d @TERMINFO@
diff --git a/man/terminfo.tail b/man/terminfo.tail
index bd8568f8..280aead0 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,4 +1,4 @@
-.\" $Id: terminfo.tail,v 1.69 2015/04/26 14:47:23 tom Exp $
+.\" $Id: terminfo.tail,v 1.72 2016/10/15 18:34:58 tom Exp $
 .\" Beginning of terminfo.tail file
 .\" This file is part of ncurses.
 .\" See "terminfo.head" for copyright.
@@ -156,20 +156,23 @@ which would not work with other implementations.
 Finally, characters may be given as three octal digits after a \fB\e\fR.
 .PP
 A delay in milliseconds may appear anywhere in a string capability, enclosed in
-$<..> brackets, as in \fBel\fP=\eEK$<5>, and padding characters are supplied by
-.I tputs
+$<..> brackets, as in \fBel\fP=\eEK$<5>,
+and padding characters are supplied by \fBtputs\fP
 to provide this delay.
+.bP
 The delay must be a number with at most one decimal
 place of precision; it may be followed by suffixes \*(``*\*('' or \*(``/\*('' or both.
+.bP
 A \*(``*\*(''
 indicates that the padding required is proportional to the number of lines
 affected by the operation, and the amount given is the per-affected-unit
 padding required.
 (In the case of insert character, the factor is still the
-number of
-.IR lines
-affected.)  Normally, padding is advisory if the device has the \fBxon\fR
+number of \fIlines\fP affected.)
+.IP
+Normally, padding is advisory if the device has the \fBxon\fR
 capability; it is used for cost computation but does not trigger delays.
+.bP
 A \*(``/\*(''
 suffix indicates that the padding is mandatory and forces a delay of the given
 number of milliseconds even on devices for which \fBxon\fR is present to
@@ -409,16 +412,16 @@ Use a \*(``:\*('' to allow the next character to be a \*(``\-\*('' flag,
 avoiding interpreting "%\-" as an operator.
 .TP
 \f(CW%c\fP
-print pop() like %c in \fBprintf\fP
+print \fIpop()\fP like %c in \fBprintf\fP
 .TP
 \fB%s\fP
-print pop() like %s in \fBprintf\fP
+print \fIpop()\fP like %s in \fBprintf\fP
 .TP
 \fB%p\fP\fI[1\-9]\fP
 push \fIi\fP'th parameter
 .TP
 \fB%P\fP\fI[a\-z]\fP
-set dynamic variable \fI[a\-z]\fP to pop()
+set dynamic variable \fI[a\-z]\fP to \fIpop()\fP
 .TP
 \fB%g\fP\fI[a\-z]/\fP
 get dynamic variable \fI[a\-z]\fP and push it
@@ -445,7 +448,7 @@ integer constant \fInn\fP
 push strlen(pop)
 .TP
 \fB%+\fP, \fB%\-\fP, \fB%*\fP, \fB%/\fP, \fB%m\fP
-arithmetic (%m is mod): \fIpush(pop() op pop())\fP
+arithmetic (%m is \fImod\fP): \fIpush(pop() op pop())\fP
 .TP
 \fB%&\fP, \fB%|\fP, \fB%^\fP
 bit operations (AND, OR and exclusive-OR): \fIpush(pop() op pop())\fP
@@ -457,7 +460,7 @@ logical operations: \fIpush(pop() op pop())\fP
 logical AND and OR operations (for conditionals)
 .TP
 \fB%!\fP, \fB%~\fP
-unary operations (logical and bit complement): push(op pop())
+unary operations (logical and bit complement): \fIpush(op pop())\fP
 .TP
 \fB%i\fP
 add 1 to first two parameters (for ANSI terminals)
@@ -1156,9 +1159,8 @@ analogous to
 and
 .BR is3
 respectively.
-These strings are output by the
-.IR reset
-program, which is used when the terminal gets into a wedged state.
+These strings are output by the \fB@RESET@\fP program,
+which is used when the terminal gets into a wedged state.
 Commands are normally placed in
 .BR rs1 ,
 .BR rs2
@@ -1173,10 +1175,7 @@ normally be part of
 but it causes an annoying glitch of the screen and is not normally
 needed since the terminal is usually already in 80 column mode.
 .PP
-The
-.IR reset
-program writes strings
-including
+The \fB@RESET@\fP program writes strings including
 .BR iprog ,
 etc., in the same order as the
 .IR init
@@ -1191,8 +1190,7 @@ If any of
 .BR rs3 ,
 or
 .BR rf
-reset capability strings are missing, the
-.IR reset
+reset capability strings are missing, the \fB@RESET@\fP 
 program falls back upon the corresponding initialization capability string.
 .PP
 If there are commands to set and clear tab stops, they can be given as
@@ -1365,7 +1363,7 @@ be coded as \fBsetaf\fR and \fBsetab\fR, respectively.
 If the terminal
 supports other escape sequences to set background and foreground, they should
 be coded as \fBsetf\fR and \fBsetb\fR, respectively.
-The \fIvidputs()\fR
+The \fBvidputs\fR
 function and the refresh functions use \fBsetaf\fR and \fBsetab\fR if they are
 defined."
 .PP
@@ -1656,13 +1654,13 @@ Unfortunately, the termcap
 translations are much more strictly limited (to 1023 bytes), thus termcap translations
 of long terminfo entries can cause problems.
 .PP
-The man pages for 4.3BSD and older versions of \fBtgetent()\fP instruct the user to
+The man pages for 4.3BSD and older versions of \fBtgetent\fP instruct the user to
 allocate a 1024-byte buffer for the termcap entry.
 The entry gets null-terminated by
 the termcap library, so that makes the maximum safe length for a termcap entry
 1k\-1 (1023) bytes.
 Depending on what the application and the termcap library
-being used does, and where in the termcap file the terminal type that \fBtgetent()\fP
+being used does, and where in the termcap file the terminal type that \fBtgetent\fP
 is searching for is, several bad things can happen.
 .PP
 Some termcap libraries print a warning message or exit if they find an
@@ -1683,7 +1681,7 @@ The "before tc expansion" length is the most important one, because it
 affects more than just users of that particular terminal.
 This is the
 length of the entry as it exists in /etc/termcap, minus the
-backslash-newline pairs, which \fBtgetent()\fP strips out while reading it.
+backslash-newline pairs, which \fBtgetent\fP strips out while reading it.
 Some termcap libraries strip off the final newline, too (GNU termcap does not).
 Now suppose:
 .bP
@@ -1695,12 +1693,12 @@ and the termcap library (like the one in BSD/OS 1.1 and GNU) reads
 the whole entry into the buffer, no matter what its length, to see
 if it is the entry it wants,
 .bP
-and \fBtgetent()\fP is searching for a terminal type that either is the
+and \fBtgetent\fP is searching for a terminal type that either is the
 long entry, appears in the termcap file after the long entry, or
-does not appear in the file at all (so that \fBtgetent()\fP has to search
+does not appear in the file at all (so that \fBtgetent\fP has to search
 the whole termcap file).
 .PP
-Then \fBtgetent()\fP will overwrite memory, perhaps its stack, and probably core dump
+Then \fBtgetent\fP will overwrite memory, perhaps its stack, and probably core dump
 the program.
 Programs like telnet are particularly vulnerable; modern telnets
 pass along values like the terminal type automatically.
@@ -1713,7 +1711,7 @@ here but will return incorrect data for the terminal.
 .PP
 The "after tc expansion" length will have a similar effect to the
 above, but only for people who actually set TERM to that terminal
-type, since \fBtgetent()\fP only does "tc" expansion once it is found the
+type, since \fBtgetent\fP only does "tc" expansion once it is found the
 terminal type it was looking for, not while searching.
 .PP
 In summary, a termcap entry that is longer than 1023 bytes can cause,
diff --git a/ncurses/llib-lncurses b/ncurses/llib-lncurses
index dbdf9c86..3b801934 100644
--- a/ncurses/llib-lncurses
+++ b/ncurses/llib-lncurses
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2016 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            *
@@ -3000,8 +3000,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
@@ -4269,6 +4269,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-lncursest b/ncurses/llib-lncursest
index b31bdfb6..ee4a5f29 100644
--- a/ncurses/llib-lncursest
+++ b/ncurses/llib-lncursest
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2008-2015,2016 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            *
@@ -3015,8 +3015,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
@@ -4382,6 +4382,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-lncursestw b/ncurses/llib-lncursestw
index 515164c7..e9e9f727 100644
--- a/ncurses/llib-lncursestw
+++ b/ncurses/llib-lncursestw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2009-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2009-2015,2016 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            *
@@ -3798,8 +3798,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
@@ -5198,6 +5198,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw
index ce455e4c..04729a1a 100644
--- a/ncurses/llib-lncursesw
+++ b/ncurses/llib-lncursesw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2001-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2001-2015,2016 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            *
@@ -3783,8 +3783,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
@@ -5085,6 +5085,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-ltic b/ncurses/llib-ltic
index 14eda10e..dde89fdd 100644
--- a/ncurses/llib-ltic
+++ b/ncurses/llib-ltic
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012,2015 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2012-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/alloc_entry.c */
 
 #include 
+
 #undef _nc_init_entry
 void	_nc_init_entry(
 		TERMTYPE *const tp)
@@ -196,6 +197,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-ltict b/ncurses/llib-ltict
index ee463139..079ef28e 100644
--- a/ncurses/llib-ltict
+++ b/ncurses/llib-ltict
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2013,2015 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2013-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/alloc_entry.c */
 
 #include 
+
 #undef _nc_init_entry
 void	_nc_init_entry(
 		TERMTYPE *const tp)
@@ -196,6 +197,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-ltictw b/ncurses/llib-ltictw
index 14eda10e..dde89fdd 100644
--- a/ncurses/llib-ltictw
+++ b/ncurses/llib-ltictw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012,2015 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2012-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/alloc_entry.c */
 
 #include 
+
 #undef _nc_init_entry
 void	_nc_init_entry(
 		TERMTYPE *const tp)
@@ -196,6 +197,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-lticw b/ncurses/llib-lticw
index 14eda10e..dde89fdd 100644
--- a/ncurses/llib-lticw
+++ b/ncurses/llib-lticw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012,2015 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2012-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/alloc_entry.c */
 
 #include 
+
 #undef _nc_init_entry
 void	_nc_init_entry(
 		TERMTYPE *const tp)
@@ -196,6 +197,14 @@ void	_nc_write_entry(
 		TERMTYPE *const tp)
 		{ /* void */ }
 
+#undef _nc_write_object
+int	_nc_write_object(
+		TERMTYPE *tp, 
+		char	*buffer, 
+		unsigned *offset, 
+		unsigned limit)
+		{ return(*(int *)0); }
+
 #undef _nc_tic_written
 int	_nc_tic_written(void)
 		{ return(*(int *)0); }
diff --git a/ncurses/llib-ltinfo b/ncurses/llib-ltinfo
index 44a08682..9b8949ac 100644
--- a/ncurses/llib-ltinfo
+++ b/ncurses/llib-ltinfo
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2012-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/access.c */
 
 #include 
+
 #undef _nc_rootname
 char	*_nc_rootname(
 		char	*path)
@@ -318,8 +319,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
diff --git a/ncurses/llib-ltinfot b/ncurses/llib-ltinfot
index 47aa6a29..517161da 100644
--- a/ncurses/llib-ltinfot
+++ b/ncurses/llib-ltinfot
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2013,2015 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2013-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/access.c */
 
 #include 
+
 #undef _nc_rootname
 char	*_nc_rootname(
 		char	*path)
@@ -324,8 +325,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
diff --git a/ncurses/llib-ltinfotw b/ncurses/llib-ltinfotw
index ab915c85..08c53d46 100644
--- a/ncurses/llib-ltinfotw
+++ b/ncurses/llib-ltinfotw
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2012-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/access.c */
 
 #include 
+
 #undef _nc_rootname
 char	*_nc_rootname(
 		char	*path)
@@ -324,8 +325,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
diff --git a/ncurses/llib-ltinfow b/ncurses/llib-ltinfow
index 62e71fce..123ed9b8 100644
--- a/ncurses/llib-ltinfow
+++ b/ncurses/llib-ltinfow
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2012-2013,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2012-2015,2016 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            *
@@ -34,6 +34,7 @@
 /* ./tinfo/access.c */
 
 #include 
+
 #undef _nc_rootname
 char	*_nc_rootname(
 		char	*path)
@@ -318,8 +319,8 @@ void	_nc_init_acs(void)
 /* ./tinfo/lib_baudrate.c */
 
 struct speed {
-    short s; 
-    int sp; 
+    int given_speed; 
+    int actual_speed; 
 };
 
 #undef _nc_baudrate
diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c
index fd4722b0..c8f8b2f8 100644
--- a/ncurses/tty/tty_update.c
+++ b/ncurses/tty/tty_update.c
@@ -82,7 +82,7 @@
 
 #include 
 
-MODULE_ID("$Id: tty_update.c,v 1.283 2016/05/28 23:32:40 tom Exp $")
+MODULE_ID("$Id: tty_update.c,v 1.284 2016/10/15 23:00:29 tom Exp $")
 
 /*
  * This define controls the line-breakout optimization.  Every once in a
@@ -676,7 +676,7 @@ EmitRange(NCURSES_SP_DCLx const NCURSES_CH_T * ntext, int num)
 					TPARM_2(repeat_char,
 						CharOf(ntext0),
 						rep_count),
-					rep_count,
+					1,
 					NCURSES_SP_NAME(_nc_outch));
 		SP_PARM->_curscol += rep_count;
 
@@ -1736,7 +1736,7 @@ InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count)
 	TPUTS_TRACE("parm_ich");
 	NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
 				TPARM_1(parm_ich, count),
-				count,
+				1,
 				NCURSES_SP_NAME(_nc_outch));
 	while (count) {
 	    PutAttrChar(NCURSES_SP_ARGx CHREF(*line));
@@ -1789,7 +1789,7 @@ DelChar(NCURSES_SP_DCLx int count)
 	TPUTS_TRACE("parm_dch");
 	NCURSES_SP_NAME(tputs) (NCURSES_SP_ARGx
 				TPARM_1(parm_dch, count),
-				count,
+				1,
 				NCURSES_SP_NAME(_nc_outch));
     } else {
 	int n;
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 93bfbfbf..87da00ad 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161008) unstable; urgency=low
+ncurses6 (6.0+20161015) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
+ -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 93bfbfbf..87da00ad 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161008) unstable; urgency=low
+ncurses6 (6.0+20161015) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
+ -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index 00035815..c6b1f9f1 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20161008) unstable; urgency=low
+ncurses6 (6.0+20161015) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sun, 02 Oct 2016 20:57:15 -0400
+ -- Thomas E. Dickey   Sat, 15 Oct 2016 11:43:49 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 59f2aee6..3f3aad2f 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.179 2016/10/03 00:57:15 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.180 2016/10/15 15:43:49 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  "2016"
-!define VERSION_MMDD  "1008"
+!define VERSION_MMDD  "1015"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 96d02e45..a8a11c91 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: 20161008
+Release: 20161015
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a6374b66..f863fc42 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: 20161008
+Release: 20161015
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz