From b11cef1e315b58820ea0cde239ebf2f741ef8948 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 6 Dec 2015 01:07:45 +0000 Subject: [PATCH] ncurses 6.0 - patch 20151205 + update form_cursor.3x, form_post.3x, menu_attributes.3x to list function names in NAME section (patch by Jason McIntyre). + minor fixes to manpage NAME/SYNOPSIS sections to consistently use rule that either all functions which are prototyped in SYNOPSIS are listed in the NAME section, or the manual-page name is the sole item listed in the NAME section. The latter is used to reduce clutter, e.g., for the top-level library manual pages as well as for certain feature-pages such as SP-funcs and threading (prompted by patches by Jason McIntyre). + add option to preserve leading whitespace in form fields (patch by Leon Winter). --- NEWS | 15 +++++- VERSION | 2 +- dist.mk | 4 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/curs_attr.3x.html | 5 +- doc/html/man/curs_bkgd.3x.html | 2 +- doc/html/man/curs_color.3x.html | 3 +- doc/html/man/curs_inopts.3x.html | 28 +++++------ doc/html/man/curs_legacy.3x.html | 6 +-- doc/html/man/curs_opaque.3x.html | 23 ++++----- doc/html/man/curs_sp_funcs.3x.html | 6 +-- doc/html/man/curs_threads.3x.html | 4 +- doc/html/man/curs_touch.3x.html | 4 +- doc/html/man/form.3x.html | 2 +- doc/html/man/form_cursor.3x.html | 6 +-- doc/html/man/form_data.3x.html | 17 +++---- doc/html/man/form_driver.3x.html | 63 +++++++++++++------------ doc/html/man/form_field_info.3x.html | 29 ++++++------ doc/html/man/form_field_just.3x.html | 19 ++++---- doc/html/man/form_field_new.3x.html | 41 ++++++++-------- doc/html/man/form_field_opts.3x.html | 37 ++++++++------- doc/html/man/form_field_userptr.3x.html | 8 ++-- doc/html/man/form_new.3x.html | 6 +-- doc/html/man/form_new_page.3x.html | 6 +-- doc/html/man/form_opts.3x.html | 29 ++++++------ doc/html/man/form_post.3x.html | 6 +-- doc/html/man/form_requestname.3x.html | 21 +++++---- doc/html/man/form_userptr.3x.html | 15 +++--- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/menu_attributes.3x.html | 8 ++-- doc/html/man/menu_cursor.3x.html | 6 +-- doc/html/man/menu_format.3x.html | 6 +-- doc/html/man/menu_items.3x.html | 8 ++-- doc/html/man/menu_mark.3x.html | 35 +++++++------- doc/html/man/menu_new.3x.html | 6 +-- doc/html/man/menu_opts.3x.html | 25 +++++----- doc/html/man/menu_pattern.3x.html | 29 ++++++------ doc/html/man/menu_post.3x.html | 8 ++-- doc/html/man/menu_requestname.3x.html | 21 +++++---- doc/html/man/menu_spacing.3x.html | 39 +++++++-------- doc/html/man/menu_userptr.3x.html | 15 +++--- doc/html/man/mitem_name.3x.html | 13 ++--- doc/html/man/mitem_new.3x.html | 6 +-- doc/html/man/mitem_opts.3x.html | 23 ++++----- doc/html/man/mitem_userptr.3x.html | 8 ++-- doc/html/man/mitem_value.3x.html | 6 +-- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/panel.3x.html | 34 ++++++------- doc/html/man/tabs.1.html | 2 +- doc/html/man/term_variables.3x.html | 4 +- doc/html/man/terminfo.5.html | 2 +- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- man/curs_attr.3x | 4 +- man/curs_color.3x | 4 +- man/curs_legacy.3x | 6 +-- man/curs_opaque.3x | 7 ++- man/curs_sp_funcs.3x | 6 +-- man/curs_threads.3x | 5 +- man/curs_touch.3x | 4 +- man/form_cursor.3x | 6 +-- man/form_data.3x | 7 +-- man/form_driver.3x | 5 +- man/form_field_info.3x | 7 +-- man/form_field_just.3x | 7 +-- man/form_field_new.3x | 9 ++-- man/form_field_opts.3x | 7 ++- man/form_field_userptr.3x | 7 +-- man/form_new.3x | 7 +-- man/form_new_page.3x | 7 +-- man/form_opts.3x | 7 ++- man/form_post.3x | 5 +- man/form_requestname.3x | 7 +-- man/form_userptr.3x | 5 +- man/menu_attributes.3x | 13 +++-- man/menu_cursor.3x | 6 +-- man/menu_format.3x | 7 +-- man/menu_items.3x | 8 ++-- man/menu_mark.3x | 5 +- man/menu_new.3x | 7 +-- man/menu_opts.3x | 7 ++- man/menu_pattern.3x | 7 +-- man/menu_post.3x | 7 +-- man/menu_requestname.3x | 7 +-- man/menu_spacing.3x | 7 +-- man/menu_userptr.3x | 5 +- man/mitem_name.3x | 7 +-- man/mitem_new.3x | 7 +-- man/mitem_opts.3x | 9 ++-- man/mitem_userptr.3x | 7 +-- man/mitem_value.3x | 7 +-- man/panel.3x | 32 ++++++------- man/term_variables.3x | 4 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- test/README | 19 ++++---- 105 files changed, 577 insertions(+), 481 deletions(-) diff --git a/NEWS b/NEWS index 6a6a3370..0b9a2bd6 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.2536 2015/11/29 01:31:02 tom Exp $ +-- $Id: NEWS,v 1.2540 2015/12/05 23:45:23 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,7 +45,20 @@ 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. +20151205 + + update form_cursor.3x, form_post.3x, menu_attributes.3x to list + function names in NAME section (patch by Jason McIntyre). + + minor fixes to manpage NAME/SYNOPSIS sections to consistently use + rule that either all functions which are prototyped in SYNOPSIS are + listed in the NAME section, or the manual-page name is the sole item + listed in the NAME section. The latter is used to reduce clutter, + e.g., for the top-level library manual pages as well as for certain + feature-pages such as SP-funcs and threading (prompted by patches by + Jason McIntyre). + 20151128 + + add option to preserve leading whitespace in form fields (patch by + Leon Winter). + add missing assignment in lib_getch.c to make notimeout() work (Debian #805618). + add 't' toggle for notimeout() function in test/ncurses.c a/A screens diff --git a/VERSION b/VERSION index d9059c30..a4a93e73 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 6.0 20151128 +5:0:9 6.0 20151205 diff --git a/dist.mk b/dist.mk index a1e3fe5a..69dac349 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.1081 2015/11/28 16:31:05 tom Exp $ +# $Id: dist.mk,v 1.1082 2015/12/05 13:22:37 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 = 20151128 +NCURSES_PATCH = 20151205 # 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 1e2e11a7..0d034346 100644 --- a/doc/html/man/captoinfo.1m.html +++ b/doc/html/man/captoinfo.1m.html @@ -205,7 +205,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html index af86e629..0817f95e 100644 --- a/doc/html/man/clear.1.html +++ b/doc/html/man/clear.1.html @@ -71,7 +71,7 @@

SEE ALSO

        tput(1), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/curs_attr.3x.html b/doc/html/man/curs_attr.3x.html
index 2c72bb7c..6a412473 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.42 2015/10/24 19:10:42 Sven.Joachim Exp @
+  * @Id: curs_attr.3x,v 1.43 2015/12/05 18:46:04 tom Exp @
 -->
 
 
@@ -90,6 +90,7 @@
              short color, const void *opts);
        int mvwchgat(WINDOW *win, int y, int x, int n,
              attr_t attr, short color, const void *opts);
+       PAIR_NUMBER(attrs);
 
 
 
@@ -189,8 +190,8 @@ A_INVIS Invisible or blank mode A_ALTCHARSET Alternate character set A_ITALIC Italics (non-X/Open extension) - A_CHARTEXT Bit-mask to extract a character + A_CHARTEXT Bit-mask to extract a character COLOR_PAIR(n) Color-pair number n These video attributes are supported by attr_on and relat- diff --git a/doc/html/man/curs_bkgd.3x.html b/doc/html/man/curs_bkgd.3x.html index 59db83f6..05245326 100644 --- a/doc/html/man/curs_bkgd.3x.html +++ b/doc/html/man/curs_bkgd.3x.html @@ -26,7 +26,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_bkgd.3x,v 1.23 2015/07/21 00:11:05 tom Exp @ + * @Id: curs_bkgd.3x,v 1.24 2015/11/21 01:53:42 tom Exp @ --> diff --git a/doc/html/man/curs_color.3x.html b/doc/html/man/curs_color.3x.html index 8d0f00c6..6f4aea05 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.39 2015/06/06 23:29:02 tom Exp @ + * @Id: curs_color.3x,v 1.40 2015/12/05 20:09:42 tom Exp @ --> @@ -64,6 +64,7 @@ int color_content(short color, short *r, short *g, short *b); int pair_content(short pair, short *f, short *b); + int COLOR_PAIR(int n); diff --git a/doc/html/man/curs_inopts.3x.html b/doc/html/man/curs_inopts.3x.html index b8d94dda..f0b18873 100644 --- a/doc/html/man/curs_inopts.3x.html +++ b/doc/html/man/curs_inopts.3x.html @@ -26,7 +26,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * **************************************************************************** - * @Id: curs_inopts.3x,v 1.19 2015/04/11 10:21:38 tom Exp @ + * @Id: curs_inopts.3x,v 1.20 2015/11/28 19:03:12 Benno.Schulenberg Exp @ --> @@ -79,12 +79,12 @@

DESCRIPTION

        The ncurses library provides several functions  which  let
-       an  application change way input from the terminal is han-
-       dled.  Some are global, applying to all  windows.   Others
-       apply only to a specific window.  Window-specific settings
-       are not automatically applied to new or  derived  windows.
-       An  application  must  apply  these to each window, if the
-       same behavior is needed.
+       an  application  change the way input from the terminal is
+       handled.  Some are global, applying to all windows.   Oth-
+       ers apply only to a specific window.  Window-specific set-
+       tings are not automatically applied to new or derived win-
+       dows.   An application must apply these to each window, if
+       the same behavior is needed.
 
 
 
@@ -124,22 +124,22 @@ is similar to cbreak mode in that characters typed by the user are immediately available to the program. However, after blocking for tenths tenths of seconds, ERR is re- - turned if nothing has been typed. The value of tenths + turned if nothing has been typed. The value of tenths must be a number between 1 and 255. Use nocbreak to leave half-delay mode.

intrflush

-       If  the intrflush option is enabled, (bf is TRUE), when an
+       If  the  intrflush  option is enabled (bf is TRUE), and an
        interrupt key  is  pressed  on  the  keyboard  (interrupt,
-       break,  quit)  all  output in the tty driver queue will be
+       break,  quit),  all output in the tty driver queue will be
        flushed, giving the effect of faster response to  the  in-
        terrupt, but causing curses to have the wrong idea of what
-       is on the screen.  Disabling (bf  is  FALSE),  the  option
-       prevents  the flush.  The default for the option is inher-
-       ited from the tty driver settings.  The window argument is
-       ignored.
+       is on the screen.  Disabling the option (bf is FALSE) pre-
+       vents  the flush.  The default for the option is inherited
+       from the tty driver settings.  The window argument is  ig-
+       nored.
 
 
 
diff --git a/doc/html/man/curs_legacy.3x.html b/doc/html/man/curs_legacy.3x.html index 36db4bf7..45ba3ac5 100644 --- a/doc/html/man/curs_legacy.3x.html +++ b/doc/html/man/curs_legacy.3x.html @@ -1,6 +1,6 @@ @@ -47,7 +47,7 @@

NAME

-       getattrs  -  get  curses  cursor  and  window coordinates,
+       curs_legacy  -  get  curses cursor and window coordinates,
        attributes
 
 
diff --git a/doc/html/man/curs_opaque.3x.html b/doc/html/man/curs_opaque.3x.html
index 9caec6c9..0c23a533 100644
--- a/doc/html/man/curs_opaque.3x.html
+++ b/doc/html/man/curs_opaque.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: curs_opaque.3x,v 1.12 2015/04/11 10:23:49 tom Exp @
+  * @Id: curs_opaque.3x,v 1.13 2015/12/05 20:05:45 tom Exp @
 -->
 
 
@@ -49,7 +49,8 @@
 

NAME

        is_cleared, is_idlok, is_idcok, is_immedok, is_keypad,
        is_leaveok, is_nodelay, is_notimeout, is_pad, is_scrollok,
-       is_subwin, is_syncok - curses window properties
+       is_subwin, is_syncok, wgetdelay, wgetparent, wgetscrreg -
+       curses window properties
 
 
 
@@ -75,8 +76,8 @@

DESCRIPTION

-       This  implementation provides functions which return prop-
-       erties set in the WINDOW  structure,  allowing  it  to  be
+       This implementation provides functions which return  prop-
+       erties  set  in  the  WINDOW  structure, allowing it to be
        "opaque" if the symbol NCURSES_OPAQUE is defined:
 
        is_cleared
@@ -104,7 +105,7 @@
             returns the value set in notimeout
 
        is_pad
-            returns  TRUE if the window is a pad i.e., created by
+            returns TRUE if the window is a pad i.e., created  by
             newpad
 
        is_scrollok
@@ -121,11 +122,11 @@
             returns the delay timeout as set in wtimeout.
 
        wgetparent
-            returns  the parent WINDOW pointer for subwindows, or
+            returns the parent WINDOW pointer for subwindows,  or
             NULL for windows having no parent.
 
        wgetscrreg
-            returns the top and bottom  rows  for  the  scrolling
+            returns  the  top  and  bottom rows for the scrolling
             margin as set in wsetscrreg.
 
 
@@ -141,15 +142,15 @@
 
 

PORTABILITY

-       These  routines  are  specific  to ncurses.  They were not
-       supported on Version 7, BSD or System  V  implementations.
-       It  is  recommended that any code depending on ncurses ex-
+       These routines are specific to  ncurses.   They  were  not
+       supported  on  Version 7, BSD or System V implementations.
+       It is recommended that any code depending on  ncurses  ex-
        tensions be conditioned using NCURSES_VERSION.
 
 
 

SEE ALSO

-       curses(3x), curs_inopts(3x),  curs_outopts(3x),  curs_win-
+       curses(3x),  curs_inopts(3x),  curs_outopts(3x), curs_win-
        dow(3x)
 
 
diff --git a/doc/html/man/curs_sp_funcs.3x.html b/doc/html/man/curs_sp_funcs.3x.html
index 6fc32407..c85498ba 100644
--- a/doc/html/man/curs_sp_funcs.3x.html
+++ b/doc/html/man/curs_sp_funcs.3x.html
@@ -1,6 +1,6 @@
 
@@ -49,7 +49,7 @@
 
 

NAME

-       use_screen, use_window - curses thread support
+       curs_threads - curses thread support
 
 
 
diff --git a/doc/html/man/curs_touch.3x.html b/doc/html/man/curs_touch.3x.html index 0b4642a4..ab3795ab 100644 --- a/doc/html/man/curs_touch.3x.html +++ b/doc/html/man/curs_touch.3x.html @@ -1,6 +1,6 @@ diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html index b77def00..4bb07d02 100644 --- a/doc/html/man/form.3x.html +++ b/doc/html/man/form.3x.html @@ -245,7 +245,7 @@ curses(3x) and related pages whose names begin "form_" for detailed descriptions of the entry points. - This describes ncurses version 6.0 (patch 20151024). + This describes ncurses version 6.0 (patch 20151205). diff --git a/doc/html/man/form_cursor.3x.html b/doc/html/man/form_cursor.3x.html index c377fc01..392503d0 100644 --- a/doc/html/man/form_cursor.3x.html +++ b/doc/html/man/form_cursor.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,7 @@

NAME

-       form_cursor - position a form window cursor
+       pos_form_cursor - position a form window cursor
 
 
 
diff --git a/doc/html/man/form_data.3x.html b/doc/html/man/form_data.3x.html index 7691a29d..ead02924 100644 --- a/doc/html/man/form_data.3x.html +++ b/doc/html/man/form_data.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       form_data - test for off-screen data in given forms
+       data_ahead,  data_behind  -  test  for  off-screen data in
+       given forms
 
 
 
@@ -60,12 +61,12 @@

DESCRIPTION

-       The  function data_ahead tests whether there is off-screen
-       data ahead in the given form.   It  returns  TRUE  (1)  or
+       The function data_ahead tests whether there is  off-screen
+       data  ahead  in  the  given  form.  It returns TRUE (1) or
        FALSE (0).
 
        The function data_behind tests whether there is off-screen
-       data behind in the given form.  It  returns  TRUE  (1)  or
+       data  behind  in  the  given form.  It returns TRUE (1) or
        FALSE (0).
 
 
@@ -82,13 +83,13 @@
 
 

PORTABILITY

-       These routines emulate the System V forms  library.   They
+       These  routines  emulate the System V forms library.  They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_driver.3x.html b/doc/html/man/form_driver.3x.html
index 72b2d942..26fcc948 100644
--- a/doc/html/man/form_driver.3x.html
+++ b/doc/html/man/form_driver.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_driver.3x,v 1.24 2015/08/02 18:21:11 tom Exp @
+  * @Id: form_driver.3x,v 1.25 2015/12/05 21:06:26 tom Exp @
 -->
 
 
@@ -47,7 +47,8 @@
 
 

NAME

-       form_driver - command-processing loop of the form system
+       form_driver,  form_driver_w  -  command-processing loop of
+       the form system
 
 
 
@@ -63,16 +64,16 @@

form_driver

        Once a form has been posted (displayed), you should funnel
-       input events to it through form_driver.  This routine  has
+       input  events to it through form_driver.  This routine has
        three major input cases:
 
-       o   The  input  is  a form navigation request.  Navigation
+       o   The input is a form  navigation  request.   Navigation
            request codes are constants defined in <form.h>, which
-           are   distinct  from  the  key-  and  character  codes
+           are  distinct  from  the  key-  and  character   codes
            returned by wgetch(3x).
 
        o   The input is a printable character.  Printable charac-
-           ters  (which  must  be  positive,  less  than 256) are
+           ters (which must  be  positive,  less  than  256)  are
            checked according to the program's locale settings.
 
        o   The input is the KEY_MOUSE special key associated with
@@ -81,11 +82,11 @@
 
 

form_driver_w

-       This  extension  simplifies  the  use of the forms library
-       using wide characters.  The input is either a key code  (a
+       This extension simplifies the use  of  the  forms  library
+       using  wide characters.  The input is either a key code (a
        request) or a wide character returned by get_wch(3x).  The
-       type must be passed as well,  to  enable  the  library  to
-       determine  whether  the parameter is a wide character or a
+       type  must  be  passed  as  well, to enable the library to
+       determine whether the parameter is a wide character  or  a
        request.
 
 
@@ -116,8 +117,8 @@
        REQ_LAST_FIELD     Move to the last field.
        REQ_LAST_PAGE      Move to the last field.
        REQ_LEFT_CHAR      Move left in the field.
-       REQ_LEFT_FIELD     Move left to a field.
 
+       REQ_LEFT_FIELD     Move left to a field.
        REQ_NEW_LINE       Insert or overlay a new line.
        REQ_NEXT_CHAR      Move to the next char.
        REQ_NEXT_CHOICE    Display next field choice.
@@ -155,18 +156,18 @@
        REQ_UP_FIELD       Move up to a field.
        REQ_VALIDATION     Validate field.
 
-       If the second  argument  is  a  printable  character,  the
-       driver  places  it  in the current position in the current
-       field.  If it is one of the forms requests  listed  above,
+       If  the  second  argument  is  a  printable character, the
+       driver places it in the current position  in  the  current
+       field.   If  it is one of the forms requests listed above,
        that request is executed.
 
 
 

Mouse handling

-       If  the  second argument is the KEY_MOUSE special key, the
+       If the second argument is the KEY_MOUSE special  key,  the
        associated mouse event is translated into one of the above
-       pre-defined  requests.   Currently only clicks in the user
-       window (e.g., inside the form display area or the  decora-
+       pre-defined requests.  Currently only clicks in  the  user
+       window  (e.g., inside the form display area or the decora-
        tion window) are handled.
 
        If you click above the display region of the form:
@@ -185,34 +186,34 @@
 
           a REQ_LAST_FIELD is generated for a triple-click.
 
-       If  you  click  at an field inside the display area of the
+       If you click at an field inside the display  area  of  the
        form:
 
           o   the form cursor is positioned to that field.
 
-          o   If you double-click a field,  the  form  cursor  is
-              positioned  to  that field and E_UNKNOWN_COMMAND is
+          o   If  you  double-click  a  field, the form cursor is
+              positioned to that field and  E_UNKNOWN_COMMAND  is
               returned.  This return value makes sense, because a
-              double  click  usually means that an field-specific
-              action should be returned.  It is exactly the  pur-
-              pose  of this return value to signal that an appli-
+              double click usually means that  an  field-specific
+              action  should be returned.  It is exactly the pur-
+              pose of this return value to signal that an  appli-
               cation specific command should be executed.
 
-          o   If  a  translation  into  a   request   was   done,
+          o   If   a   translation   into  a  request  was  done,
               form_driver returns the result of this request.
 
-       If  you clicked outside the user window or the mouse event
-       could  not  be  translated  into   a   form   request   an
+       If you clicked outside the user window or the mouse  event
+       could   not   be   translated   into  a  form  request  an
        E_REQUEST_DENIED is returned.
 
 
 

Application-defined commands

        If the second argument is neither printable nor one of the
-       above pre-defined form requests, the driver assumes it  is
+       above  pre-defined form requests, the driver assumes it is
        an application-specific command and returns E_UNKNOWN_COM-
        MAND.  Application-defined commands should be defined rel-
-       ative  to  MAX_COMMAND,  the  maximum  value of these pre-
+       ative to MAX_COMMAND, the  maximum  value  of  these  pre-
        defined requests.
 
 
@@ -223,7 +224,7 @@
        E_OK The routine succeeded.
 
        E_BAD_ARGUMENT
-            Routine detected an incorrect or  out-of-range  argu-
+            Routine  detected  an incorrect or out-of-range argu-
             ment.
 
        E_BAD_STATE
@@ -259,13 +260,13 @@
 
 

PORTABILITY

-       These  routines  emulate the System V forms library.  They
+       These routines emulate the System V forms  library.   They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_field_info.3x.html b/doc/html/man/form_field_info.3x.html
index b218e542..9023d87f 100644
--- a/doc/html/man/form_field_info.3x.html
+++ b/doc/html/man/form_field_info.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       form_field_info - retrieve field characteristics
+       dynamic_field_info, field_info - retrieve field character-
+       istics
 
 
 
@@ -56,21 +57,21 @@ #include <form.h> int field_info(const FIELD *field, int *rows, int *cols, int *frow, int *fcol, int *nrow, int *nbuf); - int dynamic_field_info(const FIELD *field, int *rows, int + int dynamic_field_info(const FIELD *field, int *rows, int *cols, int *max);

DESCRIPTION

        The  function  field_info  returns  the  sizes  and  other
-       attributes  passed  in  to the field at its creation time.
-       The attributes are: height, width, row of upper-left  cor-
-       ner,  column of upper-left corner, number off-screen rows,
+       attributes passed in to the field at  its  creation  time.
+       The  attributes are: height, width, row of upper-left cor-
+       ner, column of upper-left corner, number off-screen  rows,
        and number of working buffers.
 
        The function dynamic_field_info returns the actual size of
-       the  field,  and  its maximum possible size.  If the field
-       has no size limit, the location  addressed  by  the  third
+       the field, and its maximum possible size.   If  the  field
+       has  no  size  limit,  the location addressed by the third
        argument will be set to 0.  A field can be made dynamic by
        turning off the O_STATIC option with field_opts_off.
 
@@ -85,7 +86,7 @@
             System error occurred (see errno).
 
        E_BAD_ARGUMENT
-            Routine detected an incorrect or  out-of-range  argu-
+            Routine  detected  an incorrect or out-of-range argu-
             ment.
 
 
@@ -103,17 +104,17 @@
 
 

PORTABILITY

-       These  routines  emulate the System V forms library.  They
+       These routines emulate the System V forms  library.   They
        were not supported on Version 7 or BSD versions.
 
-       A null (zero pointer) is accepted for any  of  the  return
-       values,  to  ignore  that  value.  Not all implementations
+       A  null  (zero  pointer) is accepted for any of the return
+       values, to ignore that  value.   Not  all  implementations
        allow this, e.g., Solaris 2.7 does not.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_field_just.3x.html b/doc/html/man/form_field_just.3x.html
index 34a3bea1..8a64bee3 100644
--- a/doc/html/man/form_field_just.3x.html
+++ b/doc/html/man/form_field_just.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       form_field_just - retrieve field characteristics
+       set_field_just,  field_just  - retrieve field characteris-
+       tics
 
 
 
@@ -60,15 +61,15 @@

DESCRIPTION

-       The   function   set_field_just   sets  the  justification
-       attribute of a field; field_just returns a field's  justi-
+       The  function  set_field_just   sets   the   justification
+       attribute  of a field; field_just returns a field's justi-
        fication attribute.  The attribute may be one of NO_JUSTI-
        FICATION, JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
 
 
 

RETURN VALUE

-       The function field_just returns one of:  NO_JUSTIFICATION,
+       The  function field_just returns one of: NO_JUSTIFICATION,
        JUSTIFY_RIGHT, JUSTIFY_LEFT, or JUSTIFY_CENTER.
 
        The function set_field_just returns one of the following:
@@ -79,7 +80,7 @@
             System error occurred (see errno).
 
        E_BAD_ARGUMENT
-            Routine  detected  an incorrect or out-of-range argu-
+            Routine detected an incorrect or  out-of-range  argu-
             ment.
 
 
@@ -97,13 +98,13 @@
 
 

PORTABILITY

-       These routines emulate the System V forms  library.   They
+       These  routines  emulate the System V forms library.  They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_field_new.3x.html b/doc/html/man/form_field_new.3x.html
index 88a5c74b..c3633e9a 100644
--- a/doc/html/man/form_field_new.3x.html
+++ b/doc/html/man/form_field_new.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       form_field_new - create and destroy form fields
+       new_field,  dup_field, link_field, free_field - create and
+       destroy form fields
 
 
 
@@ -64,23 +65,23 @@

DESCRIPTION

-       The  function new_field allocates a new field and initial-
-       izes it from the parameters given: height, width,  row  of
-       upper-left  corner,  column  of  upper-left corner, number
+       The function new_field allocates a new field and  initial-
+       izes  it  from the parameters given: height, width, row of
+       upper-left corner, column  of  upper-left  corner,  number
        off-screen rows, and number of additional working buffers.
 
-       The function dup_field duplicates a field at a  new  loca-
-       tion.   Most attributes (including current contents, size,
-       validation type, buffer count, growth threshold,  justifi-
-       cation,  foreground,  background,  pad character, options,
-       and user pointer) are copied.  Field status and the  field
+       The  function  dup_field duplicates a field at a new loca-
+       tion.  Most attributes (including current contents,  size,
+       validation  type, buffer count, growth threshold, justifi-
+       cation, foreground, background,  pad  character,  options,
+       and  user pointer) are copied.  Field status and the field
        page bit are not copied.
 
-       The  function  link_field acts like dup_field, but the new
-       field shares buffers with its parent.  Attribute  data  is
+       The function link_field acts like dup_field, but  the  new
+       field  shares  buffers with its parent.  Attribute data is
        separate.
 
-       The  function  free_field  de-allocates storage associated
+       The function free_field  de-allocates  storage  associated
        with a field.
 
 
@@ -92,7 +93,7 @@
        E_OK The routine succeeded.
 
        E_BAD_ARGUMENT
-            Routine  detected  an incorrect or out-of-range argu-
+            Routine detected an incorrect or  out-of-range  argu-
             ment.
 
        E_SYSTEM_ERROR
@@ -103,7 +104,7 @@
        E_OK The routine succeeded.
 
        E_BAD_ARGUMENT
-            Routine detected an incorrect or  out-of-range  argu-
+            Routine  detected  an incorrect or out-of-range argu-
             ment.
 
        E_CONNECTED
@@ -123,18 +124,18 @@
 
 

PORTABILITY

-       These routines emulate the System V forms  library.   They
+       These  routines  emulate the System V forms library.  They
        were not supported on Version 7 or BSD versions.
 
-       It  may be unwise to count on the set of attributes copied
-       by dup_field being portable; the System  V  forms  library
+       It may be unwise to count on the set of attributes  copied
+       by  dup_field  being  portable; the System V forms library
        documents are not very explicit about what gets copied and
        what does not.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_field_opts.3x.html b/doc/html/man/form_field_opts.3x.html
index 93b62a13..dff1b6d3 100644
--- a/doc/html/man/form_field_opts.3x.html
+++ b/doc/html/man/form_field_opts.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       form_field_opts - set and get field options
+       set_field_opts,  field_opts_on, field_opts_off, field_opts
+       - set and get field options
 
 
 
@@ -62,33 +63,33 @@

DESCRIPTION

-       The  function  set_field_opts  sets  all the given field's
-       option bits (field  option  bits  may  be  logically-OR'ed
+       The function set_field_opts sets  all  the  given  field's
+       option  bits  (field  option  bits  may be logically-OR'ed
        together).
 
        The function field_opts_on turns on the given option bits,
        and leaves others alone.
 
-       The function field_opts_off turns  off  the  given  option
+       The  function  field_opts_off  turns  off the given option
        bits, and leaves others alone.
 
        The function field_opts returns the field's current option
        bits.
 
-       The following standard options are defined (all are on  by
+       The  following standard options are defined (all are on by
        default):
 
        O_ACTIVE
-            The  field  is  visited  during  processing.  If this
-            option is off, the field will  not  be  reachable  by
-            navigation  keys.  Please  notice  that  an invisible
+            The field is  visited  during  processing.   If  this
+            option  is  off,  the  field will not be reachable by
+            navigation keys.  Please  notice  that  an  invisible
             field appears to be inactive also.
 
        O_AUTOSKIP
             Skip to the next field when this one fills.
 
        O_BLANK
-            The field is cleared whenever a character is  entered
+            The  field is cleared whenever a character is entered
             at the first position.
 
        O_EDIT
@@ -104,24 +105,28 @@
             The field contents are displayed as data is entered.
 
        O_STATIC
-            Field  buffers  are  fixed  to field's original size.
+            Field buffers are fixed  to  field's  original  size.
             Turn this option off to create a dynamic field.
 
        O_VISIBLE
-            The field is displayed.  If this option is off,  dis-
+            The  field is displayed.  If this option is off, dis-
             play of the field is suppressed.
 
        O_WRAP
-            Words  that  do  not fit on a line are wrapped to the
+            Words that do not fit on a line are  wrapped  to  the
             next line.  Words are blank-separated.
 
-       One extension option is defined  (extensions  are  off  by
+       These extension options are defined (extensions are off by
        default):
 
        O_DYNAMIC_JUSTIFY
-            Permit  dynamic  fields  to be justified, like static
+            Permit dynamic fields to be  justified,  like  static
             fields.
 
+       O_NO_LEFT_STRIP
+            Preserve  leading  whitespace  in  the  field buffer,
+            which is normally discarded.
+
 
 

RETURN VALUE

diff --git a/doc/html/man/form_field_userptr.3x.html b/doc/html/man/form_field_userptr.3x.html
index bce4e11d..edec864d 100644
--- a/doc/html/man/form_field_userptr.3x.html
+++ b/doc/html/man/form_field_userptr.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,8 +48,8 @@
 
 

NAME

-       form_field_userptr  -  associate  application  data with a
-       form field
+       set_field_userptr,  field_userptr  - associate application
+       data with a form field
 
 
 
diff --git a/doc/html/man/form_new.3x.html b/doc/html/man/form_new.3x.html index 2bc8631e..50a5e117 100644 --- a/doc/html/man/form_new.3x.html +++ b/doc/html/man/form_new.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,7 @@

NAME

-       form_new - create and destroy forms
+       new_form, free_form - create and destroy forms
 
 
 
diff --git a/doc/html/man/form_new_page.3x.html b/doc/html/man/form_new_page.3x.html index 9ee5a69e..84d14997 100644 --- a/doc/html/man/form_new_page.3x.html +++ b/doc/html/man/form_new_page.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,7 @@

NAME

-       form_new_page - form pagination functions
+       set_new_page, new_page - form pagination functions
 
 
 
diff --git a/doc/html/man/form_opts.3x.html b/doc/html/man/form_opts.3x.html index 5bcb665d..810243a0 100644 --- a/doc/html/man/form_opts.3x.html +++ b/doc/html/man/form_opts.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       form_opts - set and get form options
+       set_form_opts,  form_opts_on,  form_opts_off,  form_opts -
+       set and get form options
 
 
 
@@ -62,29 +63,29 @@

DESCRIPTION

-       The  function  set_form_opts  sets  all  the  given form's
-       option bits  (form  option  bits  may  be  logically-OR'ed
+       The function  set_form_opts  sets  all  the  given  form's
+       option  bits  (form  option  bits  may  be logically-OR'ed
        together).
 
-       The  function form_opts_on turns on the given option bits,
+       The function form_opts_on turns on the given option  bits,
        and leaves others alone.
 
-       The function form_opts_off  turns  off  the  given  option
+       The  function  form_opts_off  turns  off  the given option
        bits, and leaves others alone.
 
-       The  function  form_opts returns the form's current option
+       The function form_opts returns the form's  current  option
        bits.
 
        The following options are defined (all are on by default):
 
        O_NL_OVERLOAD
-            Overload the REQ_NEW_LINE  forms  driver  request  so
-            that  calling  it  at  the end of a field goes to the
+            Overload  the  REQ_NEW_LINE  forms  driver request so
+            that calling it at the end of a  field  goes  to  the
             next field.
 
        O_BS_OVERLOAD
-            Overload the REQ_DEL_PREV  forms  driver  request  so
-            that  calling  it at the beginning of a field goes to
+            Overload  the  REQ_DEL_PREV  forms  driver request so
+            that calling it at the beginning of a field  goes  to
             the previous field.
 
 
@@ -112,13 +113,13 @@
 
 

PORTABILITY

-       These routines emulate the System V forms  library.   They
+       These  routines  emulate the System V forms library.  They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_post.3x.html b/doc/html/man/form_post.3x.html
index b950d09d..4a103da2 100644
--- a/doc/html/man/form_post.3x.html
+++ b/doc/html/man/form_post.3x.html
@@ -27,7 +27,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: form_post.3x,v 1.9 2010/12/04 18:40:45 tom Exp @
+  * @Id: form_post.3x,v 1.10 2015/12/05 20:41:37 jmc Exp @
 -->
 
 
@@ -48,8 +48,8 @@
 
 

NAME

-       form_post  -  write or erase forms from associated subwin-
-       dows
+       post_form, unpost_form - write or erase forms from associ-
+       ated subwindows
 
 
 
diff --git a/doc/html/man/form_requestname.3x.html b/doc/html/man/form_requestname.3x.html index 2d2dcdfb..5f8e66b8 100644 --- a/doc/html/man/form_requestname.3x.html +++ b/doc/html/man/form_requestname.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       form_requestname - handle printable form request names
+       form_request_by_name, form_request_name - handle printable
+       form request names
 
 
 
@@ -60,16 +61,16 @@

DESCRIPTION

-       The  function form_request_name returns the printable name
+       The function form_request_name returns the printable  name
        of a form request code.
        The function form_request_by_name searches in the name-ta-
-       ble  for  a  request  with  the given name and returns its
+       ble for a request with the  given  name  and  returns  its
        request code. Otherwise E_NO_MATCH is returned.
 
 
 

RETURN VALUE

-       form_request_name returns NULL on error and sets errno  to
+       form_request_name  returns NULL on error and sets errno to
        E_BAD_ARGUMENT.
        form_request_by_name returns E_NO_MATCH on error.  It does
        not set errno.
@@ -88,15 +89,15 @@
 
 

PORTABILITY

-       These  routines  are  specific  to ncurses.  They were not
-       supported on Version 7, BSD or System  V  implementations.
-       It  is recommended that any code depending on them be con-
+       These routines are specific to  ncurses.   They  were  not
+       supported  on  Version 7, BSD or System V implementations.
+       It is recommended that any code depending on them be  con-
        ditioned using NCURSES_VERSION.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/form_userptr.3x.html b/doc/html/man/form_userptr.3x.html
index feae531c..deba2ffe 100644
--- a/doc/html/man/form_userptr.3x.html
+++ b/doc/html/man/form_userptr.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       form_userptr - associate application data with a form item
+       set_form_userptr,  form_userptr  -  associate  application
+       data with a form item
 
 
 
@@ -60,7 +61,7 @@

DESCRIPTION

-       Every  form  and  every  form item has a field that can be
+       Every form and every form item has a  field  that  can  be
        used to hold application-specific data (that is, the form-
        driver code leaves it alone).  These functions get and set
        the form user pointer field.
@@ -68,7 +69,7 @@
 
 

RETURN VALUE

-       The function form_userptr returns a pointer (which may  be
+       The  function form_userptr returns a pointer (which may be
        NULL).  It does not set errno.
 
        The function set_form_userptr returns E_OK (success).
@@ -87,7 +88,7 @@
 
 

PORTABILITY

-       These routines emulate the System V forms  library.   They
+       These  routines  emulate the System V forms library.  They
        were not supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave
@@ -96,7 +97,7 @@
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 62abab95..a4376c16 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -487,7 +487,7 @@
 
        http://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html index e205adaf..0a8163a6 100644 --- a/doc/html/man/infotocap.1m.html +++ b/doc/html/man/infotocap.1m.html @@ -94,7 +94,7 @@

SEE ALSO

        curses(3x), tic(1m), infocmp(1m), terminfo(5)
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html index b9268c76..16542f4f 100644 --- a/doc/html/man/menu.3x.html +++ b/doc/html/man/menu.3x.html @@ -227,7 +227,7 @@ curses(3x) and related pages whose names begin "menu_" for detailed descriptions of the entry points. - This describes ncurses version 6.0 (patch 20151024). + This describes ncurses version 6.0 (patch 20151205). diff --git a/doc/html/man/menu_attributes.3x.html b/doc/html/man/menu_attributes.3x.html index ac338e6e..0293920d 100644 --- a/doc/html/man/menu_attributes.3x.html +++ b/doc/html/man/menu_attributes.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,9 @@

NAME

-       menu_attributes - color and attribute control for menus
+       menu_back,  menu_fore, menu_grey, menu_pad, set_menu_back,
+       set_menu_fore, set_menu_grey,  set_menu_pad  -  color  and
+       attribute control for menus
 
 
 
diff --git a/doc/html/man/menu_cursor.3x.html b/doc/html/man/menu_cursor.3x.html index e5c29de0..fe3128cf 100644 --- a/doc/html/man/menu_cursor.3x.html +++ b/doc/html/man/menu_cursor.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,7 @@

NAME

-       menu_cursor - position a menu's cursor
+       pos_menu_cursor - position a menu's cursor
 
 
 
diff --git a/doc/html/man/menu_format.3x.html b/doc/html/man/menu_format.3x.html index 3e8adbc2..09353f00 100644 --- a/doc/html/man/menu_format.3x.html +++ b/doc/html/man/menu_format.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,7 @@

NAME

-       menu_format - set and get menu sizes
+       set_menu_format, menu_format - set and get menu sizes
 
 
 
diff --git a/doc/html/man/menu_items.3x.html b/doc/html/man/menu_items.3x.html index fc56a87d..4fb7c2b2 100644 --- a/doc/html/man/menu_items.3x.html +++ b/doc/html/man/menu_items.3x.html @@ -1,7 +1,7 @@ @@ -48,8 +48,8 @@

NAME

-       menu_items  - make and break connections between items and
-       menus
+       set_menu_items,  menu_items,  item_count  - make and break
+       connections between items and menus
 
 
 
diff --git a/doc/html/man/menu_mark.3x.html b/doc/html/man/menu_mark.3x.html index b0e678c2..bb578461 100644 --- a/doc/html/man/menu_mark.3x.html +++ b/doc/html/man/menu_mark.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       menu_mark - get and set the menu mark string
+       set_menu_mark,  menu_mark  -  get  and  set  the menu mark
+       string
 
 
 
@@ -60,36 +61,36 @@

DESCRIPTION

-       In  order  to make menu selections visible on older termi-
-       nals without highlighting or color  capability,  the  menu
-       library  marks  selected  items  in  a  menu with a prefix
+       In order to make menu selections visible on  older  termi-
+       nals  without  highlighting  or color capability, the menu
+       library marks selected items  in  a  menu  with  a  prefix
        string.
 
-       The function set_menu_mark sets the mark  string  for  the
-       given  menu.   Calling set_menu_mark with a null menu item
-       will abolish the mark  string.   Note  that  changing  the
-       length  of  the  mark  string for a menu while the menu is
+       The  function  set_menu_mark  sets the mark string for the
+       given menu.  Calling set_menu_mark with a null  menu  item
+       will  abolish  the  mark  string.   Note that changing the
+       length of the mark string for a menu  while  the  menu  is
        posted is likely to produce unhelpful behavior.
 
-       The default string is "-" (a dash). Calling  set_menu_mark
+       The  default string is "-" (a dash). Calling set_menu_mark
        with a non-NULL menu argument will change this default.
 
-       The  function menu_mark returns the menu's mark string (or
+       The function menu_mark returns the menu's mark string  (or
        NULL if there is none).
 
 
 

RETURN VALUE

-       The function menu_mark returns a  pointer  (which  may  be
+       The  function  menu_mark  returns  a pointer (which may be
        NULL).  It does not set errno.
 
-       The  function set_menu_mark may return the following error
+       The function set_menu_mark may return the following  error
        codes:
 
        E_OK The routine succeeded.
 
        E_BAD_ARGUMENT
-            Routine detected an incorrect or  out-of-range  argu-
+            Routine  detected  an incorrect or out-of-range argu-
             ment.
 
        E_SYSTEM_ERROR
@@ -109,13 +110,13 @@
 
 

PORTABILITY

-       These routines emulate the System V  menu  library.   They
+       These  routines  emulate  the System V menu library.  They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/menu_new.3x.html b/doc/html/man/menu_new.3x.html
index 1bd90758..9c594917 100644
--- a/doc/html/man/menu_new.3x.html
+++ b/doc/html/man/menu_new.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,7 @@
 
 

NAME

-       menu_new - create and destroy menus
+       new_menu, free_menu - create and destroy menus
 
 
 
diff --git a/doc/html/man/menu_opts.3x.html b/doc/html/man/menu_opts.3x.html index d61c9d6a..0fa3d03f 100644 --- a/doc/html/man/menu_opts.3x.html +++ b/doc/html/man/menu_opts.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       menu_opts - set and get menu options
+       set_menu_opts,  menu_opts_on,  menu_opts_off,  menu_opts -
+       set and get menu options
 
 
 
@@ -62,17 +63,17 @@

DESCRIPTION

-       The  function  set_menu_opts  sets  all  the  given menu's
-       option bits  (menu  option  bits  may  be  logically-OR'ed
+       The function  set_menu_opts  sets  all  the  given  menu's
+       option  bits  (menu  option  bits  may  be logically-OR'ed
        together).
 
-       The  function menu_opts_on turns on the given option bits,
+       The function menu_opts_on turns on the given option  bits,
        and leaves others alone.
 
-       The function menu_opts_off  turns  off  the  given  option
+       The  function  menu_opts_off  turns  off  the given option
        bits, and leaves others alone.
 
-       The  function  menu_opts returns the menu's current option
+       The function menu_opts returns the menu's  current  option
        bits.
 
        The following options are defined (all are on by default):
@@ -91,11 +92,11 @@
             Ignore the case when pattern-matching.
 
        O_SHOWMATCH
-            Move  the  cursor  to within the item name while pat-
+            Move the cursor to within the item  name  while  pat-
             tern-matching.
 
        O_NONCYCLIC
-            Don't  wrap  around  next-item   and   previous-item,
+            Don't   wrap   around  next-item  and  previous-item,
             requests to the other end of the menu.
 
 
@@ -126,13 +127,13 @@
 
 

PORTABILITY

-       These  routines  emulate  the System V menu library.  They
+       These routines emulate the System V  menu  library.   They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/menu_pattern.3x.html b/doc/html/man/menu_pattern.3x.html
index 997be0c0..4f251da3 100644
--- a/doc/html/man/menu_pattern.3x.html
+++ b/doc/html/man/menu_pattern.3x.html
@@ -1,6 +1,6 @@
 
 
 
@@ -47,7 +47,8 @@
 
 

NAME

-       menu_pattern - get and set a menu's pattern buffer
+       set_menu_pattern, menu_pattern - set and get a menu's pat-
+       tern buffer
 
 
 
@@ -59,17 +60,17 @@

DESCRIPTION

-       Every  menu  has  an  associated pattern match buffer.  As
-       input events that are printable characters come  in,  they
-       are  appended to this match buffer and tested for a match,
+       Every menu has an associated  pattern  match  buffer.   As
+       input  events  that are printable characters come in, they
+       are appended to this match buffer and tested for a  match,
        as described in menu_driver(3x).
 
-       The function set_menu_pattern sets the pattern buffer  for
-       the  given menu and tries to find the first matching item.
-       If it succeeds, that item becomes  current;  if  not,  the
+       The  function set_menu_pattern sets the pattern buffer for
+       the given menu and tries to find the first matching  item.
+       If  it  succeeds,  that  item becomes current; if not, the
        current item does not change.
 
-       The  function  menu_pattern  returns the pattern buffer of
+       The function menu_pattern returns the  pattern  buffer  of
        the given menu.
 
 
@@ -80,13 +81,13 @@
        to a string which is empty if no pattern has been set.  It
        does not set errno.
 
-       The  function  set_menu_pattern  may  return the following
+       The function set_menu_pattern  may  return  the  following
        error codes:
 
        E_OK The routine succeeded.
 
        E_BAD_ARGUMENT
-            Routine detected an incorrect or  out-of-range  argu-
+            Routine  detected  an incorrect or out-of-range argu-
             ment.
 
        E_BAD_STATE
@@ -116,13 +117,13 @@
 
 

PORTABILITY

-       These  routines  emulate  the System V menu library.  They
+       These routines emulate the System V  menu  library.   They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/menu_post.3x.html b/doc/html/man/menu_post.3x.html
index ae275bfa..9a922705 100644
--- a/doc/html/man/menu_post.3x.html
+++ b/doc/html/man/menu_post.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,8 +48,8 @@
 
 

NAME

-       menu_post  -  write or erase menus from associated subwin-
-       dows
+       post_menu, unpost_menu - write or erase menus from associ-
+       ated subwindows
 
 
 
diff --git a/doc/html/man/menu_requestname.3x.html b/doc/html/man/menu_requestname.3x.html index 649a5410..1e8529b1 100644 --- a/doc/html/man/menu_requestname.3x.html +++ b/doc/html/man/menu_requestname.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       menu_requestname - handle printable menu request names
+       menu_request_by_name, menu_request_name - handle printable
+       menu request names
 
 
 
@@ -60,16 +61,16 @@

DESCRIPTION

-       The  function menu_request_name returns the printable name
+       The function menu_request_name returns the printable  name
        of a menu request code.
        The function menu_request_by_name searches in the name-ta-
-       ble  for  a  request  with  the given name and returns its
+       ble for a request with the  given  name  and  returns  its
        request code.  Otherwise E_NO_MATCH is returned.
 
 
 

RETURN VALUE

-       menu_request_name returns NULL on error and sets errno  to
+       menu_request_name  returns NULL on error and sets errno to
        E_BAD_ARGUMENT.
        menu_request_by_name returns E_NO_MATCH on error.  It does
        not set errno.
@@ -88,15 +89,15 @@
 
 

PORTABILITY

-       These  routines  are  specific  to ncurses.  They were not
-       supported on Version 7, BSD or System  V  implementations.
-       It  is recommended that any code depending on them be con-
+       These routines are specific to  ncurses.   They  were  not
+       supported  on  Version 7, BSD or System V implementations.
+       It is recommended that any code depending on them be  con-
        ditioned using NCURSES_VERSION.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/menu_spacing.3x.html b/doc/html/man/menu_spacing.3x.html
index d067211c..0ac3c25a 100644
--- a/doc/html/man/menu_spacing.3x.html
+++ b/doc/html/man/menu_spacing.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       menu_spacing - Control spacing between menu items.
+       set_menu_spacing,  menu_spacing  -  set  and  get  spacing
+       between menu items.
 
 
 
@@ -67,28 +68,28 @@

DESCRIPTION

        The function set_menu_spacing sets the spacing information
-       for the menu.  Its parameter spc_description controls  the
+       for  the menu.  Its parameter spc_description controls the
        number of spaces between an item name and an item descrip-
-       tion.  It must not be larger than TABSIZE.  The menu  sys-
-       tem  puts in the middle of this spacing area the pad char-
-       acter.  The remaining parts are filled with  spaces.   The
-       spc_rows  parameter  controls  the number of rows that are
+       tion.   It must not be larger than TABSIZE.  The menu sys-
+       tem puts in the middle of this spacing area the pad  char-
+       acter.   The  remaining parts are filled with spaces.  The
+       spc_rows parameter controls the number of  rows  that  are
        used for an item.  It must not be larger than 3.  The menu
-       system  inserts  the  blank lines between item rows, these
-       lines will contain the pad character  in  the  appropriate
-       positions.   The spc_columns parameter controls the number
+       system inserts the blank lines between  item  rows,  these
+       lines  will  contain  the pad character in the appropriate
+       positions.  The spc_columns parameter controls the  number
        of blanks between columns of items.  It must not be larger
-       than  TABSIZE.   A  value  of 0 for all the spacing values
+       than TABSIZE.  A value of 0 for  all  the  spacing  values
        resets them to the default, which is 1 for all of them.
        The function menu_spacing passes back the spacing info for
-       the  menu.   If  a  pointer is NULL, this specific info is
+       the menu.  If a pointer is NULL,  this  specific  info  is
        simply not returned.
 
 
 

RETURN VALUE

-       Both routines return E_OK  on  success.   set_menu_spacing
-       may  return E_POSTED if the menu is posted, or E_BAD_ARGU-
+       Both  routines  return  E_OK on success.  set_menu_spacing
+       may return E_POSTED if the menu is posted, or  E_BAD_ARGU-
        MENT if one of the spacing values is out of range.
 
 
@@ -105,15 +106,15 @@
 
 

PORTABILITY

-       These  routines  are  specific  to ncurses.  They were not
-       supported on Version 7, BSD or System  V  implementations.
-       It  is recommended that any code depending on them be con-
+       These routines are specific to  ncurses.   They  were  not
+       supported  on  Version 7, BSD or System V implementations.
+       It is recommended that any code depending on them be  con-
        ditioned using NCURSES_VERSION.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/menu_userptr.3x.html b/doc/html/man/menu_userptr.3x.html
index 65463b44..d225e022 100644
--- a/doc/html/man/menu_userptr.3x.html
+++ b/doc/html/man/menu_userptr.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       menu_userptr - associate application data with a menu item
+       set_menu_userptr,  menu_userptr  -  associate  application
+       data with a menu item
 
 
 
@@ -60,7 +61,7 @@

DESCRIPTION

-       Every  menu  and  every  menu item has a field that can be
+       Every menu and every menu item has a  field  that  can  be
        used to hold application-specific data (that is, the menu-
        driver code leaves it alone).  These functions get and set
        the menu user pointer field.
@@ -68,7 +69,7 @@
 
 

RETURN VALUE

-       menu_userptr returns a pointer (which may  be  NULL).   It
+       menu_userptr  returns  a  pointer (which may be NULL).  It
        does not set errno.
 
        set_menu_userptr returns E_OK (success).
@@ -87,7 +88,7 @@
 
 

PORTABILITY

-       These routines emulate the System V  menu  library.   They
+       These  routines  emulate  the System V menu library.  They
        were not supported on Version 7 or BSD versions.
 
        The user pointer is a void pointer.  We chose not to leave
@@ -96,7 +97,7 @@
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/mitem_name.3x.html b/doc/html/man/mitem_name.3x.html
index fd73c6b6..aa0c2499 100644
--- a/doc/html/man/mitem_name.3x.html
+++ b/doc/html/man/mitem_name.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,8 @@
 
 

NAME

-       mitem_name - get menu item name and description fields
+       item_name,  item_description  -  get  menu  item  name and
+       description fields
 
 
 
@@ -60,7 +61,7 @@

DESCRIPTION

-       The  function item_name returns the name part of the given
+       The function item_name returns the name part of the  given
        item.
        The function item_description returns the description part
        of the given item.
@@ -85,13 +86,13 @@
 
 

PORTABILITY

-       These  routines  emulate  the System V menu library.  They
+       These routines emulate the System V  menu  library.   They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
+       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/mitem_new.3x.html b/doc/html/man/mitem_new.3x.html
index 58ceafa7..79be0728 100644
--- a/doc/html/man/mitem_new.3x.html
+++ b/doc/html/man/mitem_new.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,7 +48,7 @@
 
 

NAME

-       mitem_new - create and destroy menu items
+       new_item, free_item - create and destroy menu items
 
 
 
diff --git a/doc/html/man/mitem_opts.3x.html b/doc/html/man/mitem_opts.3x.html index 39325642..e5aa6d92 100644 --- a/doc/html/man/mitem_opts.3x.html +++ b/doc/html/man/mitem_opts.3x.html @@ -1,7 +1,7 @@ @@ -48,7 +48,8 @@

NAME

-       mitem_opts - set and get menu item options
+       set_item_opts,  item_opts_on,  item_opts_off,  item_opts -
+       set and get menu item options
 
 
 
@@ -62,20 +63,20 @@

DESCRIPTION

-       The  function  set_item_opts  sets  all  the  given item's
-       option bits  (menu  option  bits  may  be  logically-OR'ed
+       The function  set_item_opts  sets  all  the  given  item's
+       option  bits  (menu  option  bits  may  be logically-OR'ed
        together).
 
-       The  function item_opts_on turns on the given option bits,
+       The function item_opts_on turns on the given option  bits,
        and leaves others alone.
 
-       The function item_opts_off  turns  off  the  given  option
+       The  function  item_opts_off  turns  off  the given option
        bits, and leaves others alone.
 
-       The  function  item_opts returns the item's current option
+       The function item_opts returns the item's  current  option
        bits.
 
-       There is only one defined option bit  mask,  O_SELECTABLE.
+       There  is  only one defined option bit mask, O_SELECTABLE.
        When this is on, the item may be selected during menu pro-
        cessing.  This option defaults to on.
 
@@ -104,13 +105,13 @@
 
 

PORTABILITY

-       These routines emulate the System V  menu  library.   They
+       These  routines  emulate  the System V menu library.  They
        were not supported on Version 7 or BSD versions.
 
 
 

AUTHORS

-       Juergen  Pfeifer.   Manual  pages  and  adaptation for new
+       Juergen Pfeifer.  Manual  pages  and  adaptation  for  new
        curses by Eric S. Raymond.
 
 
diff --git a/doc/html/man/mitem_userptr.3x.html b/doc/html/man/mitem_userptr.3x.html
index 881d8521..b5cd4ed3 100644
--- a/doc/html/man/mitem_userptr.3x.html
+++ b/doc/html/man/mitem_userptr.3x.html
@@ -1,7 +1,7 @@
 
 
 
@@ -48,8 +48,8 @@
 
 

NAME

-       mitem_userptr  -  associate  application  data with a menu
-       item
+       set_item_userptr,  item_userptr  -  associate  application
+       data with a menu item
 
 
 
diff --git a/doc/html/man/mitem_value.3x.html b/doc/html/man/mitem_value.3x.html index d68ba282..a98fd7db 100644 --- a/doc/html/man/mitem_value.3x.html +++ b/doc/html/man/mitem_value.3x.html @@ -1,6 +1,6 @@ @@ -47,7 +47,7 @@

NAME

-       mitem_value - set and get menu item values
+       set_item_value, item_value - set and get menu item values
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html index d451806a..9e434853 100644 --- a/doc/html/man/ncurses.3x.html +++ b/doc/html/man/ncurses.3x.html @@ -63,7 +63,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 20151024). + ncurses version 6.0 (patch 20151205). 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 291a1f73..5d18ab1d 100644 --- a/doc/html/man/panel.3x.html +++ b/doc/html/man/panel.3x.html @@ -1,6 +1,6 @@ @@ -56,21 +56,21 @@ cc [flags] sourcefiles -lpanel -lncurses - PANEL *new_panel(WINDOW *win) - int bottom_panel(PANEL *pan) - int top_panel(PANEL *pan) - int show_panel(PANEL *pan) + PANEL *new_panel(WINDOW *win); + int bottom_panel(PANEL *pan); + int top_panel(PANEL *pan); + int show_panel(PANEL *pan); void update_panels(); - int hide_panel(PANEL *pan) - WINDOW *panel_window(const PANEL *pan) - int replace_panel(PANEL *pan, WINDOW *window) - int move_panel(PANEL *pan, int starty, int startx) - int panel_hidden(const PANEL *pan) - PANEL *panel_above(const PANEL *pan) - PANEL *panel_below(const PANEL *pan) - int set_panel_userptr(PANEL *pan, const void *ptr) - const void *panel_userptr(const PANEL *pan) - int del_panel(PANEL *pan) + int hide_panel(PANEL *pan); + WINDOW *panel_window(const PANEL *pan); + int replace_panel(PANEL *pan, WINDOW *window); + int move_panel(PANEL *pan, int starty, int startx); + int panel_hidden(const PANEL *pan); + PANEL *panel_above(const PANEL *pan); + PANEL *panel_below(const PANEL *pan); + int set_panel_userptr(PANEL *pan, const void *ptr); + const void *panel_userptr(const PANEL *pan); + int del_panel(PANEL *pan); @@ -218,7 +218,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html index 8fdc2db3..aa1dca00 100644 --- a/doc/html/man/tabs.1.html +++ b/doc/html/man/tabs.1.html @@ -168,7 +168,7 @@

SEE ALSO

        tset(1), infocmp(1m), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/term_variables.3x.html b/doc/html/man/term_variables.3x.html
index 37b16dae..0005184e 100644
--- a/doc/html/man/term_variables.3x.html
+++ b/doc/html/man/term_variables.3x.html
@@ -26,7 +26,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: term_variables.3x,v 1.6 2015/04/22 00:34:49 tom Exp @
+  * @Id: term_variables.3x,v 1.7 2015/12/05 18:43:25 tom Exp @
 -->
 
 
@@ -59,6 +59,8 @@
 
        chtype acs_map[];
 
+       SCREEN * SP;
+
        TERMINAL * cur_term;
 
        char ttytype[];
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 14df96da..13e890bb 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -78,7 +78,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 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
        Entries in terminfo consist of a sequence of `,' separated
        fields (embedded commas may be escaped with a backslash or
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index aadca4d4..6329ca7d 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -408,7 +408,7 @@
        infocmp(1m),    captoinfo(1m),   infotocap(1m),   toe(1m),
        curses(3x), term(5).  terminfo(5).
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html index 9878c103..b3bc543f 100644 --- a/doc/html/man/toe.1m.html +++ b/doc/html/man/toe.1m.html @@ -122,7 +122,7 @@ tic(1m), infocmp(1m), captoinfo(1m), infotocap(1m), curses(3x), terminfo(5). - This describes ncurses version 6.0 (patch 20151024). + This describes ncurses version 6.0 (patch 20151205). diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html index 153bc03a..42c0917e 100644 --- a/doc/html/man/tput.1.html +++ b/doc/html/man/tput.1.html @@ -338,7 +338,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), terminfo(5), curs_termcap(3x).
 
-       This describes ncurses version 6.0 (patch 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index 87464d75..8d2b4e3e 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -319,7 +319,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 20151024).
+       This describes ncurses version 6.0 (patch 20151205).
 
 
 
diff --git a/man/curs_attr.3x b/man/curs_attr.3x
index d126b8b3..55c89c3e 100644
--- a/man/curs_attr.3x
+++ b/man/curs_attr.3x
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_attr.3x,v 1.42 2015/10/24 19:10:42 Sven.Joachim Exp $
+.\" $Id: curs_attr.3x,v 1.43 2015/12/05 18:46:04 tom Exp $
 .TH curs_attr 3X ""
 .na
 .hy 0
@@ -116,6 +116,8 @@
 \fBint mvwchgat(WINDOW *\fP\fIwin, int \fP\fIy, int \fP\fIx, int \fP\fIn,\fR
       \fBattr_t \fP\fIattr\fP\fB, short \fP\fIcolor\fP\fB, const void *\fP\fIopts\fP\fB);\fR
 .br
+\fBPAIR_NUMBER(\fR\fIattrs\fR\fB);\fP
+.br
 .SH DESCRIPTION
 These routines manipulate the current attributes of the named window.
 The
diff --git a/man/curs_color.3x b/man/curs_color.3x
index 46af844e..21cdd133 100644
--- a/man/curs_color.3x
+++ b/man/curs_color.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_color.3x,v 1.39 2015/06/06 23:29:02 tom Exp $
+.\" $Id: curs_color.3x,v 1.40 2015/12/05 20:09:42 tom Exp $
 .TH curs_color 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -66,6 +66,8 @@
 .br
 \fBint pair_content(short pair, short *f, short *b);\fR
 .br
+\fBint COLOR_PAIR(int n);\fR
+.br
 .SH DESCRIPTION
 .SS Overview
 \fBcurses\fR supports color attributes on terminals with that capability.
diff --git a/man/curs_legacy.3x b/man/curs_legacy.3x
index febaf294..6ffac25d 100644
--- a/man/curs_legacy.3x
+++ b/man/curs_legacy.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2007,2010 Free Software Foundation, Inc.                   *
+.\" Copyright (c) 2007-2010,2015 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,10 +26,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_legacy.3x,v 1.5 2010/12/04 18:38:55 tom Exp $
+.\" $Id: curs_legacy.3x,v 1.6 2015/12/05 20:33:14 tom Exp $
 .TH curs_legacy 3X ""
 .SH NAME
-getattrs \- get \fBcurses\fR cursor and window coordinates, attributes
+curs_legacy \- get \fBcurses\fR cursor and window coordinates, attributes
 .SH SYNOPSIS
 \fB#include \fR
 .sp
diff --git a/man/curs_opaque.3x b/man/curs_opaque.3x
index b395950d..1596bfff 100644
--- a/man/curs_opaque.3x
+++ b/man/curs_opaque.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_opaque.3x,v 1.12 2015/04/11 10:23:49 tom Exp $
+.\" $Id: curs_opaque.3x,v 1.13 2015/12/05 20:05:45 tom Exp $
 .TH curs_opaque 3X ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
@@ -46,7 +46,10 @@
 \fBis_pad\fR,
 \fBis_scrollok\fR,
 \fBis_subwin\fR,
-\fBis_syncok\fR \- \fBcurses\fR window properties
+\fBis_syncok\fR,
+\fBwgetdelay\fR,
+\fBwgetparent\fR,
+\fBwgetscrreg\fR \- \fBcurses\fR window properties
 .ad
 .hy
 .SH SYNOPSIS
diff --git a/man/curs_sp_funcs.3x b/man/curs_sp_funcs.3x
index c7c55ddb..bb490591 100644
--- a/man/curs_sp_funcs.3x
+++ b/man/curs_sp_funcs.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 2010,2013 Free Software Foundation, Inc.                   *
+.\" Copyright (c) 2010-2013,2015 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,12 +26,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_sp_funcs.3x,v 1.6 2013/06/22 17:53:59 tom Exp $
+.\" $Id: curs_sp_funcs.3x,v 1.7 2015/12/05 20:33:14 tom Exp $
 .TH curs_sp_funcs 3X ""
 .na
 .hy 0
 .SH NAME
-new_prescr \- \fBcurses\fR screen-pointer extension
+curs_sp_funcs \- \fBcurses\fR screen-pointer extension
 .ad
 .hy
 .SH SYNOPSIS
diff --git a/man/curs_threads.3x b/man/curs_threads.3x
index 15791162..350d5eea 100644
--- a/man/curs_threads.3x
+++ b/man/curs_threads.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: curs_threads.3x,v 1.22 2015/09/05 21:13:25 tom Exp $
+.\" $Id: curs_threads.3x,v 1.23 2015/12/05 18:47:04 tom Exp $
 .TH curs_threads 3X ""
 .de bP
 .IP \(bu 4
@@ -34,8 +34,7 @@
 .na
 .hy 0
 .SH NAME
-\fBuse_screen\fR,
-\fBuse_window\fR \- \fBcurses\fR thread support
+\fBcurs_threads\fR \- \fBcurses\fR thread support
 .ad
 .hy
 .SH SYNOPSIS
diff --git a/man/curs_touch.3x b/man/curs_touch.3x
index f65d2f9d..aa2ba5bf 100644
--- a/man/curs_touch.3x
+++ b/man/curs_touch.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2020,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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_touch.3x,v 1.15 2015/04/11 10:23:49 tom Exp $
+.\" $Id: curs_touch.3x,v 1.16 2015/12/05 23:43:00 tom Exp $
 .TH curs_touch 3X ""
 .na
 .hy 0
diff --git a/man/form_cursor.3x b/man/form_cursor.3x
index ed4b420d..551c878a 100644
--- a/man/form_cursor.3x
+++ b/man/form_cursor.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_cursor.3x,v 1.8 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_cursor.3x,v 1.9 2015/12/05 20:39:43 jmc Exp $
 .TH form_cursor 3X ""
 .SH NAME
-\fBform_cursor\fR \- position a form window cursor
+\fBpos_form_cursor\fR \- position a form window cursor
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_data.3x b/man/form_data.3x
index ed39bf5a..afaf1814 100644
--- a/man/form_data.3x
+++ b/man/form_data.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_data.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_data.3x,v 1.11 2015/12/05 23:01:16 tom Exp $
 .TH form_data 3X ""
 .SH NAME
-\fBform_data\fR \- test for off-screen data in given forms
+\fBdata_ahead\fP,
+\fBdata_behind\fR \- test for off-screen data in given forms
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_driver.3x b/man/form_driver.3x
index 4084eac0..73245851 100644
--- a/man/form_driver.3x
+++ b/man/form_driver.3x
@@ -26,13 +26,14 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_driver.3x,v 1.24 2015/08/02 18:21:11 tom Exp $
+.\" $Id: form_driver.3x,v 1.25 2015/12/05 21:06:26 tom Exp $
 .TH form_driver 3X ""
 .de bP
 .IP \(bu 4
 ..
 .SH NAME
-\fBform_driver\fR \- command-processing loop of the form system
+\fBform_driver\fR,
+\fBform_driver_w\fR \- command-processing loop of the form system
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_field_info.3x b/man/form_field_info.3x
index 6a1af6c3..9a40d3fe 100644
--- a/man/form_field_info.3x
+++ b/man/form_field_info.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_info.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_field_info.3x,v 1.13 2015/12/05 23:01:16 tom Exp $
 .TH form_field_info 3X ""
 .SH NAME
-\fBform_field_info\fR \- retrieve field characteristics
+\fBdynamic_field_info\fP,
+\fBfield_info\fR \- retrieve field characteristics
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_field_just.3x b/man/form_field_just.3x
index 2f223e91..5580971d 100644
--- a/man/form_field_just.3x
+++ b/man/form_field_just.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_just.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_field_just.3x,v 1.12 2015/12/05 23:02:59 tom Exp $
 .TH form_field_just 3X ""
 .SH NAME
-\fBform_field_just\fR \- retrieve field characteristics
+\fBset_field_just\fR,
+\fBfield_just\fP \- retrieve field characteristics
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_field_new.3x b/man/form_field_new.3x
index 23a35166..00156e13 100644
--- a/man/form_field_new.3x
+++ b/man/form_field_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_new.3x,v 1.18 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_field_new.3x,v 1.19 2015/12/05 23:42:45 tom Exp $
 .TH form_field_new 3X ""
 .SH NAME
-\fBform_field_new\fR \- create and destroy form fields
+\fBnew_field\fR,
+\fBdup_field\fR,
+\fBlink_field\fR,
+\fBfree_field\fR \- create and destroy form fields
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_field_opts.3x b/man/form_field_opts.3x
index f1249a38..374626b8 100644
--- a/man/form_field_opts.3x
+++ b/man/form_field_opts.3x
@@ -27,10 +27,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_opts.3x,v 1.19 2015/11/28 20:40:13 tom Exp $
+.\" $Id: form_field_opts.3x,v 1.20 2015/12/05 23:53:43 tom Exp $
 .TH form_field_opts 3X ""
 .SH NAME
-\fBform_field_opts\fR \- set and get field options
+\fBset_field_opts\fP,
+\fBfield_opts_on\fP,
+\fBfield_opts_off\fP,
+\fBfield_opts\fP \- set and get field options
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_field_userptr.3x b/man/form_field_userptr.3x
index 898da976..ead1f5f8 100644
--- a/man/form_field_userptr.3x
+++ b/man/form_field_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_field_userptr.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_field_userptr.3x,v 1.11 2015/12/05 23:01:56 tom Exp $
 .TH form_field_userptr 3X ""
 .SH NAME
-\fBform_field_userptr\fR \- associate application data with a form field
+\fBset_field_userptr\fR,
+\fBfield_userptr\fR \- associate application data with a form field
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_new.3x b/man/form_new.3x
index b69f642b..94a046d1 100644
--- a/man/form_new.3x
+++ b/man/form_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_new.3x,v 1.10 2015/12/05 23:01:16 tom Exp $
 .TH form_new 3X ""
 .SH NAME
-\fBform_new\fR \- create and destroy forms
+\fBnew_form\fR,
+\fBfree_form\fP \- create and destroy forms
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_new_page.3x b/man/form_new_page.3x
index 635822df..e7113809 100644
--- a/man/form_new_page.3x
+++ b/man/form_new_page.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_new_page.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_new_page.3x,v 1.11 2015/12/05 23:42:45 tom Exp $
 .TH form_new_page 3X ""
 .SH NAME
-\fBform_new_page\fR \- form pagination functions
+\fBset_new_page\fR,
+\fBnew_page\fR \- form pagination functions
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_opts.3x b/man/form_opts.3x
index f02cec6d..e24a0c7d 100644
--- a/man/form_opts.3x
+++ b/man/form_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,9 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_opts.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_opts.3x,v 1.12 2015/12/05 23:55:51 tom Exp $
 .TH form_opts 3X ""
 .SH NAME
+\fBset_form_opts\fP,
+\fBform_opts_on\fP,
+\fBform_opts_off\fP,
 \fBform_opts\fR \- set and get form options
 .SH SYNOPSIS
 \fB#include \fR
diff --git a/man/form_post.3x b/man/form_post.3x
index 4799d9d1..b51a9886 100644
--- a/man/form_post.3x
+++ b/man/form_post.3x
@@ -27,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_post.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_post.3x,v 1.10 2015/12/05 20:41:37 jmc Exp $
 .TH form_post 3X ""
 .SH NAME
-\fBform_post\fR \- write or erase forms from associated subwindows
+\fBpost_form\fR,
+\fBunpost_form\fR \- write or erase forms from associated subwindows
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_requestname.3x b/man/form_requestname.3x
index 4a4e7eb0..55566fd6 100644
--- a/man/form_requestname.3x
+++ b/man/form_requestname.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_requestname.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_requestname.3x,v 1.10 2015/12/05 23:42:45 tom Exp $
 .TH form_requestname 3X ""
 .SH NAME
-\fBform_requestname\fR \- handle printable form request names
+\fBform_request_by_name\fP,
+\fBform_request_name\fR \- handle printable form request names
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/form_userptr.3x b/man/form_userptr.3x
index bd29b542..14179f74 100644
--- a/man/form_userptr.3x
+++ b/man/form_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,9 +27,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: form_userptr.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
+.\" $Id: form_userptr.3x,v 1.14 2015/12/05 23:42:45 tom Exp $
 .TH form_userptr 3X ""
 .SH NAME
+\fBset_form_userptr\fP,
 \fBform_userptr\fR \- associate application data with a form item
 .SH SYNOPSIS
 \fB#include \fR
diff --git a/man/menu_attributes.3x b/man/menu_attributes.3x
index c33059b9..c0768bbd 100644
--- a/man/menu_attributes.3x
+++ b/man/menu_attributes.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,17 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_attributes.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_attributes.3x,v 1.13 2015/12/05 20:44:42 jmc Exp $
 .TH menu_attributes 3X ""
 .SH NAME
-\fBmenu_attributes\fR \- color and attribute control for menus
+\fBmenu_back\fR,
+\fBmenu_fore\fR,
+\fBmenu_grey\fR,
+\fBmenu_pad\fR,
+\fBset_menu_back\fR,
+\fBset_menu_fore\fR,
+\fBset_menu_grey\fR,
+\fBset_menu_pad\fR \- color and attribute control for menus
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_cursor.3x b/man/menu_cursor.3x
index 66a835be..91ebbc2b 100644
--- a/man/menu_cursor.3x
+++ b/man/menu_cursor.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_cursor.3x,v 1.8 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_cursor.3x,v 1.9 2015/12/05 23:42:45 tom Exp $
 .TH menu_cursor 3X ""
 .SH NAME
-\fBmenu_cursor\fR \- position a menu's cursor
+\fBpos_menu_cursor\fR \- position a menu's cursor
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_format.3x b/man/menu_format.3x
index b9a572b0..c9efcd76 100644
--- a/man/menu_format.3x
+++ b/man/menu_format.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_format.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_format.3x,v 1.13 2015/12/05 23:01:16 tom Exp $
 .TH menu_format 3X ""
 .SH NAME
-\fBmenu_format\fR \- set and get menu sizes
+\fBset_menu_format\fP,
+\fBmenu_format\fP \- set and get menu sizes
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_items.3x b/man/menu_items.3x
index 04b00ad7..7757e38a 100644
--- a/man/menu_items.3x
+++ b/man/menu_items.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2012,2015 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,10 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_items.3x,v 1.10 2012/11/03 23:03:59 tom Exp $
+.\" $Id: menu_items.3x,v 1.11 2015/12/05 23:47:32 tom Exp $
 .TH menu_items 3X ""
 .SH NAME
-\fBmenu_items\fR \- make and break connections between items and menus
+\fBset_menu_items\fR,
+\fBmenu_items\fR,
+\fBitem_count\fP \- make and break connections between items and menus
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_mark.3x b/man/menu_mark.3x
index 1425154b..e6dde9b2 100644
--- a/man/menu_mark.3x
+++ b/man/menu_mark.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,9 +27,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_mark.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_mark.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
 .TH menu_mark 3X ""
 .SH NAME
+\fBset_menu_mark\fP,
 \fBmenu_mark\fR \- get and set the menu mark string
 .SH SYNOPSIS
 \fB#include \fR
diff --git a/man/menu_new.3x b/man/menu_new.3x
index 11976547..7cc62dc9 100644
--- a/man/menu_new.3x
+++ b/man/menu_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_new.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_new.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
 .TH menu_new 3X ""
 .SH NAME
-\fBmenu_new\fR \- create and destroy menus
+\fBnew_menu\fP,
+\fBfree_menu\fR \- create and destroy menus
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_opts.3x b/man/menu_opts.3x
index 5f4cb080..7285f2fd 100644
--- a/man/menu_opts.3x
+++ b/man/menu_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,9 +27,12 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_opts.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_opts.3x,v 1.13 2015/12/05 23:42:45 tom Exp $
 .TH menu_opts 3X ""
 .SH NAME
+\fBset_menu_opts\fP,
+\fBmenu_opts_on\fP,
+\fBmenu_opts_off\fP,
 \fBmenu_opts\fR \- set and get menu options
 .SH SYNOPSIS
 \fB#include \fR
diff --git a/man/menu_pattern.3x b/man/menu_pattern.3x
index e63a9f73..58b82555 100644
--- a/man/menu_pattern.3x
+++ b/man/menu_pattern.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2008,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_pattern.3x,v 1.13 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_pattern.3x,v 1.14 2015/12/05 23:42:45 tom Exp $
 .TH menu_pattern 3X ""
 .SH NAME
-\fBmenu_pattern\fR \- get and set a menu's pattern buffer
+\fBset_menu_pattern\fP,
+\fBmenu_pattern\fR \- set and get a menu's pattern buffer
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_post.3x b/man/menu_post.3x
index d09d0ca4..2c3e8dd4 100644
--- a/man/menu_post.3x
+++ b/man/menu_post.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_post.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_post.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
 .TH menu_post 3X ""
 .SH NAME
-\fBmenu_post\fR \- write or erase menus from associated subwindows
+\fBpost_menu\fR,
+\fBunpost_menu\fR \- write or erase menus from associated subwindows
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_requestname.3x b/man/menu_requestname.3x
index d1957a2f..55b2b126 100644
--- a/man/menu_requestname.3x
+++ b/man/menu_requestname.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_requestname.3x,v 1.9 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_requestname.3x,v 1.10 2015/12/05 23:42:45 tom Exp $
 .TH menu_requestname 3X ""
 .SH NAME
-\fBmenu_requestname\fR \- handle printable menu request names
+\fBmenu_request_by_name\fP,
+\fBmenu_request_name\fR \- handle printable menu request names
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_spacing.3x b/man/menu_spacing.3x
index 9e7c3eab..696833e9 100644
--- a/man/menu_spacing.3x
+++ b/man/menu_spacing.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2004,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_spacing.3x,v 1.12 2010/12/04 18:38:55 tom Exp $
+.\" $Id: menu_spacing.3x,v 1.13 2015/12/05 23:42:45 tom Exp $
 .TH menu_spacing 3X ""
 .SH NAME
-\fBmenu_spacing\fR \- Control spacing between menu items.
+\fBset_menu_spacing\fP,
+\fBmenu_spacing\fR \- set and get spacing between menu items.
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/menu_userptr.3x b/man/menu_userptr.3x
index 0455fe3a..2d0a68f6 100644
--- a/man/menu_userptr.3x
+++ b/man/menu_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,9 +27,10 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: menu_userptr.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
+.\" $Id: menu_userptr.3x,v 1.11 2015/12/05 23:42:45 tom Exp $
 .TH menu_userptr 3X ""
 .SH NAME
+\fBset_menu_userptr\fP,
 \fBmenu_userptr\fR \- associate application data with a menu item
 .SH SYNOPSIS
 \fB#include \fR
diff --git a/man/mitem_name.3x b/man/mitem_name.3x
index ff879e66..3291ee72 100644
--- a/man/mitem_name.3x
+++ b/man/mitem_name.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_name.3x,v 1.8 2010/12/04 18:40:45 tom Exp $
+.\" $Id: mitem_name.3x,v 1.9 2015/12/05 23:42:45 tom Exp $
 .TH mitem_name 3X ""
 .SH NAME
-\fBmitem_name\fR \- get menu item name and description fields
+\fBitem_name\fR,
+\fBitem_description\fR \- get menu item name and description fields
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/mitem_new.3x b/man/mitem_new.3x
index 8e2449e2..d234c370 100644
--- a/man/mitem_new.3x
+++ b/man/mitem_new.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_new.3x,v 1.12 2010/12/04 18:40:45 tom Exp $
+.\" $Id: mitem_new.3x,v 1.13 2015/12/05 23:42:45 tom Exp $
 .TH mitem_new 3X ""
 .SH NAME
-\fBmitem_new\fR \- create and destroy menu items
+\fBnew_item\fP,
+\fBfree_item\fR \- create and destroy menu items
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/mitem_opts.3x b/man/mitem_opts.3x
index 37ea5523..2ac6c43c 100644
--- a/man/mitem_opts.3x
+++ b/man/mitem_opts.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2007,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,13 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_opts.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: mitem_opts.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
 .TH mitem_opts 3X ""
 .SH NAME
-\fBmitem_opts\fR \- set and get menu item options
+\fBset_item_opts\fP,
+\fBitem_opts_on\fP,
+\fBitem_opts_off\fP,
+\fBitem_opts\fR \- set and get menu item options
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/mitem_userptr.3x b/man/mitem_userptr.3x
index 7b51ec50..b7b3c821 100644
--- a/man/mitem_userptr.3x
+++ b/man/mitem_userptr.3x
@@ -1,6 +1,6 @@
 '\" t
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +27,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_userptr.3x,v 1.11 2010/12/04 18:40:45 tom Exp $
+.\" $Id: mitem_userptr.3x,v 1.12 2015/12/05 23:42:45 tom Exp $
 .TH mitem_userptr 3X ""
 .SH NAME
-\fBmitem_userptr\fR \- associate application data with a menu item
+\fBset_item_userptr\fP,
+\fBitem_userptr\fR \- associate application data with a menu item
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/mitem_value.3x b/man/mitem_value.3x
index 57cfc536..24343b76 100644
--- a/man/mitem_value.3x
+++ b/man/mitem_value.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2006,2010 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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,10 +26,11 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: mitem_value.3x,v 1.10 2010/12/04 18:40:45 tom Exp $
+.\" $Id: mitem_value.3x,v 1.11 2015/12/05 23:01:16 tom Exp $
 .TH mitem_value 3X ""
 .SH NAME
-\fBmitem_value\fR \- set and get menu item values
+\fBset_item_value\fP,
+\fBitem_value\fP \- set and get menu item values
 .SH SYNOPSIS
 \fB#include \fR
 .br
diff --git a/man/panel.3x b/man/panel.3x
index cc36d225..3877b2e7 100644
--- a/man/panel.3x
+++ b/man/panel.3x
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright (c) 1998-2020,2015 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2010,2015 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.18 2015/04/11 10:23:49 tom Exp $
+.\" $Id: panel.3x,v 1.19 2015/12/05 23:42:45 tom Exp $
 .TH panel 3X ""
 .ds n 5
 .ds d @TERMINFO@
@@ -37,35 +37,35 @@ panel \- panel stack extension for curses
 .P
 \fBcc [flags] sourcefiles \-lpanel \-lncurses\fR
 .P
-\fBPANEL *new_panel(WINDOW *win)\fR
+\fBPANEL *new_panel(WINDOW *win);\fR
 .br
-\fBint bottom_panel(PANEL *pan)\fR
+\fBint bottom_panel(PANEL *pan);\fR
 .br
-\fBint top_panel(PANEL *pan)\fR
+\fBint top_panel(PANEL *pan);\fR
 .br
-\fBint show_panel(PANEL *pan)\fR
+\fBint show_panel(PANEL *pan);\fR
 .br
 \fBvoid update_panels();\fR
 .br
-\fBint hide_panel(PANEL *pan)\fR
+\fBint hide_panel(PANEL *pan);\fR
 .br
-\fBWINDOW *panel_window(const PANEL *pan)\fR
+\fBWINDOW *panel_window(const PANEL *pan);\fR
 .br
-\fBint replace_panel(PANEL *pan, WINDOW *window)\fR
+\fBint replace_panel(PANEL *pan, WINDOW *window);\fR
 .br
-\fBint move_panel(PANEL *pan, int starty, int startx)\fR
+\fBint move_panel(PANEL *pan, int starty, int startx);\fR
 .br
-\fBint panel_hidden(const PANEL *pan)\fR
+\fBint panel_hidden(const PANEL *pan);\fR
 .br
-\fBPANEL *panel_above(const PANEL *pan)\fR
+\fBPANEL *panel_above(const PANEL *pan);\fR
 .br
-\fBPANEL *panel_below(const PANEL *pan)\fR
+\fBPANEL *panel_below(const PANEL *pan);\fR
 .br
-\fBint set_panel_userptr(PANEL *pan, const void *ptr)\fR
+\fBint set_panel_userptr(PANEL *pan, const void *ptr);\fR
 .br
-\fBconst void *panel_userptr(const PANEL *pan)\fR
+\fBconst void *panel_userptr(const PANEL *pan);\fR
 .br
-\fBint del_panel(PANEL *pan)\fR
+\fBint del_panel(PANEL *pan);\fR
 .br
 .SH DESCRIPTION
 Panels are \fBcurses\fR(3X) windows with the added feature of
diff --git a/man/term_variables.3x b/man/term_variables.3x
index ea247373..49a22938 100644
--- a/man/term_variables.3x
+++ b/man/term_variables.3x
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: term_variables.3x,v 1.6 2015/04/22 00:34:49 tom Exp $
+.\" $Id: term_variables.3x,v 1.7 2015/12/05 18:43:25 tom Exp $
 .TH term_variables 3X ""
 .ds n 5
 .na
@@ -56,6 +56,8 @@
 .PP
 \fBchtype acs_map[];\fR
 .sp
+\fBSCREEN * SP;\fR
+.sp
 \fBTERMINAL * cur_term;\fR
 .sp
 \fBchar ttytype[];\fR
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index ca97e78c..61a0ea59 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151128) unstable; urgency=low
+ncurses6 (6.0+20151205) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
+ -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index ca97e78c..61a0ea59 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151128) unstable; urgency=low
+ncurses6 (6.0+20151205) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
+ -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index ee011aff..51a28054 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20151128) unstable; urgency=low
+ncurses6 (6.0+20151205) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 28 Nov 2015 11:31:05 -0500
+ -- Thomas E. Dickey   Sat, 05 Dec 2015 08:22:37 -0500
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e0328074..f11d6c61 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.134 2015/11/28 16:31:05 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.135 2015/12/05 13:22:37 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  "2015"
-!define VERSION_MMDD  "1128"
+!define VERSION_MMDD  "1205"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 7e2cec2c..dc9ca809 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: 20151128
+Release: 20151205
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 7ff615db..74c26b4f 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: 20151128
+Release: 20151205
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/README b/test/README
index cbcc5664..350c2545 100644
--- a/test/README
+++ b/test/README
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: README,v 1.52 2015/07/11 14:17:01 tom Exp $
+-- $Id: README,v 1.53 2015/12/06 00:38:26 tom Exp $
 -------------------------------------------------------------------------------
 
 The programs in this directory are used to test and demonstrate ncurses.
@@ -289,7 +289,7 @@ color_content			test: ncurses
 color_content_sp		-
 color_set			test: color_set ncurses
 copywin				test: ncurses testcurs
-cur_term			test: demo_termcap demo_terminfo dots dots_mvcur lrtest test_vid_puts test_vidputs progs: clear tabs tput tset
+cur_term			test: demo_termcap demo_terminfo dots dots_mvcur lrtest test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
 curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
 curs_set_sp			lib: ncurses
 curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
@@ -300,7 +300,7 @@ def_shell_mode			-
 def_shell_mode_sp		lib: ncurses
 define_key			test: demo_altkeys demo_defkey foldkeys
 define_key_sp			-
-del_curterm			test: demo_terminfo
+del_curterm			test: demo_terminfo test_sgr
 del_curterm_sp			lib: ncurses
 delay_output			test: newdemo
 delay_output_sp			-
@@ -427,6 +427,7 @@ killchar_sp			lib: ncurses
 killwchar			-
 leaveok				test: hanoi test_opaque
 longname			test: testcurs progs: tput
+longname_sp			-
 mcprint				-
 mcprint_sp			-
 meta				test: key_names keynames ncurses
@@ -545,7 +546,7 @@ noqiflush			-
 noqiflush_sp			-
 noraw				test: demo_forms demo_menus ncurses testcurs
 noraw_sp			lib: ncurses
-notimeout			test: test_opaque
+notimeout			test: ncurses test_opaque
 numcodes			test: demo_termcap test_arrays progs: dump_entry
 numfnames			test: demo_terminfo test_arrays progs: dump_entry
 numnames			test: demo_termcap demo_terminfo test_arrays progs: dump_entry infocmp
@@ -559,7 +560,7 @@ pechochar			-
 pnoutrefresh			test: edit_field ncurses
 prefresh			test: testcurs
 printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok filter foldkeys ncurses savescreen testcurs testscanw view
-putp				progs: tput
+putp				test: test_sgr progs: tput
 putp_sp				-
 putwin				test: ncurses
 qiflush				-
@@ -604,7 +605,7 @@ set_tabsize_sp			-
 set_term			lib: ncurses
 setcchar			test: demo_panels ins_wide ncurses test_add_wchstr test_addwstr view
 setscrreg			test: view
-setupterm			test: demo_terminfo dots test_setupterm test_vid_puts test_vidputs progs: clear tabs tput tset
+setupterm			test: demo_terminfo dots test_setupterm test_sgr test_vid_puts test_vidputs progs: clear tabs tput tset
 slk_attr			-
 slk_attr_off			-
 slk_attr_on			-
@@ -666,17 +667,17 @@ tigetflag			test: demo_terminfo progs: tic tput
 tigetflag_sp			-
 tigetnum			test: demo_terminfo ncurses progs: tput
 tigetnum_sp			-
-tigetstr			test: demo_defkey demo_terminfo foldkeys testcurs progs: clear tput
+tigetstr			test: demo_defkey demo_terminfo foldkeys test_sgr testcurs progs: clear tput
 tigetstr_sp			-
 timeout				test: rain savescreen
 tiparm				-
 touchline			test: chgat clip_printw insdelln
 touchwin			test: chgat clip_printw demo_menus edit_field filter firstlast inch_wide inchs ins_wide insdelln inserts movewindow ncurses redraw savescreen test_add_wchstr test_addchstr test_addstr test_addwstr test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
-tparm				test: dots dots_mvcur progs: tabs tic tput
+tparm				test: dots dots_mvcur test_sgr progs: tabs tic tput
 tputs				test: dots dots_mvcur dots_termcap railroad test_vid_puts test_vidputs progs: clear tabs tset
 tputs_sp			lib: ncurses
 trace				test: demo_menus hashtest lrtest ncurses testcurs view worm
-ttytype				test: demo_terminfo
+ttytype				test: demo_terminfo test_sgr
 typeahead			test: testcurs
 typeahead_sp			lib: ncurses
 unctrl				test: ncurses redraw test_add_wchstr test_addchstr testcurs
-- 
2.44.0